gitx 3.1.2 → 3.2.0.ci.231.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e08878dfac9d91e18971c1f5a1004514d00a3166c097150ee4bb4b7facdcd71
-  data.tar.gz: f0e9e7588b0055cad2cdaca6e3daabc6130f1edc6a59aaf7ee77b8445eb20646
+  metadata.gz: 5b8587ddcc46ef139e7da6a96c086a1a22d36f3deeeaef1fe1ca821e715788fc
+  data.tar.gz: 4d6438cd1e56cdc71a884166c2fddf6c83603394a1ff955f56b64936cb8d9dde
 SHA512:
-  metadata.gz: cf60c209410079bcdb1fa2af67fb84a6c60976de3f18fa6cc8d13bd4a95db2f698e03843d991611a82facfcbe1a2957a85bf4628992794fd3193925cb0edb8f5
-  data.tar.gz: 7e0327e79b99e1c7eb1e40d21aca02881cb73f5d4b465c5b29b3d14bda905551b8d515322f26d516685bad62564b94055c7221bfc078d4c66f88c3049ab618f2
+  metadata.gz: 2654037ef33ad4715d93a8c3d24b0c7b9ee592b57f1200529bf46251481574b57df694d2832af190dd2efc6be2db63d7e327c79add1db503e325055264469196
+  data.tar.gz: 82fae8f49f8db3ee90166dae76f5143cbedb34f2553307a571dae4894bd6831910f3d64a13d0cc8410a472f5a9060df347134029fb2d2626fdf0edcd8d9aa2b4

data/.rubocop.yml

