gitx 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f363b92a7270ced1b7e223e2bed065c03a57fdd71c039345d582b87cca05ed05
-  data.tar.gz: 6df469f9e3875c42ce1e6b9267fee73606cbc0ad17caa51a856dbbbe2b18847d
+  metadata.gz: 59f45788834b6e13ec3fd859fe45cde1d4f84f1205866f0b72dd6800d40b6e5d
+  data.tar.gz: a08cd9beca1c16bc02f5654ed056e7e93d89e21df5914cb7507c04d679b6f1ec
 SHA512:
-  metadata.gz: 99b0b5cbdc523dc710533a84f921868e0db1067fab2500e9314030e0332a636f00ee8ca63f71fe8b147ea48ac3d43653590d7fdc906bb7aff21a9a9134d91d0a
-  data.tar.gz: a7aacec3a63f9cbbab844663cd4ad5cab48ba6745278790bffb156ef87667b35c23889c250acf71bbe382140583025757a73fd501f04c6de0dedc421fc40b4da
+  metadata.gz: 8d464966f06a39cadd33a9830130c5f25edbed7eccba994ce96fee827a1f8e9cdaa75dd4c3553338774b15fb5de2ce5185882034e506c6057b6d1a12f92b67d9
+  data.tar.gz: ac922c59dae45ed1d87c5e86c719628e2dfc55d13daffb9b9891cc01ced3672573c2916dbb6b9290fe8ae6ef5fe846322d71e574bf7c092bf39c32f249c35a22

data/lib/gitx/cli/integrate_command.rb

@@ -9,6 +9,7 @@ module Gitx
     class IntegrateCommand < BaseCommand
       include Gitx::Github
       desc 'integrate', 'integrate the current branch into one of the aggregate development branches (default = staging)'
+      method_option :'skip-pull-request', type: :boolean, desc: 'skip pull request reference in merge commit'
       method_option :resume, type: :string, aliases: '-r', desc: 'resume merging of feature-branch'
       def integrate(integration_branch = 'staging')
         assert_aggregate_branch!(integration_branch)
@@ -17,7 +18,7 @@ module Gitx
         print_message(branch, integration_branch)
 
         run_git_cmd 'update'
-        pull_request = pull_request_for_branch(branch)
+        pull_request = pull_request_for_branch(branch) unless options[:'skip-pull-request']
         integrate_branch(branch, integration_branch, pull_request) unless options[:resume]
         checkout_branch branch
       end

data/lib/gitx/cli/release_command.rb

@@ -20,11 +20,11 @@ module Gitx
         run_git_cmd 'update'
 
         pull_request = find_or_create_pull_request(branch)
-        return unless confirm_branch_status?(branch)
 
         if (label = config.release_label)
           label_pull_request pull_request, label
         else
+          return unless confirm_branch_status?(branch)
           checkout_branch config.base_branch
           run_git_cmd 'pull', 'origin', config.base_branch
           run_git_cmd 'merge', '--no-ff', '--message', commit_message(branch, pull_request), branch

data/lib/gitx/cli/update_command.rb

@@ -12,15 +12,24 @@ module Gitx
         say 'with latest changes from '
         say config.base_branch, :green
 
+        update_base_branch
         update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
-        update_branch(config.base_branch)
+        update_branch(config.base_branch, repository: '.')
+
         run_git_cmd 'share'
       end
 
       private
 
-      def update_branch(branch)
-        run_git_cmd 'pull', 'origin', branch
+      def update_base_branch
+        branch_name = current_branch.name
+        checkout_branch(config.base_branch)
+        update_branch(config.base_branch)
+        checkout_branch(branch_name)
+      end
+
+      def update_branch(branch, repository: 'origin')
+        run_git_cmd 'pull', repository, branch
       rescue Gitx::Executor::ExecutionError
         raise MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command'
       end

data/lib/gitx/defaults.yml

@@ -26,4 +26,4 @@ taggable_branches:
 
 # list of commands to execute after releasing feature branch
 after_release:
-  - git integrate
+  - git integrate --skip-pull-request

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '4.0.0'.freeze
+  VERSION = '4.1.0'.freeze
 end

data/spec/fixtures/vcr_cassettes/{pull_request_does_exist_with_success_status_and_then_add_label.yml → pull_request_does_exist_and_then_add_label.yml}

@@ -78,74 +78,6 @@ http_interactions:
       string: '[{"html_url":"https://path/to/html/pull/request","issue_url":"https://api/path/to/issue/url","number":10,"head":{"ref":"branch_name", "sha": "e12da4"}}]'
     http_version:
   recorded_at: Tue, 05 Aug 2014 16:36:03 GMT
