gitx 3.1.0.ci.216.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a0e5095268a2282c0869ce70378bc5133d88596954107555e2d67e320afc3c6
-  data.tar.gz: f5b18e5c168961348ea0737f56e072629b0ec1d2d06fd531d547960e18658412
+  metadata.gz: 96b227336f3e21cebf4f4be03e68b301333a1797e75cdb02aca430ba6fd41652
+  data.tar.gz: cf5a0a378857a405fa309bbd3539c45d69e2a32b6bc13e2cfe90a0563a8fb185
 SHA512:
-  metadata.gz: 5e43223974ea4505f234ef68af94ef99e76d2dff4c90c1e6e092993d23c1885738b72eaa50ea1a6acff00e935b7efd58c4962ae94563932a1860d1de8ee5a504
-  data.tar.gz: a48b3516a6c9d36566c3f42edf6cc5ef4c01556da25c45b377cbac151875e824ab1d71047679aa7d486407d8e8cd265986da92f986b302c42df1eda007c7be70
+  metadata.gz: 2608e996319f376c8eaa721a924f4b7a5d00788ed9e306df31d2b12aef43868313a4c11144912c0d5aa7e7772d3ca1d649be28f894dbfafef8d18b13a0f147f5
+  data.tar.gz: a4a8d25ee10ddbc46a19b78ca94f755dbd52a2508c4ccbc48ee04fae5b695317592322289aecc5b6296ab9b3557811d1211aa279716c359b1b28aec18185df49

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.3.1
+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

@@ -1,24 +1,24 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'gitx'
-  spec.version       = Gitx::VERSION
-  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.26.0'
+  spec.add_runtime_dependency 'rugged', '~> 0.27.10'
   spec.add_runtime_dependency 'thor'
 
   spec.add_development_dependency 'bundler'
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'webmock'
 
   # configure gem version for continuous integration builds
-  if ENV['TRAVIS_JOB_NUMBER']
-    spec.version = "#{spec.version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}"
-  end
+  version = Gitx::VERSION
+  version = "#{version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}" if ENV['TRAVIS_JOB_NUMBER']
+  spec.version = version
 end

data/lib/gitx/cli/base_command.rb

@@ -50,7 +50,7 @@ module Gitx
       end
 
       def config
-        @configuration ||= Gitx::Configuration.new(repo.workdir)
+        @config ||= Gitx::Configuration.new(repo.workdir)
       end
 
       def executor

data/lib/gitx/cli/buildtag_command.rb

@@ -13,6 +13,7 @@ module Gitx
       method_option :message, type: :string, aliases: '-m', desc: 'message to attach to the buildtag'
       def buildtag
         raise "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
+
         run_git_cmd 'tag', build_tag, '--annotate', '--message', label
         run_git_cmd 'push', 'origin', build_tag
       end
@@ -28,7 +29,7 @@ module Gitx
       end
 
       def build_tag