@@ -6,6 +6,9 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+AllCops:
+  TargetRubyVersion: '2.6'
+
 FileName:
   Exclude:
     - bin/*
@@ -25,7 +28,7 @@ Metrics/AbcSize:
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
-  Max: 7
+  Max: 8
 
 # Offense count: 5
 # Configuration parameters: CountComments.
@@ -35,7 +38,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 123
+  Max: 150
 
 # Offense count: 3
 Style/RescueModifier:

data/.ruby-version

@@ -1 +1 @@
-2.6.6
+2.7.3

data/README.md

@@ -47,13 +47,13 @@ This setting is cleared when a reviewer approves or rejects the pull request.
 
 ## git release <feature_branch_name (optional, default: current_branch)
 
-release the feature branch to master.  This operation will perform the following:
+release the feature branch to the base branch (by default, master).  This operation will perform the following:
 
 * pull latest code from remote feature branch
-* pull latest code from master branch
+* pull latest code from the base branch
 * prompt user to confirm they actually want to perform the release
 * check if pull request commit status is currently successful
-* merge current branch into master
+* merge current branch into the base branch (or add release label if configured)
 * (optional) cleanup merged branches from remote server
 
 options:
@@ -63,7 +63,7 @@ options:
 
 ## git cleanup
 
-delete released branches after they have been merged into master.
+delete released branches after they have been merged into the base branch.
 
 ## git nuke <aggregate_branch_name>
 

data/gitx.gemspec

@@ -3,18 +3,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'gitx'
-  spec.authors       = ['Ryan Sonnek']
-  spec.email         = ['ryan.sonnek@gmail.com']
-  spec.description   = 'Git eXtensions for improved development workflows'
-  spec.summary       = 'Utility scripts for Git to increase productivity for common operations'
-  spec.homepage      = ''
-  spec.license       = 'MIT'
+  spec.name                  = 'gitx'
+  spec.authors               = ['Ryan Sonnek']
+  spec.email                 = ['ryan.sonnek@gmail.com']
+  spec.description           = 'Git eXtensions for improved development workflows'
+  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.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
+  spec.files                 = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  spec.executables           = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files            = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths         = ['lib']
 
   spec.add_runtime_dependency 'octokit'
   spec.add_runtime_dependency 'rugged', '~> 0.27.10'

data/lib/gitx/cli/release_command.rb

@@ -12,7 +12,7 @@ module Gitx
       method_option :cleanup, type: :boolean, desc: 'cleanup merged branches after release'
       def release(branch = nil)
         branch ||= current_branch.name
-        
+
         return unless yes?("Release #{branch} to #{config.base_branch}? (y/n)", :green)
 
         assert_not_protected_branch!(branch, 'release')
@@ -22,10 +22,14 @@ module Gitx
         pull_request = find_or_create_pull_request(branch)
         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'
+        if (label = config.release_label)
+          label_pull_request pull_request, label
+        else
+          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
 
         after_release
       end

data/lib/gitx/configuration.rb

@@ -17,6 +17,10 @@ module Gitx
       config[:base_branch]
     end
 
+    def release_label
+      config[:release_label]
+    end
+
     def aggregate_branches
       config[:aggregate_branches]
     end

data/lib/gitx/defaults.yml

@@ -2,6 +2,10 @@
 # default base branch
 base_branch: master
 
+# Label to use for releasing a pull request, if this is set a label will be
+# added to the PR rather than merging to the base branch
+release_label:
+
 # list of branches eligable for integration
 aggregate_branches:
   - staging

data/lib/gitx/github.rb

@@ -57,6 +57,10 @@ module Gitx
       github_client.create_status(github_slug, commit_sha, state, context: REVIEW_CONTEXT, description: description)
     end
 
+    def label_pull_request(pull_request, label)
+      github_client.add_labels_to_an_issue(github_slug, pull_request.number, [label])
+    end
+
     # @see http://developer.github.com/v3/pulls/
     def create_pull_request(branch)
       say 'Creating pull request for '
@@ -143,7 +147,7 @@ module Gitx
     #   https://github.com/wireframe/gitx.git #=> wireframe/gitx
     def github_slug
       remote = repo.config['remote.origin.url']
-      remote.to_s.gsub(/\.git$/, '').split(%r{[:\/]}).last(2).join('/')
+      remote.to_s.gsub(/\.git$/, '').split(%r{[:/]}).last(2).join('/')
     end
 
     def github_organization
@@ -155,9 +159,7 @@ module Gitx
     end
 
     def global_config
-      @global_config ||= begin
-        File.exist?(global_config_file) ? YAML.load_file(global_config_file) : {}
-      end
+      @global_config ||= File.exist?(global_config_file) ? YAML.load_file(global_config_file) : {}
     end
 
     def save_global_config(options)

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '3.1.2'.freeze
+  VERSION = '3.2.0'.freeze
 end

data/spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status.yml

@@ -145,5 +145,6 @@ http_interactions:
       encoding: UTF-8
       string: '{"state":"success"}'
     http_version:
-  recorded_at: Wed, 10 Dec 2014 19:14:11 GMT
+  recorded_at: Tue, 05 Aug 2014 16:36:03 GMT
 recorded_with: VCR 2.9.2
+

data/spec/fixtures/vcr_cassettes/pull_request_does_exist_with_success_status_and_then_add_label.yml

@@ -0,0 +1,228 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.github.com/repos/wireframe/gitx/pulls?head=wireframe:feature-branch&state=open
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      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:
+      - Tue, 05 Aug 2014 16:36:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4991'
+      X-Ratelimit-Reset:
+      - '1407257585'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Etag:
+      - '"6d00d48abf2adf1877c8244700cd4c6f"'
+      X-Oauth-Scopes:
+      - repo
+      X-Accepted-Oauth-Scopes:
+      - ''
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Link:
+      - <https://api.github.com/repositories/17608725/pulls?head=wireframe%3Afeature-branch&state=open&page=0>;
+        rel="last"
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '2'
+      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:
+      - 46C5E25C:1E4F:1642AD9:53E107F3
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - d818ddef80f4c7d10683dd483558952a
+    body:
+      encoding: UTF-8
+      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
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 3.2.0
+      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:
+      - Tue, 05 Aug 2014 16:36:03 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Status:
+      - 200 OK
+      X-Ratelimit-Limit:
+      - '5000'
+      X-Ratelimit-Remaining:
+      - '4991'
+      X-Ratelimit-Reset:
+      - '1407257585'
+      Cache-Control:
+      - private, max-age=60, s-maxage=60
+      Etag:
+      - '"6d00d48abf2adf1877c8244700cd4c6f"'
+      X-Oauth-Scopes:
+      - repo
+      X-Accepted-Oauth-Scopes:
+      - ''
+      Vary:
+      - Accept, Authorization, Cookie, X-GitHub-OTP
+      - Accept-Encoding
+      X-Github-Media-Type:
+      - github.v3; format=json
+      Link:
+      - <https://api.github.com/repositories/17608725/pulls?head=wireframe%3Afeature-branch&state=open&page=0>;
+        rel="last"
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Content-Length:
+      - '2'
+      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:
+      - 46C5E25C:1E4F:1642AD9:53E107F3
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains
+      X-Content-Type-Options:
+      - nosniff
+      X-Served-By:
+      - d818ddef80f4c7d10683dd483558952a
+    body:
+      encoding: UTF-8
+      string: '[{"id":1,"name":"release-me"}]'
+    http_version:
+  recorded_at: Tue, 05 Aug 2014 16:36:03 GMT
+recorded_with: VCR 2.9.2
+

data/spec/gitx/cli/integrate_command_spec.rb

@@ -19,6 +19,7 @@ describe Gitx::Cli::IntegrateCommand do
 
   before do
     allow(cli).to receive(:current_branch).and_return(current_branch)
+    allow(cli).to receive(:github_slug).and_return('wireframe/gitx')
     branches = double('fake branches')
     allow(branches).to receive(:each_name).with(:local).and_return(local_branch_names)
     allow(branches).to receive(:each_name).with(:remote).and_return(remote_branch_names)

data/spec/gitx/cli/release_command_spec.rb

@@ -17,6 +17,7 @@ describe Gitx::Cli::ReleaseCommand do
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
+    allow(cli).to receive(:github_slug).and_return('wireframe/gitx')
   end
 
   describe '#release' do
@@ -58,6 +59,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(repo).to receive(:workdir).and_return(temp_dir)
 
         expect(cli).to receive(:yes?).and_return(true)
+        expect(cli).to_not receive(:label_pull_request)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
         expect(executor).to receive(:execute).with('git', 'checkout', 'feature-branch').ordered
@@ -200,5 +202,38 @@ 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
+      let(:gitx_config) do
+        {
+          'release_label' => 'release-me'
+        }
+      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 receive(:label_pull_request).with(having_attributes(number: 10), 'release-me').and_call_original
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+
+        expect(executor).to_not receive(:execute).with('git', 'checkout', 'master')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'master')
+        expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch')
+        expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD')
+
+        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
+
+        VCR.use_cassette('pull_request_does_exist_with_success_status_and_then_add_label') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'bundler/setup'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.join(__dir__, 'support/**/*.rb')].each { |f| require f }
+Dir[File.join(__dir__, 'support/**/*.rb')].sort.each { |f| require f }
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0.ci.231.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -240,6 +240,7 @@ files:
 - lib/gitx/version.rb
 - 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
@@ -274,20 +275,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.8
 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_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