thegarage-gitx 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5947843d44e97022ee2483913d68e814ce12b4cb
-  data.tar.gz: ea8962e5e6aba024574764fd06c97d7f3da4721d
+  metadata.gz: 10f4e21a3805920b5ca93946c11e56ef001efe97
+  data.tar.gz: d9aadf889e5fb72ff04eea5a038415b1c7de1f82
 SHA512:
-  metadata.gz: 35b2bb78ba36e778d3826f642b466a218803420e44b531fac54ded8df46d3fe10a6286dafee64d6b57927c851d4ea44da89129ca39890133f10efd25324e10f9
-  data.tar.gz: 7a80b185ddb4d4abaab5f5f655f67d2b14860afbcad068a9e5f1a0d233877f80fcc4e9203f193ebd21dcd13a6fb9e3f538159487a068c1338dacd7fe5a954d47
+  metadata.gz: bfd973230ab08b57c6dca5d53af1be8ba7b82f043ee17f03ef9aa58496f53c52592035143194015a89de3be1fb42d8f97b3e9b1c66687cb4325a3c29fd26588c
+  data.tar.gz: c955f5f81ad7adca14b84537f64b0d7fefa6e02d88243e00c4fe1a57f2188d3e0f345635ad0a016c4b53e3653da2b4df3b6fe358b2b3ab34bf1dae92b9cf4c60

data/README.md

@@ -45,7 +45,10 @@ release the current feature branch to master.  This operation will perform the f
 * merge in latest code from master branch
 * prompt user to confirm they actually want to perform the release
 * merge current branch into master
-* cleanup merged branches from remote server
+* (optional) cleanup merged branches from remote server
+
+options:
+* `--cleanup` = automatically cleanup merged branches after release complete
 
 # Extra Utility Git Extensions
 

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

@@ -13,6 +13,7 @@ module Thegarage
         include Github
 
         desc 'release', 'release the current branch to production'
+        method_option :cleanup, :type => :boolean, :desc => 'cleanup merged branches after release'
         def release
           return unless yes?("Release #{current_branch.name} to production? (y/n)", :green)
 
@@ -28,7 +29,7 @@ module Thegarage
           run_cmd "git push origin HEAD"
 
           execute_command(IntegrateCommand, :integrate, 'staging')
-          execute_command(CleanupCommand, :cleanup)
+          execute_command(CleanupCommand, :cleanup) if options[:cleanup]
         end
       end
     end

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.7.2'
+    VERSION = '2.8.0'
   end
 end

data/spec/thegarage/gitx/cli/release_command_spec.rb

@@ -33,7 +33,7 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
       before do
         expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
         expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::CleanupCommand, :cleanup)
+        expect(cli).to_not receive(:execute_command).with(Thegarage::Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).and_return(true)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
@@ -69,7 +69,7 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
 
         expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update).twice
         expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::IntegrateCommand, :integrate, 'staging')
-        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::CleanupCommand, :cleanup)
+        expect(cli).to_not receive(:execute_command).with(Thegarage::Gitx::Cli::CleanupCommand, :cleanup)
 
         expect(cli).to receive(:yes?).and_return(true)
 
@@ -91,5 +91,36 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
+    context 'when --cleanup flag passed' do
+      let(:options) do
+        {
+          cleanup: true
+        }
+      end
+      let(:authorization_token) { '123123' }
+      before do
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::IntegrateCommand, :integrate, 'staging')
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::CleanupCommand, :cleanup)
+
+        expect(cli).to receive(:yes?).and_return(true)
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+
+        expect(cli).to receive(:run_cmd).with("git checkout master").ordered
+        expect(cli).to receive(:run_cmd).with("git pull origin master").ordered
+        expect(cli).to receive(:run_cmd).with("git merge --no-ff feature-branch").ordered
+        expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
+
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+      it 'prunes merged branches (git cleanup)' do
+        should meet_expectations
+      end
+    end
   end
 end

metadata

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