Publish v1.0

Reviewed-on: #1

Sources/ToolCore/GeneratorChecker.swift

@@ -15,26 +15,29 @@ public class GeneratorChecker {
             return true
         }
         
-        // If inputFile is newer that generated extension -> Regenerate
-        let extensionFileURL = URL(fileURLWithPath: extensionFilePath)
-        let inputFileURL = URL(fileURLWithPath: inputFilePath)
-        
-        let extensionRessourceValues = try? extensionFileURL.resourceValues(forKeys: [URLResourceKey.contentModificationDateKey])
-        let inputFileRessourceValues = try? inputFileURL.resourceValues(forKeys: [URLResourceKey.contentModificationDateKey])
-        
-        if let extensionModificationDate = extensionRessourceValues?.contentModificationDate,
-           let inputFileModificationDate = inputFileRessourceValues?.contentModificationDate {
-            if inputFileModificationDate >= extensionModificationDate {
-                print("Input file is newer that generated extension.")
-                return true
-            } else {
-                return false
-            }
-        }
+        return Self.isFile(inputFilePath, moreRecenThan: extensionFilePath)
+    }
     
-        // ModificationDate not available for both file
-        print("⚠️ Could not compare file modication date. ⚠️")
-        return true
+    public static func isFile(_ fileOne: String, moreRecenThan fileTwo: String) -> Bool {
+        let fileOneURL = URL(fileURLWithPath: fileOne)
+        let fileTwoURL = URL(fileURLWithPath: fileTwo)
+        
+        let fileOneRessourceValues = try? fileOneURL.resourceValues(forKeys: [URLResourceKey.contentModificationDateKey])
+        let fileTwoRessourceValues = try? fileTwoURL.resourceValues(forKeys: [URLResourceKey.contentModificationDateKey])
+        
+        guard let fileOneModificationDate = fileOneRessourceValues?.contentModificationDate,
+              let fileTwoModificationDate = fileTwoRessourceValues?.contentModificationDate else {
+            print("⚠️ Could not compare file modication date. ⚠️ (assume than file is newer)")
+            // Date not available -> assume than fileOne is newer than fileTwo
+            return true
+        }
+        
+        if fileOneModificationDate >= fileTwoModificationDate {
+            debugPrint("File one is more recent than file two.")
+            return true
+        }
+        
+        return false
     }
     
 }

Sources/ToolCore/Shell.swift

@@ -9,32 +9,48 @@ import Foundation
 
 public class Shell {
     
-    @discardableResult
-    public static func shell(_ args: String...) -> (terminationStatus: Int32, output: String?) {
-        let task = Process()
-        task.launchPath = "/usr/bin/env"
-        task.arguments = args
-        
-        let pipe = Pipe()
-        task.standardOutput = pipe
-        task.launch()
-        task.waitUntilExit()
-        
-        let data = pipe.fileHandleForReading.readDataToEndOfFile()
-        
-        guard let output: String = String(data: data, encoding: .utf8) else {
-            return (terminationStatus: task.terminationStatus, output: nil)
-        }
-        
-        return (terminationStatus: task.terminationStatus, output: output)
+    public static var environment: [String: String] {
+        ProcessInfo.processInfo.environment
     }
     
+//    @discardableResult
+//    public static func shell(launchPath: String = "/usr/bin/env", _ args: String...) -> (terminationStatus: Int32, output: String?) {
+//        let task = Process()
+//        task.launchPath = launchPath
+//        task.arguments = args
+//
+//        var currentEnv = ProcessInfo.processInfo.environment
+//        for (key, value) in environment {
+//            currentEnv[key] = value
+//        }
+//        task.environment = currentEnv
+//
+//        let pipe = Pipe()
+//        task.standardOutput = pipe
+//        try? task.run()
+//        task.waitUntilExit()
+//
+//        let data = pipe.fileHandleForReading.readDataToEndOfFile()
+//
+//        guard let output: String = String(data: data, encoding: .utf8) else {
+//            return (terminationStatus: task.terminationStatus, output: nil)
+//        }
+//
+//        return (terminationStatus: task.terminationStatus, output: output)
+//    }
+    
     @discardableResult
-    public static func shell(_ args: [String]) -> (terminationStatus: Int32, output: String?) {
+    public static func shell(launchPath: String = "/usr/bin/env", _ args: [String]) -> (terminationStatus: Int32, output: String?) {
         let task = Process()
-        task.launchPath = "/usr/bin/env"
+        task.launchPath = launchPath
         task.arguments = args
         
+        var currentEnv = ProcessInfo.processInfo.environment
+        for (key, value) in environment {
+            currentEnv[key] = value
+        }
+        task.environment = currentEnv
+        
         let pipe = Pipe()
         task.standardOutput = pipe
         task.launch()

Sources/ToolCore/StringExtensions.swift

@@ -59,6 +59,7 @@ public extension String {
     }
     
     func replaceTiltWithHomeDirectoryPath() -> Self {
+        // See NSString.expandingTildeInPath
         replacingOccurrences(of: "~", with: "\(FileManager.default.homeDirectoryForCurrentUser.relativePath)")
     }
     

Sources/ToolCore/Version.swift

@@ -7,4 +7,4 @@
 
 import Foundation
 
-public let ResgenSwiftVersion = "0.9"
+public let ResgenSwiftVersion = "1.0"