-- request:
-    method: get
-    uri: https://api.github.com/repos/wireframe/gitx/commits/feature-branch/status
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/vnd.github.v3+json
-      User-Agent:
-      - Octokit Ruby Gem 3.4.0
-      Content-Type:
-      - application/json
-      Authorization:
-      - token 123123
-      Accept-Encoding:
-      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response:
-    status:
-      code: 200
-      message: OK
-    headers:
-      Server:
-      - GitHub.com
-      Date:
-      - Wed, 10 Dec 2014 19:01:27 GMT
-      Content-Type:
-      - application/json; charset=utf-8
-      Transfer-Encoding:
-      - chunked
-      Status:
-      - 200 OK
-      X-Ratelimit-Limit:
-      - '5000'
-      X-Ratelimit-Remaining:
-      - '4993'
-      X-Ratelimit-Reset:
-      - '1418241620'
-      X-Oauth-Scopes:
-      - repo
-      X-Accepted-Oauth-Scopes:
-      - repo, repo:status
-      X-Github-Media-Type:
-      - github.v3; format=json
-      X-Xss-Protection:
-      - 1; mode=block
-      X-Frame-Options:
-      - deny
-      Content-Security-Policy:
-      - default-src 'none'
-      Access-Control-Allow-Credentials:
-      - 'true'
-      Access-Control-Expose-Headers:
-      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
-        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
-      Access-Control-Allow-Origin:
-      - "*"
-      X-Github-Request-Id:
-      - C6CBAFAF:141D:2F27072:54889887
-      Strict-Transport-Security:
-      - max-age=31536000; includeSubdomains; preload
-      X-Content-Type-Options:
-      - nosniff
-    body:
-      encoding: UTF-8
-      string: '{"state":"success"}'
-    http_version:
-  recorded_at: Tue, 05 Aug 2014 16:36:03 GMT
 - request:
     method: post
     uri: https://api.github.com/repos/wireframe/gitx/issues/10/labels

data/spec/gitx/cli/integrate_command_spec.rb

@@ -214,5 +214,29 @@ describe Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
+    context 'with --skip-pull-request' do
+      let(:changelog) { '* made some fixes' }
+      let(:changelog) { '2013-01-01 did some stuff' }
+      let(:options) { { 'skip-pull-request': true } }
+      before do
+        allow(cli).to receive(:ask_editor).and_return('description')
+
+        expect(executor).to receive(:execute).with('git', 'update').ordered
+        expect(executor).to receive(:execute).with('git', 'fetch', 'origin').ordered
+        expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'staging').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrate feature-branch into staging', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+
+        cli.integrate
+      end
+      it 'does not create pull request' do
+        expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
   end
 end

data/spec/gitx/cli/release_command_spec.rb

@@ -68,7 +68,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release
@@ -121,7 +121,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.release 'feature-branch'
@@ -159,7 +159,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/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
@@ -191,7 +191,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
         expect(executor).to receive(:execute).with('git cleanup').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
@@ -202,7 +202,7 @@ describe Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
-    context 'when user confirms release and pull request exists with success status with release_label config' do
+    context 'when user confirms release with release_label config' do
       let(:gitx_config) do
         {
           'release_label' => 'release-me'
@@ -225,9 +225,9 @@ describe Gitx::Cli::ReleaseCommand do
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
-        expect(executor).to receive(:execute).with('git integrate').ordered
+        expect(executor).to receive(:execute).with('git integrate --skip-pull-request').ordered
 
-        VCR.use_cassette('pull_request_does_exist_with_success_status_and_then_add_label') do
+        VCR.use_cassette('pull_request_does_exist_and_then_add_label') do
           cli.release
         end
       end

data/spec/gitx/cli/update_command_spec.rb

@@ -27,8 +27,11 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update
@@ -41,6 +44,9 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').and_raise(Gitx::Executor::ExecutionError).ordered
 
         expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
@@ -53,8 +59,11 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').and_raise(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').and_raise(Gitx::Executor::ExecutionError).ordered
 
         expect { cli.update }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command')
       end
@@ -68,7 +77,11 @@ describe Gitx::Cli::UpdateCommand do
         allow(cli).to receive(:say)
 
         expect(executor).not_to receive(:execute).with('git', 'pull', 'origin', 'feature-branch')
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', '.', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -238,9 +238,9 @@ files:
 - lib/gitx/extensions/thor.rb
 - lib/gitx/github.rb
 - lib/gitx/version.rb
+- spec/fixtures/vcr_cassettes/pull_request_does_exist_and_then_add_label.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_exist_with_failure_status.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status_and_then_add_label.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/gitx/cli/base_command_spec.rb
 - spec/gitx/cli/buildtag_command_spec.rb
@@ -287,9 +287,9 @@ signing_key:
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations
 test_files:
+- spec/fixtures/vcr_cassettes/pull_request_does_exist_and_then_add_label.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_exist_with_failure_status.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status.yml
-- spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status_and_then_add_label.yml
 - spec/fixtures/vcr_cassettes/pull_request_does_not_exist.yml
 - spec/gitx/cli/base_command_spec.rb
 - spec/gitx/cli/buildtag_command_spec.rb