thegarage-gitx 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1472845b75ae2e8f0c0a41c0ff1d19eda8813af
-  data.tar.gz: bbd73d4d28d3d416c3ede2ab3b4334feaae97030
+  metadata.gz: 0c816348d551adad9dafcf7efb19f3430707347d
+  data.tar.gz: e99bc201fb96d47977ab8f105a234e0c47549f93
 SHA512:
-  metadata.gz: cc00306173a80368159b1a29cd92ce1b14f00fb11b8f6cae0c08bdda557bb4e1749610bec58f22db924c39f27d4b433788ff902772a14202007ecd2d29785492
-  data.tar.gz: e9b309a00bae2aef338e1fc05af23618f2be9553cd850252c04b3456f0a8e4664fbe536970c05a0819b3d8b2ee12aa8f2f598fa778bb0e05408d768535eb13c3
+  metadata.gz: 0c412f5989ed6aba0ffb0485d655af476967c0631c35ffa39ff874f24b6826cdff9db8a94bbc7676f33339583334032e72f33341ac8fb94d485b7ed32b9e3504
+  data.tar.gz: 74f411acf2307fa4470478400f244db2ef27afbbe22dccc8055350b5e5791494b866bd3ccb98cf86c673c61f4410312a47441c88066781e17a5642e509f1ba4a

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

@@ -2,7 +2,7 @@ require 'thor'
 require 'thegarage/gitx'
 require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
-require 'thegarage/gitx/cli/github'
+require 'thegarage/gitx/github'
 
 module Thegarage
   module Gitx

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

@@ -4,11 +4,14 @@ require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
 require 'thegarage/gitx/cli/integrate_command'
 require 'thegarage/gitx/cli/cleanup_command'
+require 'thegarage/gitx/github'
 
 module Thegarage
   module Gitx
     module Cli
       class ReleaseCommand < BaseCommand
+        include Github
+
         desc 'release', 'release the current branch to production'
         def release
           return unless yes?("Release #{current_branch.name} to production? (y/n)", :green)
@@ -17,6 +20,8 @@ module Thegarage
           assert_not_protected_branch!(branch, 'release')
           UpdateCommand.new.update
 
+          find_or_create_pull_request(branch)
+
           checkout_branch Thegarage::Gitx::BASE_BRANCH
           run_cmd "git pull origin #{Thegarage::Gitx::BASE_BRANCH}"
           run_cmd "git merge --no-ff #{branch}"

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

@@ -2,7 +2,7 @@ require 'thor'
 require 'thegarage/gitx'
 require 'thegarage/gitx/cli/base_command'
 require 'thegarage/gitx/cli/update_command'
-require 'thegarage/gitx/cli/github'
+require 'thegarage/gitx/github'
 
 module Thegarage
   module Gitx

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.6.0'
+    VERSION = '2.7.0'
   end
 end

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

@@ -28,10 +28,11 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
-    context 'when user confirms release' do
+    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)
@@ -40,13 +41,62 @@ describe Thegarage::Gitx::Cli::ReleaseCommand do
         expect(fake_integrate_command).to receive(:integrate).with('staging')
 
         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
 
-        cli.release
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    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",
+          issue_url: "https://api/path/to/issue/url",
+          number: 10,
+          head: {
+            ref: "branch_name"
+          }
+        }
+      end
+      before 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(: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 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
+
+        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
+          cli.release
+        end
+      end
+      it 'creates pull request on github' do
+        should meet_expectations
       end
       it 'runs expected commands' do
         should meet_expectations

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -263,7 +263,6 @@ files:
 - lib/thegarage/gitx/cli/base_command.rb
 - lib/thegarage/gitx/cli/buildtag_command.rb
 - lib/thegarage/gitx/cli/cleanup_command.rb
-- lib/thegarage/gitx/cli/github.rb
 - lib/thegarage/gitx/cli/integrate_command.rb
 - lib/thegarage/gitx/cli/nuke_command.rb
 - lib/thegarage/gitx/cli/release_command.rb
@@ -274,6 +273,7 @@ files:
 - lib/thegarage/gitx/cli/update_command.rb
 - lib/thegarage/gitx/extensions/string.rb
 - lib/thegarage/gitx/extensions/thor.rb
+- lib/thegarage/gitx/github.rb
 - lib/thegarage/gitx/version.rb
 - spec/fixtures/vcr_cassettes/pull_request_does_exist.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml