Merge branch 'master' of github.com:modulo-dm/modulo

Author: Brandon Sneed

ModuloKit/SCM/Git.swift

@@ -100,7 +100,7 @@ open class Git: SCM {
         let initialWorkingPath = FileManager.workingPath()
         FileManager.setWorkingPath(path)
 
-        let updateCommand = "git fetch --all --tags"
+        let updateCommand = "git fetch --recurse-submodules --all --tags"
         let status = runCommand(updateCommand)
 
         FileManager.setWorkingPath(initialWorkingPath)
@@ -120,7 +120,7 @@ open class Git: SCM {
         let initialWorkingPath = FileManager.workingPath()
         FileManager.setWorkingPath(path)
 
-        var updateCommand = "git pull --ff-only"
+        var updateCommand = "git pull --recurse-submodules --ff-only"
         if let remote = remoteData {
             updateCommand = updateCommand + " \(remote)"
         }
@@ -161,13 +161,14 @@ open class Git: SCM {
 
         let status = runCommand(checkoutCommand)
 
+        let submodulesResult = collectAnySubmodules()
+        
         FileManager.setWorkingPath(initialWorkingPath)
 
         if status != 0 {
             return .error(code: status, message: "Unable to checkout a match for '\(version.original)'.")
         }
 
-        let submodulesResult = collectAnySubmodules()
         if submodulesResult != .success {
             return submodulesResult
         }

ModuloKitTests/TestScenarios.swift

@@ -60,7 +60,7 @@ class TestScenarios: XCTestCase {
         XCTAssertTrue(result == .success)
 
         runCommand("git add -A")
-        runCommand("git commit -m \"initial with modulo adds\"")
+        testCommit("initial with modulo adds")
 
         // the main project should be clean now.
         result = Modulo.run(["status"])
@@ -103,7 +103,7 @@ class TestScenarios: XCTestCase {
         XCTAssertTrue(result == .success)
 
         runCommand("git add -A")
-        runCommand("git commit -m \"initial with modulo adds\"")
+        testCommit("initial with modulo adds")
 
         // the main project should have unpushed commits now.
         result = Modulo.run(["status"])

ModuloKitTests/TestStatus.swift

@@ -75,7 +75,7 @@ class TestStatus: XCTestCase {
 
         touchFile("blah.txt")
         runCommand("git add blah.txt")
-        runCommand("git commit -m \"test\"")
+        testCommit("test")
 
         result = Modulo.run(["status", "-v"])
         XCTAssertTrue(result == .dependencyUnclean)
@@ -98,7 +98,7 @@ class TestStatus: XCTestCase {
 
         touchFile("blah.txt")
         runCommand("git add blah.txt")
-        runCommand("git commit -m \"test\"")
+        testCommit("test")
 
         FileManager.setWorkingPath("../test-add")
 

ModuloKitTests/Utils.swift

@@ -33,3 +33,7 @@ func touchFile(_ path: String) {
 func runCommand(_ command: String) {
     Git().runCommand(command)
 }
+
+func testCommit(_ message: String) {
+    Git().runCommand("git commit -m \"\(message)\" --no-verify")
+}