Merge branch 'static-frameworks'

Author: Artem Novichkov

.github/carting.gif

@@ -1,7 +1,24 @@
 {
   "object": {
     "pins": [
-
+      {
+        "package": "Files",
+        "repositoryURL": "https://github.com/johnsundell/files.git",
+        "state": {
+          "branch": null,
+          "revision": "6171f9e9d8619678da22355560f3dbed6368058d",
+          "version": "2.0.1"
+        }
+      },
+      {
+        "package": "ShellOut",
+        "repositoryURL": "https://github.com/Johnsundell/shellout.git",
+        "state": {
+          "branch": null,
+          "revision": "479a89d9bfa7585496bd4a3e4faffac5b01af37f",
+          "version": "2.0.0"
+        }
+      }
     ]
   },
   "version": 1

.github/carting.png

@@ -7,8 +7,12 @@ let package = Package(
     products: [
         .library(name: "Carting", targets: ["CartingCore"]),
         ],
+    dependencies: [
+        .package(url: "https://github.com/johnsundell/files.git", from: "2.0.0"),
+        .package(url: "https://github.com/Johnsundell/shellout.git", from: "2.0.0")
+    ],
     targets: [
         .target(name: "Carting", dependencies: ["CartingCore"]),
-        .target(name: "CartingCore")
+        .target(name: "CartingCore", dependencies: ["Files", "ShellOut"])
         ]
 )

Makefile

@@ -17,24 +17,38 @@
 Do you use [Carthage](https://github.com/Carthage/Carthage)? Are you feel tired of adding special script and the paths to frameworks (point 4, 5 and 6 in [Getting Started guide](https://github.com/Carthage/Carthage#getting-started)) manually? Me too. Carting does it for you. It scans Carthage folder and linked frameworks, gets framework names and updates the script.
 
 <p align="center">
-<img src=".github/carting.gif" max-width="90%" alt="Carting usage" />
+<img src=".github/carting.png" max-width="90%" alt="Carting usage" />
 </p>
 
 ## Using
 
-Run `carting` in project folder. That's all.
+Run `carting update` in project folder. That's all.
 
 By default Carting searches a script named `Carthage`, but you can set a name of your script via command line arguments:
 
 ```
-$ carting MyBestScript
+$ carting update -s MyBestScript
 ```
 
 If there is no script with the name, Carting will add a new one.
 
 **🚨Note**: be sure to have no uncommitted changes in project file to prevent project parsing errors 😱.
 <img src="error.png" alt="Project parsing error" />
 
+Run `carting help` to see available commands:
+
+```bash
+Usage: carting [command] [options]
+  update:
+      Adds a new script with input/output file paths or updates the script named `Carthage`.
+  -s, --script:
+      Updates input/output file paths for the script with passed name.
+  list:
+      Prints Carthage frameworks list with linking description.
+  help:
+      Prints this message.
+```
+
 ## Installing
 
 ### Homebrew (recommended):
@@ -54,18 +68,9 @@ $ make
 ### Swift Package Manager:
 
 ```swift
-// swift-tools-version:4.0
-
-import PackageDescription
-
 let package = Package(
-    name: "Project",
     dependencies: [
-    .package(url: "https://github.com/artemnovichkov/Carting.git", from: "1.0.0"),
-        ],
-    targets: [
-        .target(
-            name: "Project", dependencies: ["Carting"])
+        .Package(url: "https://github.com/artemnovichkov/carting", majorVersion: 1)
     ]
 )
 ```

Package.resolved

@@ -0,0 +1,50 @@
+//
+//  Copyright © 2017 Rosberry. All rights reserved.
+//
+
+import Foundation
+
+struct Arguments {
+
+    enum Command {
+        case script(name: String), list, help
+    }
+
+    private enum Keys {
+        static let defaultScriptName = "Carthage"
+    }
+
+    var command: Command = .help
+
+    init?(arguments: [String]) {
+        for (index, argument) in arguments.enumerated() {
+            switch argument.lowercased() {
+            case "update":
+                command = .script(name: Keys.defaultScriptName)
+            case "-s", "--script":
+                let nameIndex = index + 1
+                let name = arguments.count > nameIndex ? arguments[nameIndex] : Keys.defaultScriptName
+                command = .script(name: name)
+            case "list":
+                command = .list
+            case "help":
+                command = .help
+            default: break
+            }
+        }
+    }
+
+    static let description: String = {
+        return """
+Usage: carting [command] [options]
+  update:
+      Adds a new script with input/output file paths or updates the script named `Carthage`.
+  -s, --script:
+      Updates input/output file paths for the script with passed name.
+  list:
+      Prints Carthage frameworks list with linking description.
+  help:
+      Prints this message.
+"""
+    }()
+}

Package.swift

@@ -5,50 +5,66 @@
 import Foundation
 
 public final class Carting {
-    
+
     enum Keys {
-        static let defaultScriptName = "Carthage"
         static let carthageScript = "\"/usr/local/bin/carthage copy-frameworks\""
     }
-    
+
     private let arguments: [String]
-    
+
     private let projectService = ProjectService()
-    
+    private let frameworkInformationService = FrameworkInformationService()
+
     public init(arguments: [String] = CommandLine.arguments) {
         self.arguments = arguments
     }
-    
+
     public func run() throws {
+        guard let arguments = Arguments(arguments: self.arguments) else {
+            print("❌ Wrong arguments")
+            print(Arguments.description)
+            return
+        }
+
+        switch arguments.command {
+        case .help:
+            print(Arguments.description)
+        case let .script(name: name):
+            try updateScript(withName: name)
+        case .list:
+            frameworkInformationService.printFrameworksInformation()
+        }
+    }
+
+    private func updateScript(withName scriptName: String) throws {
         let project = try projectService.project()
-        
-        let carthageScriptName = arguments.count > 1 ? arguments[1] : Keys.defaultScriptName
-        
+
         var projectHasBeenUpdated = false
-        
+
         try project.targets.forEach { target in
             let frameworkBuildPhase = target.body.buildPhases.first { $0.name == "Frameworks" }
             let frameworkScript = project.frameworkScripts.first { $0.identifier == frameworkBuildPhase?.identifier }
             guard let script = frameworkScript else {
                 return
             }
-            let carthageFrameworkNames = try projectService.frameworkNames()
-            let linkedCarthageFrameworkNames = script.body.files
-                .filter { carthageFrameworkNames.contains($0.name) }
+            let linkedCarthageDynamicFrameworkNames = try frameworkInformationService.frameworksInformation()
+                .filter { information in
+                    information.linking == .dynamic && script.body.files.contains { $0.name == information.name }
+                }
                 .map { $0.name }
-            
-            let carthageBuildPhase = target.body.buildPhases.first { $0.name == carthageScriptName }
+
+            let carthageBuildPhase = target.body.buildPhases.first { $0.name == scriptName }
             let carthageScript = project.scripts.first { $0.identifier == carthageBuildPhase?.identifier }
-            
-            let inputPathsString = projectService.pathsString(forFrameworkNames: linkedCarthageFrameworkNames,
+
+            let inputPathsString = projectService.pathsString(forFrameworkNames: linkedCarthageDynamicFrameworkNames,
                                                               type: .input)
-            let outputPathsString = projectService.pathsString(forFrameworkNames: linkedCarthageFrameworkNames,
+            let outputPathsString = projectService.pathsString(forFrameworkNames: linkedCarthageDynamicFrameworkNames,
                                                                type: .output)
-            
+
             if let carthage = carthageScript {
                 var scriptHasBeenUpdated = false
                 if carthage.body.inputPaths != inputPathsString {
-                   carthage.body.inputPaths = inputPathsString
+                    carthage.body.inputPaths = inputPathsString
                     scriptHasBeenUpdated = true
                 }
                 if carthage.body.outputPaths != outputPathsString {
@@ -61,25 +77,25 @@ public final class Carting {
                 }
                 if scriptHasBeenUpdated {
                     projectHasBeenUpdated = true
-                    print("✅ Script \"\(carthageScriptName)\" in target \"\(target.name)\" was successfully updated.")
+                    print("✅ Script \"\(scriptName)\" in target \"\(target.name)\" was successfully updated.")
                 }
             }
-            else if linkedCarthageFrameworkNames.count > 0 {
+            else if linkedCarthageDynamicFrameworkNames.count > 0 {
                 let body = ScriptBody(inputPaths: inputPathsString,
-                                      name: carthageScriptName,
+                                      name: scriptName,
                                       outputPaths: outputPathsString,
                                       shellScript: Keys.carthageScript)
-                
+
                 let identifier = String.randomAlphaNumericString(length: 24)
-                let script = Script(identifier: identifier, name: carthageScriptName, body: body)
-                let buildPhase = BuildPhase(identifier: identifier, name: carthageScriptName)
+                let script = Script(identifier: identifier, name: scriptName, body: body)
+                let buildPhase = BuildPhase(identifier: identifier, name: scriptName)
                 project.scripts.append(script)
                 target.body.buildPhases.append(buildPhase)
-                print("✅ Script \(carthageScriptName) was successfully added to \(target.name) target.")
+                print("✅ Script \(scriptName) was successfully added to \(target.name) target.")
                 projectHasBeenUpdated = true
             }
         }
-        
+
         try projectService.update(project)
         if !projectHasBeenUpdated {
             print("🤷‍♂️ Nothing to update.")
@@ -92,7 +108,7 @@ enum MainError: Swift.Error {
 }
 
 extension MainError: LocalizedError {
-    
+
     var errorDescription: String? {
         switch self {
         case .noScript(name: let name): return "Can't find script with name \(name)"

README.md

@@ -8,7 +8,7 @@ extension String {
 
     static func randomAlphaNumericString(length: Int) -> String {
         let allowedChars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-        let allowedCharsCount = UInt32(allowedChars.characters.count)
+        let allowedCharsCount = UInt32(allowedChars.count)
         var randomString = ""
 
         for _ in 0..<length {

Sources/CartingCore/Arguments.swift

@@ -45,7 +45,7 @@ final class ScriptBody: BaseScriptBody {
          runOnlyForDeploymentPostprocessing: String = "0",
          shellPath: String = "/bin/sh",
          shellScript: String = "\"\"",
-         showEnvVarsInLog: String? = nil) {
+         showEnvVarsInLog: String? = "0") {
         self.inputPaths = inputPaths
         self.name = name
         self.outputPaths = outputPaths