-        @buildtag ||= [
+        @build_tag ||= [
           BUILD_TAG_PREFIX,
           branch_name,
           utc_timestamp

data/lib/gitx/cli/cleanup_command.rb

@@ -38,6 +38,7 @@ module Gitx
         return false if config.reserved_branches.include?(branch)
         return false if config.aggregate_branch?(branch)
         return false if config.base_branch == branch
+
         true
       end
 

data/lib/gitx/cli/integrate_command.rb

@@ -34,6 +34,7 @@ module Gitx
 
       def pull_request_for_branch(branch)
         return nil if config.reserved_branch?(branch)
+
         find_or_create_pull_request(branch)
       end
 
@@ -54,11 +55,9 @@ module Gitx
       end
 
       def feature_branch_name
-        @feature_branch ||= begin
+        @feature_branch_name ||= begin
           feature_branch = options[:resume] || current_branch.name
-          until local_branch_exists?(feature_branch)
-            feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}")
-          end
+          feature_branch = ask("#{feature_branch} does not exist. Please select one of the available local branches: #{local_branches}") until local_branch_exists?(feature_branch)
           feature_branch
         end
       end

data/lib/gitx/cli/nuke_command.rb

@@ -14,6 +14,7 @@ module Gitx
 
         last_known_good_tag = current_build_tag(good_branch)
         return unless yes?("Reset #{bad_branch} to #{last_known_good_tag}? (y/n)", :green)
+
         assert_aggregate_branch!(bad_branch)
         return if migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
 
@@ -34,6 +35,7 @@ module Gitx
 
       def migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
         return false unless File.exist?('db/migrate')
+
         outdated_migrations = run_git_cmd('diff', "#{last_known_good_tag}...#{bad_branch}", '--name-only', 'db/migrate').split
         return false if outdated_migrations.empty?
 
@@ -49,6 +51,7 @@ module Gitx
       def current_build_tag(branch)
         last_build_tag = build_tags_for_branch(branch).last
         raise "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l`" unless last_build_tag
+
         last_build_tag
       end
 

data/lib/gitx/cli/release_command.rb

@@ -11,9 +11,10 @@ module Gitx
       desc 'release', 'release the current branch to production'
       method_option :cleanup, type: :boolean, desc: 'cleanup merged branches after release'
       def release(branch = nil)
-        return unless yes?("Release #{current_branch.name} to #{config.base_branch}? (y/n)", :green)
-
         branch ||= current_branch.name
+
+        return unless yes?("Release #{branch} to #{config.base_branch}? (y/n)", :green)
+
         assert_not_protected_branch!(branch, 'release')
         checkout_branch(branch)
         run_git_cmd 'update'
@@ -21,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/cli/start_command.rb

@@ -6,14 +6,12 @@ module Gitx
   module Cli
     class StartCommand < BaseCommand
       EXAMPLE_BRANCH_NAMES = %w[api-fix-invalid-auth desktop-cleanup-avatar-markup share-form-add-edit-link].freeze
-      VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
+      VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/.freeze
 
       desc 'start', 'start a new git branch with latest changes from master'
       method_option :issue, type: :string, aliases: '-i', desc: 'Issue identifier'
       def start(branch_name = nil)
-        until valid_new_branch_name?(branch_name)
-          branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
-        end
+        branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})") until valid_new_branch_name?(branch_name)
 
         checkout_branch config.base_branch
         run_git_cmd 'pull'
@@ -35,12 +33,13 @@ module Gitx
 
       def valid_new_branch_name?(branch)
         return false if repo_branches.include?(branch)
+
         Rugged::Reference.valid_name?("refs/heads/#{branch}")
       end
 
       # get list of local and remote branches
       def repo_branches
-        @branch_names ||= repo.branches.each_name.map do |branch|
+        @repo_branches ||= repo.branches.each_name.map do |branch|
           branch.gsub('origin/', '')
         end
       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/executor.rb

@@ -15,6 +15,7 @@ module Gitx
         loop do
           line = stdout_err.gets
           break unless line
+
           output << line
           yield line if block_given?
         end

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 '
@@ -124,7 +128,7 @@ module Gitx
     end
 
     def github_client
-      @client ||= Octokit::Client.new(access_token: authorization_token)
+      @github_client ||= Octokit::Client.new(access_token: authorization_token)
     end
 
     # @return [String] github username (ex: 'wireframe') of the current github.user
@@ -132,6 +136,7 @@ module Gitx
     def username
       username = repo.config['github.user']
       raise "Github user not configured.  Run: `git config --global github.user 'me@email.com'`" unless username
+
       username
     end
 
@@ -142,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
@@ -154,9 +159,7 @@ module Gitx
     end
 
     def global_config
-      @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.0'.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.0.ci.216.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Ryan Sonnek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.10
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -266,7 +267,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,21 +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: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.1
-signing_key: 
+rubygems_version: 3.1.6
+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