thegarage-gitx 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0eea3b7dfcd17fef52f113c503608c7db7ad81d
-  data.tar.gz: 04eadf25b646e3aaff99d96e64c3adf1617b6df7
+  metadata.gz: 047d8374efd4e4538e833ad29cd8810dd46ce374
+  data.tar.gz: 21128daae406df84dba354facddb350a8269d0af
 SHA512:
-  metadata.gz: bea835e6b0f8984ef7ce84c487a67d82ca47220853b1a25b548e21b04e132451bfd575b887730f50b9cc8e26c23ad57d171f8c5a3e8578f5cda4e9860129f44a
-  data.tar.gz: cb1ca449eb9a0923b03f10ee20c83d2fff59001df18ef50c7a6137af194256956884c17db8137931bf3b6c0821465cabc91da9bd470508b841b10c67e8e1a793
+  metadata.gz: cc98d873a852cc18e45204c8877277348b014c4c40858df5a64b8b315a69b1c97cb139f12e31ffaa48ae47d322ddc90611542df6f73ac5b7ebd7d9cfde20c12d
+  data.tar.gz: f7e2341f50f7d43d0ada6df0aba04da4e08eef7f6e9a9e1f10123d896b6ffa6220e1844fa75ab8c77f234d8451387ac073185f911f1cb965b28911c1ba0f1e11

data/lib/thegarage/gitx/cli/base_command.rb

@@ -32,7 +32,7 @@ module Thegarage
         end
 
         def checkout_branch(branch_name)
-          repo.head = "refs/heads/#{branch_name}"
+          run_cmd "git checkout #{branch_name}"
         end
 
         # lookup the current branch of the repo

data/lib/thegarage/gitx/cli/cleanup_command.rb

@@ -8,7 +8,7 @@ module Thegarage
       class CleanupCommand < BaseCommand
         desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
         def cleanup
-          run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
+          checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd "git pull"
           run_cmd 'git remote prune origin'
 

data/lib/thegarage/gitx/cli/integrate_command.rb

@@ -23,7 +23,7 @@ module Thegarage
           refresh_branch_from_remote target_branch
           run_cmd "git pull . #{branch}"
           run_cmd "git push origin HEAD"
-          run_cmd "git checkout #{branch}"
+          checkout_branch branch
         end
 
         private
@@ -32,7 +32,7 @@ module Thegarage
         def refresh_branch_from_remote(target_branch)
           run_cmd "git branch -D #{target_branch}", :allow_failure => true
           run_cmd "git fetch origin"
-          run_cmd "git checkout #{target_branch}"
+          checkout_branch target_branch
         end
       end
     end

data/lib/thegarage/gitx/cli/nuke_command.rb

@@ -22,13 +22,13 @@ module Thegarage
           say "branch to "
           say last_known_good_tag, :green
 
-          run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
+          checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd "git branch -D #{bad_branch}", :allow_failure => true
           run_cmd "git push origin --delete #{bad_branch}", :allow_failure => true
           run_cmd "git checkout -b #{bad_branch} #{last_known_good_tag}"
           run_cmd "git push origin #{bad_branch}"
           run_cmd "git branch --set-upstream-to origin/#{bad_branch}"
-          run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
+          checkout_branch Thegarage::Gitx::BASE_BRANCH
         end
 
         private

data/lib/thegarage/gitx/cli/release_command.rb

@@ -17,7 +17,7 @@ module Thegarage
           assert_not_protected_branch!(branch, 'release')
           UpdateCommand.new.update
 
-          run_cmd "git checkout #{Thegarage::Gitx::BASE_BRANCH}"
+          checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
           run_cmd "git pull . #{branch}"
           run_cmd "git push origin HEAD"

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.0.4'
+    VERSION = '2.0.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged