gitx 4.1.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3794617867e08f0a15468dd3291883d22bed44fa9dfde0350cf120e5c5c8890c
-  data.tar.gz: 827802ca75c6a1f4243fa628a12dc3cc1e9b11afef91d587fc9fe4ae4a9b2b6e
+  metadata.gz: 7d276a1d2a8560dbb235b82b3c85b086fde5bf1b082f204b9f49775b20f77489
+  data.tar.gz: b0b5a42771c92360458ba3c374cecac1d333aa2d34fb51c6c30a3962cc1d9812
 SHA512:
-  metadata.gz: ae00b7739d6b3488d0ae4ae588d776c1a004eeb36167587699d2c0dae2ec49902dfc78d122f1edcab7e9ce47a3cecfd36efe59491bce0d663562058e08975f57
-  data.tar.gz: 8727bf623a20f50a6de72088a0e1106e26ccd1ba974d66471e2ed0f8643ffe3c04ec299b6d4343df3816f8c881af3588497e7a2fd9806627c418d461933d24dc
+  metadata.gz: d44543c6d8c06a11cce788c19e90f3e1aa1497ff87eebdc7d7e88f00b805f38e8a1d005e87008d945c3df0e67fa199e8a39106cb091285eae61598f89d1400ed
+  data.tar.gz: 0a8f2e1a5f7a725556f97ebad9390f1d1c16a5668cb3812654621acf5ee7fd505ebe4dd0070665fb53e9ca142b93e3a5adea14b0b0bfc0a923b985b7b5760bbd

data/.rubocop.yml

@@ -7,7 +7,7 @@
 # versions of RuboCop, may require this file to be generated again.
 
 AllCops:
-  TargetRubyVersion: '2.6'
+  TargetRubyVersion: '2.7'
 
 FileName:
   Exclude:

data/README.md

@@ -50,7 +50,7 @@ This setting is cleared when a reviewer approves or rejects the pull request.
 release the feature branch to the base branch (by default, main).  This operation will perform the following:
 
 * pull latest code from remote feature branch
-* pull latest code from the base branch
+* pull latest code from the base branch (unless `update_from_base_on_release` config is set to `false`)
 * prompt user to confirm they actually want to perform the release
 * check if pull request commit status is currently successful
 * merge current branch into the base branch (or add release label if configured)

data/gitx.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary               = 'Utility scripts for Git to increase productivity for common operations'
   spec.homepage              = ''
   spec.license               = 'MIT'
-  spec.required_ruby_version = '>= 2.6.7'
+  spec.required_ruby_version = '>= 2.7'
 
   spec.files                 = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths         = ['lib']
 
   spec.add_runtime_dependency 'octokit'
-  spec.add_runtime_dependency 'rugged', '~> 0.27.10'
+  spec.add_runtime_dependency 'rugged'
   spec.add_runtime_dependency 'thor'
 
   spec.add_development_dependency 'bundler'

data/lib/gitx/cli/release_command.rb

@@ -17,19 +17,9 @@ module Gitx
 
         assert_not_protected_branch!(branch, 'release')
         checkout_branch(branch)
-        run_git_cmd 'update'
+        run_git_cmd 'update' if config.update_from_base_on_release?
 
-        pull_request = find_or_create_pull_request(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
-          run_git_cmd 'push', 'origin', 'HEAD'
-        end
+        perform_release(branch)
 
         after_release
       end
@@ -51,6 +41,21 @@ module Gitx
         end
       end
 
+      def perform_release(branch)
+        pull_request = find_or_create_pull_request(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
+          run_git_cmd 'push', 'origin', 'HEAD'
+        end
+      end
+
       def after_release
         after_release_scripts = config.after_release_scripts.dup
         after_release_scripts << 'git cleanup' if options[:cleanup]

data/lib/gitx/configuration.rb

@@ -45,6 +45,10 @@ module Gitx
       taggable_branches.include?(branch)
     end
 
+    def update_from_base_on_release?
+      config.fetch(:update_from_base_on_release, true)
+    end
+
     def after_release_scripts
       config[:after_release]
     end

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '4.1.1'.freeze
+  VERSION = '4.4.0'.freeze
 end

data/spec/gitx/cli/release_command_spec.rb

@@ -235,5 +235,37 @@ describe Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
+    context 'when user confirms release with update_from_base_on_release config set to false' do
+      let(:gitx_config) do
+        {
+          'update_from_base_on_release' => false
+        }
+      end
+      before do
+        expect(repo).to receive(:workdir).and_return(temp_dir)
+        File.open(File.join(temp_dir, '.gitx.yml'), 'w') do |f|
+          f.puts gitx_config.to_yaml
+        end
+
+        expect(cli).to receive(:yes?).and_return(true)
+        expect(cli).to_not receive(:label_pull_request)
+        expect(executor).to_not receive(:execute).with('git', 'update')
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+
+        expect(executor).to receive(:execute).with('git', 'checkout', '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', '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 --skip-pull-request').ordered
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.4.0
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-06 00:00:00.000000000 Z
+date: 2023-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -28,16 +28,16 @@ dependencies:
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.10
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.27.10
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -275,7 +275,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.7
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="