added git push and switch

venkatd · venkatd · commit 1ca369b9d680 · 2013-09-19T16:26:36.000-04:00
diff --git a/.ruby-gemset b/.ruby-gemset
@@ -0,0 +1 @@
+burnthis
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.0.0-p247
diff --git a/bin/code b/bin/code
@@ -1,4 +1,7 @@
 #!/usr/bin/env ruby
+
+$: << File.join(File.dirname(__FILE__), '..', 'lib') # while this is still in development
+
 require 'gli'
 begin # XXX: Remove this begin/rescue before distributing your app
 require 'code'
@@ -35,20 +38,33 @@ command :publish do |c|
   end
 end
 
+desc "Push your current branch"
+command :push do |c|
+  c.action do |global_options, options, args|
+    $git.push $git.current_branch
+  end
+end
+
 desc 'Cleanup after a feature has been merged through GitHub'
 command :finish do |c|
   c.action do |global_options, options, args|
     $git.finish
   end
 end
 
-desc 'Delete the branch you are working on switch back to development'
+desc 'Delete the branch you are working on and switch back to development'
 command :cancel do |c|
   c.action do |global_options, options, args|
     $git.cancel
   end
 end
 
+command :switch do |c|
+  c.action do |global_options, options, args|
+    $git.switch(*args)
+  end
+end
+
 pre do |global, command, options, args|
   $git = Code::Git.new
   true
diff --git a/lib/code/git.rb b/lib/code/git.rb
@@ -14,6 +14,23 @@ def start(feature)
       checkout feature
     end
 
+    def switch(*patterns)
+      branch = branch_matching *patterns
+      checkout branch
+    end
+
+    def branch_matching(*patterns)
+      branches.find { |b| branch_matches? b, *patterns } or abort "No branch matching #{patterns.join ' '} exists"
+    end
+
+    def branch_matches?(branch, *patterns)
+      patterns.all? { |p| branch.include? p }
+    end
+
+    def branches
+      `git branch`.strip.lines.map { |line| line.gsub(/\s|\*/, '') }
+    end
+
     def cancel
       if on_main_branch?
         puts "Nothing to cancel (already on #{main_branch})"
