Merge branch 'no-script-section-check'

Author: Artem Novichkov

Sources/CartingCore/Models/Project.swift

@@ -14,15 +14,15 @@ final class Project {
     let body: String
     let targetsRange: Range<String.Index>
     let targets: [Target]
-    let scriptsRange: Range<String.Index>
+    let scriptsRange: Range<String.Index>?
     var scripts: [Script]
     var frameworkScripts: [FrameworkScript]
 
     init(name: String,
          body: String,
          targetsRange: Range<String.Index>,
          targets: [Target],
-         scriptsRange: Range<String.Index>,
+         scriptsRange: Range<String.Index>?,
          scripts: [Script],
          frameworkScripts: [FrameworkScript]) {
         self.name = name

Sources/CartingCore/Services/ProjectService.swift

@@ -13,6 +13,7 @@ final class ProjectService {
     enum Error: Swift.Error {
         case noProjectFile
         case cannotReadProject
+        case cannotFindProjectResources
     }
 
     enum PathType {
@@ -26,6 +27,7 @@ final class ProjectService {
         static let outputPath = "$(BUILT_PRODUCTS_DIR)/$(FRAMEWORKS_FOLDER_PATH)/"
         static let projectExtension = "xcodeproj"
         static let frameworkExtension = "framework"
+        static let resourcesBuildSectionEnd = "/* End PBXResourcesBuildPhase section */"
     }
 
     let fileManager: FileManager
@@ -59,7 +61,7 @@ final class ProjectService {
                 throw Error.cannotReadProject
         }
         let (targetsRange, targets) = try targetsService.targets(fromProjectString: body)
-        let (scriptsRange, scripts) = try shellScriptsService.scripts(fromProjectString: body)
+        let (scriptsRange, scripts) = shellScriptsService.scripts(fromProjectString: body)
         let (_, frameworkScripts) = try frameworksService.scripts(fromProjectString: body)
 
         return Project(name: projectFileName,
@@ -75,15 +77,29 @@ final class ProjectService {
     /// - Parameter project: a project for updating.
     /// - Throws: throws if it can not white a project to project file.
     func update(_ project: Project) throws {
-        let newScriptsProjectString = project.body.replacingCharacters(in: project.scriptsRange,
+        let newScriptsProjectString: String
+        if let scriptsRange = project.scriptsRange {
+            newScriptsProjectString = project.body.replacingCharacters(in: scriptsRange,
                                                                        with: shellScriptsService.string(from: project.scripts))
+        }
+        else if let range = project.body.range(of: Keys.resourcesBuildSectionEnd) {
+            var body = project.body
+            let scriptsString = shellScriptsService.string(from: project.scripts,
+                                                           needSectionBlock: true)
+            body.insert(contentsOf: "\n\n\(scriptsString)".characters,
+                        at: range.upperBound)
+            newScriptsProjectString = body
+        }
+        else {
+            throw Error.cannotFindProjectResources
+        }
         let newTargetsProjectString = newScriptsProjectString.replacingCharacters(in: project.targetsRange,
                                                                                   with: targetsService.string(from: project.targets))
 
         let path = fileManager.currentDirectoryPath + "/\(project.name)" + Keys.projectPath
         try newTargetsProjectString.write(toFile: path,
-                         atomically: true,
-                         encoding: .utf8)
+                                          atomically: true,
+                                          encoding: .utf8)
     }
 
     /// - Parameters:
@@ -130,6 +146,7 @@ extension ProjectService.Error: LocalizedError {
         switch self {
         case .noProjectFile: return "Can't find any .pbxproj file."
         case .cannotReadProject: return "Can't read a project."
+        case .cannotFindProjectResources: return "Can't fine Resources section in a project."
         }
     }
 }

Sources/CartingCore/Services/ShellScriptsService.swift

@@ -20,10 +20,13 @@ final class ShellScriptsService {
     }
 
     /// - Parameter string: a string from project.pbxproj file.
-    /// - Returns: a tuple with a range of scripts and an array of mapped scripts.
-    func scripts(fromProjectString string: String) throws -> (Range<String.Index>, [Script]) {
-        let (range, scriptsString) = try self.scriptsString(fromProjectString: string)
-        let scanner = Scanner(string: scriptsString)
+    /// - Returns: a tuple with a range of scripts and an array of mapped scripts. If it is a new project, returns no range and empty array.
+    func scripts(fromProjectString string: String) -> (Range<String.Index>?, [Script]) {
+        let (range, scriptsString) = self.scriptsString(fromProjectString: string)
+        guard let nonEmptyScriptsString = scriptsString else {
+            return (range, [])
+        }
+        let scanner = Scanner(string: nonEmptyScriptsString)
         var identifier: NSString?
         var name: NSString?
         var bodyString: NSString?
@@ -49,20 +52,25 @@ final class ShellScriptsService {
         return (range, scripts)
     }
 
-    /// - Parameter scripts: an array of scripts.
+    /// - Parameters:
+    ///   - scripts: an array of scripts.
+    ///   - needSectionBlock: if true, returns whole section block
     /// - Returns: formatted string with all scripts for insertion into project.
-    func string(from scripts: [Script]) -> String {
+    func string(from scripts: [Script], needSectionBlock: Bool = false) -> String {
         let scriptStrings: [String] = scripts.map { $0.description }
-        return scriptStrings.joined(separator: "") + "\n"
+        var scriptString = scriptStrings.joined(separator: "") + "\n"
+        if needSectionBlock {
+            scriptString = Keys.buildPhaseSectionBegin + scriptString + Keys.buildPhaseSectionEnd
+        }
+        return scriptString
     }
 
     /// - Parameter projectString: a string from project.pbxproj file.
-    /// - Returns: a tuple with scripts range and scripts section string.
-    /// - Throws: an error if there is no scripts section in project string.
-    private func scriptsString(fromProjectString string: String) throws -> (Range<String.Index>, String) {
+    /// - Returns: a tuple with scripts range and scripts section string. If it is a new project, returns nils.
+    private func scriptsString(fromProjectString string: String) -> (Range<String.Index>?, String?) {
         guard let startRange = string.range(of: Keys.buildPhaseSectionBegin),
             let endRange = string.range(of: Keys.buildPhaseSectionEnd) else {
-                throw Error.noScripts
+                return (nil, nil)
         }
         let scriptsRange = startRange.upperBound..<endRange.lowerBound
         return (scriptsRange, string.substring(with: scriptsRange))