Create Kumade::Git#add_and_commit_all_in

thoughtbot · Aug 29, 2011 · 1e575fa · 1e575fa
1 parent 535b1f6
commit 1e575fa
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/kumade/deployer.rb b/lib/kumade/deployer.rb
@@ -106,10 +106,7 @@ def invoke_custom_task
     end
 
     def git_add_and_commit_all_assets_in(dir)
-      run_or_error ["git checkout -b #{DEPLOY_BRANCH}", "git add -f #{dir}", "git commit -m 'Compiled assets'"],
-                   "Cannot deploy: couldn't commit assets"
-
-      success "Added and committed all assets"
+      @git.add_and_commit_all_in(dir, DEPLOY_BRANCH, 'Compiled assets', "Added and committed all assets", "couldn't commit assets")
     end
 
     def jammit_assets_path

diff --git a/lib/kumade/git.rb b/lib/kumade/git.rb
@@ -27,6 +27,12 @@ def delete(branch_to_delete, branch_to_checkout)
                    "Failed to clean up #{branch_to_delete} branch")
     end
 
+    def add_and_commit_all_in(dir, branch, commit_message, success_output, error_output)
+      run_or_error ["git checkout -b #{branch}", "git add -f #{dir}", "git commit -m '#{commit_message}'"],
+                   "Cannot deploy: #{error_output}"
+      success success_output
+    end
+
     def git_dirty?
       `git diff --exit-code`
       !$?.success?