throw an exception if a system call fails and don't just plow through executing commands

venkatd · venkatd · commit 48658e6361a8 · 2013-09-30T18:36:44.000-04:00
diff --git a/bin/code b/bin/code
@@ -47,6 +47,13 @@ command :push, :p do |c|
   end
 end
 
+command :hotfix, :fix do |c|
+  c.action do |global_options, options, args|
+    hotfix_name = args.join('-')
+    $git.hotfix hotfix_name
+  end
+end
+
 desc 'Cleanup after a feature has been merged through GitHub'
 command :finish do |c|
   c.action do |global_options, options, args|
diff --git a/lib/code/git.rb b/lib/code/git.rb
@@ -18,10 +18,36 @@ def path
     def start(feature)
       raise FeatureExistsError, "Feature #{feature} already exists" if Branch.exists?(feature)
 
-      development_branch.checkout unless current_branch.development?
-      development_branch.pull
+      with_stash do
+        development_branch.checkout unless current_branch.development?
+        development_branch.pull
+
+        Branch.create(feature).checkout
+      end
+    end
+
+    def stash
+      System.call('stash')
+    end
+
+    def unstash
+      System.call('stash pop')
+    end
 
-      Branch.create(feature).checkout
+    def with_stash
+      if uncommitted_changes?
+        stash
+        yield
+        unstash
+      else
+        yield
+      end
+    end
+
+    def hotfix(name)
+      start name
+      commit name if uncommitted_changes?
+      publish name
     end
 
     def switch(*patterns)
@@ -38,6 +64,11 @@ def cancel
       end
     end
 
+    def commit(message)
+      System.call 'add -A'
+      System.call "commit -m \"#{message}\""
+    end
+
     def publish(message = '')
       raise NotOnFeatureBranchError, 'Must be on a feature branch to publish your code' unless current_branch.feature?
       raise UncommittedChangesError, 'You have uncommitted changes' if uncommitted_changes?
@@ -68,11 +99,11 @@ def finish
       fetch
       development_branch.pull
 
-      branch.delete
+      branch.delete!
     end
 
     def uncommitted_changes?
-      System.result('git diff --name-status') != ''
+      System.result('git status --porcelain') != ''
     end
 
     def checkout(branch_name)
diff --git a/lib/code/system.rb b/lib/code/system.rb
@@ -2,8 +2,15 @@ module Code
   module System
     extend self
 
+    CommandFailedError = ::Class.new(StandardError)
+
     COLORS = {black: 30, red: 31, green: 32, yellow: 33, blue: 34, magenta: 35, teal: 36}
 
+    def prompt(*args)
+      print(*args)
+      gets
+    end
+
     def error(message)
       abort red(message)
     end
@@ -19,6 +26,11 @@ def open(item)
     def exec(script)
       puts green(script)
       %x[#{script}]
+      raise CommandFailedError, red("command failed: #{script}") if command_failed?
+    end
+
+    def command_failed?
+      not $?.success?
     end
 
     def puts(text)
@@ -43,7 +55,7 @@ def green(script)
     end
 
     def red(script)
-      color script, :magenta
+      color script, :red
     end
 
   end
