thegarage-gitx 2.7.1 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09fedfaebdd521708a24d8888081fc9fd069e6ff
-  data.tar.gz: 4f292966ed0b548879f59eb5462046920585a2cc
+  metadata.gz: 5947843d44e97022ee2483913d68e814ce12b4cb
+  data.tar.gz: ea8962e5e6aba024574764fd06c97d7f3da4721d
 SHA512:
-  metadata.gz: bc46244d36565c05ca6032ab4c8c47de3879d3972991c20b34346d1914534cb3ff4bb46526cadb672d5fa115dcbc85454548b24b8d817c9067464e8e8309cef5
-  data.tar.gz: 8fce08cfbe03c7dd3eeefc9a10302fe82ab0557df6840942149fa4079cae2ef41329bf30c6de4651bf726222c4ea2c887fa39a8e9d7254631704e7f73f6b067e
+  metadata.gz: 35b2bb78ba36e778d3826f642b466a218803420e44b531fac54ded8df46d3fe10a6286dafee64d6b57927c851d4ea44da89129ca39890133f10efd25324e10f9
+  data.tar.gz: 7a80b185ddb4d4abaab5f5f655f67d2b14860afbcad068a9e5f1a0d233877f80fcc4e9203f193ebd21dcd13a6fb9e3f538159487a068c1338dacd7fe5a954d47

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

@@ -45,6 +45,11 @@ module Thegarage
         def assert_not_protected_branch!(branch, action)
           raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
         end
+
+        # helper to invoke other CLI commands
+        def execute_command(command_class, method, args = [])
+          command_class.new.send(method, *args)
+        end
       end
     end
   end

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

@@ -18,7 +18,7 @@ module Thegarage
           print_message(branch, integration_branch)
 
           begin
-            UpdateCommand.new.update
+            execute_command(UpdateCommand, :update)
           rescue
             fail MergeError, "Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command"
           end

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

@@ -18,7 +18,7 @@ module Thegarage
 
           branch = current_branch.name
           assert_not_protected_branch!(branch, 'release')
-          UpdateCommand.new.update
+          execute_command(UpdateCommand, :update)
 
           find_or_create_pull_request(branch)
 
@@ -27,8 +27,8 @@ module Thegarage
           run_cmd "git merge --no-ff #{branch}"
           run_cmd "git push origin HEAD"
 
-          IntegrateCommand.new.integrate('staging')
-          CleanupCommand.new.cleanup
+          execute_command(IntegrateCommand, :integrate, 'staging')
+          execute_command(CleanupCommand, :cleanup)
         end
       end
     end

data/lib/thegarage/gitx/github.rb

@@ -17,7 +17,7 @@ module Thegarage
         def find_or_create_pull_request(branch)
           pull_request = find_pull_request(branch)
           pull_request ||= begin
-            UpdateCommand.new.update
+            execute_command(UpdateCommand, :update)
             pull_request = create_pull_request(branch)
             say 'Created pull request: '
             say pull_request.html_url, :green
@@ -54,7 +54,7 @@ module Thegarage
         end
 
         def pull_request_body(branch)
-          changelog = run_cmd "git log #{Thegarage::Gitx::BASE_BRANCH}...#{branch} --no-merges --pretty=format:'* %s%n%b'"
+          changelog = run_cmd("git log #{Thegarage::Gitx::BASE_BRANCH}...#{branch} --reverse --no-merges --pretty=format:'* %s%n%b'")
           description = options[:description]
 
           description_template = []

data/lib/thegarage/gitx/version.rb

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

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

@@ -24,16 +24,12 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
   end
 
   describe '#integrate' do
-    let(:fake_update_command) { double('fake update command') }
-    before do
-      allow(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
-    end
     context 'when integration branch is ommitted and remote branch exists' do
       let(:authorization_token) { '123123' }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
@@ -63,7 +59,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
@@ -94,7 +90,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       before do
         allow(cli).to receive(:ask_editor).and_return('description')
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update).twice
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update).twice
 
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
@@ -103,7 +99,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with("git push origin HEAD").ordered
         expect(cli).to receive(:run_cmd).with("git checkout feature-branch").ordered
 
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
+        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
 
         stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-gitx/pulls').to_return(:status => 201, :body => new_pull_request.to_json, :headers => {'Content-Type' => 'application/json'})
         stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments').to_return(:status => 201)
@@ -128,7 +124,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       let(:remote_branch_names) { [] }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(repo).to receive(:create_branch).with('staging', 'master')
 
@@ -159,7 +155,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       let(:remote_branch_names) { ['origin/prototype'] }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D prototype", allow_failure: true).ordered
@@ -186,10 +182,10 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
         expect { cli.integrate('some-other-branch') }.to raise_error(/Invalid aggregate branch: some-other-branch must be one of supported aggregate branches/)
       end
     end
-    context 'when merge conflicts occur during the updatecommand execution' do
+    context 'when merge conflicts occur during the Thegarage::Gitx::Cli::updatecommand execution' do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        expect(fake_update_command).to receive(:update).and_raise(Thegarage::Gitx::Cli::BaseCommand::MergeError)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update).and_raise(Thegarage::Gitx::Cli::BaseCommand::MergeError)
 
         expect { cli.integrate }.to raise_error(Thegarage::Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command')
       end
@@ -200,7 +196,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
     context 'when merge conflicts occur with the integrate command' do
       let(:remote_branch_names) { ['origin/staging'] }
       before do
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).to receive(:run_cmd).with("git fetch origin").ordered
         expect(cli).to receive(:run_cmd).with("git branch -D staging", allow_failure: true).ordered
@@ -224,7 +220,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
 
         expect(cli).not_to receive(:run_cmd).with("git branch -D staging")
         expect(cli).not_to receive(:run_cmd).with("git push origin HEAD")
@@ -253,7 +249,7 @@ describe Thegarage::Gitx::Cli::IntegrateCommand do
       let(:authorization_token) { '123123' }
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(fake_update_command).to receive(:update)
+        expect(cli).to receive(:execute_command).with(Thegarage::Gitx::Cli::UpdateCommand, :update)
         expect(cli).to receive(:ask).and_return('feature-branch')
 
         expect(cli).not_to receive(:run_cmd).with("git branch -D staging")

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

@@ -29,16 +29,11 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
       end
     end
     context 'when user confirms release and pull request exists' do
-      let(:fake_update_command) { double('fake update command', update: nil) }
-      let(:fake_integrate_command) { double('fake integrate command') }
-      let(:fake_cleanup_command) { double('fake cleanup command', cleanup: nil) }
       let(:authorization_token) { '123123' }
       before do
-        expect(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
-        expect(Thegarage::Gitx::Cli::IntegrateCommand).to receive(:new).and_return(fake_integrate_command)
-        expect(Thegarage::Gitx::Cli::CleanupCommand).to receive(:new).and_return(fake_cleanup_command)
-
-        expect(fake_integrate_command).to receive(:integrate).with('staging')
+        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)
@@ -58,9 +53,6 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
     end
     context 'when user confirms release and pull request does not exist' do
       let(:authorization_token) { '123123' }
-      let(:fake_update_command) { double('fake update command', update: nil) }
-      let(:fake_integrate_command) { double('fake integrate command') }
-      let(:fake_cleanup_command) { double('fake cleanup command', cleanup: nil) }
       let(:new_pull_request) do
         {
           html_url: "https://path/to/html/pull/request",
@@ -75,16 +67,13 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         allow(cli).to receive(:ask_editor).and_return('description')
 
-        expect(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command).twice
-        expect(Thegarage::Gitx::Cli::IntegrateCommand).to receive(:new).and_return(fake_integrate_command)
-        expect(Thegarage::Gitx::Cli::CleanupCommand).to receive(:new).and_return(fake_cleanup_command)
-
-        expect(fake_update_command).to receive(:update).twice
-        expect(fake_integrate_command).to receive(:integrate).with('staging')
+        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 receive(:yes?).and_return(true)
 
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
+        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
         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

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

@@ -43,7 +43,8 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
         expect(Thegarage::Gitx::Cli::UpdateCommand).to receive(:new).and_return(fake_update_command)
 
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --no-merges --pretty=format:'* %s%n%b'").and_return("2013-01-01 did some stuff").ordered
+        expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("* old commit\n\n* new commit").ordered
+        expect(cli).to receive(:ask_editor).with("### Changelog\n* old commit\n\n* new commit\n#{Thegarage::Gitx::Cli::Github::PULL_REQUEST_FOOTER}", anything).and_return('description')
 
         stub_request(:post, 'https://api.github.com/repos/thegarage/thegarage-gitx/pulls').to_return(:status => 201, :body => new_pull_request.to_json, :headers => {'Content-Type' => 'application/json'})
         VCR.use_cassette('pull_request_does_not_exist') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 2.7.2
 platform: ruby
 authors:
 - Ryan Sonnek