gitx 3.1.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e08878dfac9d91e18971c1f5a1004514d00a3166c097150ee4bb4b7facdcd71
-  data.tar.gz: f0e9e7588b0055cad2cdaca6e3daabc6130f1edc6a59aaf7ee77b8445eb20646
+  metadata.gz: 59f45788834b6e13ec3fd859fe45cde1d4f84f1205866f0b72dd6800d40b6e5d
+  data.tar.gz: a08cd9beca1c16bc02f5654ed056e7e93d89e21df5914cb7507c04d679b6f1ec
 SHA512:
-  metadata.gz: cf60c209410079bcdb1fa2af67fb84a6c60976de3f18fa6cc8d13bd4a95db2f698e03843d991611a82facfcbe1a2957a85bf4628992794fd3193925cb0edb8f5
-  data.tar.gz: 7e0327e79b99e1c7eb1e40d21aca02881cb73f5d4b465c5b29b3d14bda905551b8d515322f26d516685bad62564b94055c7221bfc078d4c66f88c3049ab618f2
+  metadata.gz: 8d464966f06a39cadd33a9830130c5f25edbed7eccba994ce96fee827a1f8e9cdaa75dd4c3553338774b15fb5de2ce5185882034e506c6057b6d1a12f92b67d9
+  data.tar.gz: ac922c59dae45ed1d87c5e86c719628e2dfc55d13daffb9b9891cc01ced3672573c2916dbb6b9290fe8ae6ef5fe846322d71e574bf7c092bf39c32f249c35a22

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/CONTRIBUTING.md

@@ -25,7 +25,7 @@ Use [Test Driven Development](http://en.wikipedia.org/wiki/Test-driven_developme
 * Follow [best practices](http://robots.thoughtbot.com/post/48933156625/5-useful-tips-for-a-better-commit-message) for git commit messages to communicate your changes.
 * Add [ticket references to commits to automatically trigger product management workflows](http://help.sprint.ly/knowledgebase/articles/108139-available-scm-vcs-commands)
 * Only write the **minimal** amount of code necessary to accomplish the given task.
-* Ensure branch stays up-to-date with latest changes that are merged into master by using: `$ git update`
+* Ensure branch stays up-to-date with latest changes that are merged into main by using: `$ git update`
 * Changes that are not directly related to the current feature should be cherry-picked into their own branch and merged separately.
 
 ### Testing Protips™

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/wireframe/gitx.png?branch=master)](https://travis-ci.org/wireframe/gitx)
+[![Build Status](https://travis-ci.org/wireframe/gitx.png?branch=main)](https://travis-ci.org/wireframe/gitx)
 [![Code Coverage](https://coveralls.io/repos/wireframe/gitx/badge.png)](https://coveralls.io/r/wireframe/gitx)
 [![Code Climate](https://codeclimate.com/github/wireframe/gitx.png)](https://codeclimate.com/github/wireframe/gitx)
 
@@ -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, main).  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/cleanup_command.rb

@@ -5,7 +5,7 @@ require 'gitx/cli/base_command'
 module Gitx
   module Cli
     class CleanupCommand < BaseCommand
-      desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
+      desc 'cleanup', 'Cleanup branches that have been merged into main from the repo'
       def cleanup
         update_base_branch
         say 'Deleting local and remote branches that have been merged into '

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

@@ -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')
@@ -20,12 +20,16 @@ module Gitx
         run_git_cmd 'update'
 
         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
+          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
 
         after_release
       end

data/lib/gitx/cli/start_command.rb

@@ -8,7 +8,7 @@ module Gitx
       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\-_]+$/.freeze
 
-      desc 'start', 'start a new git branch with latest changes from master'
+      desc 'start', 'start a new git branch with latest changes from main'
       method_option :issue, type: :string, aliases: '-i', desc: 'Issue identifier'
       def start(branch_name = nil)
         branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})") until valid_new_branch_name?(branch_name)

data/lib/gitx/cli/update_command.rb

@@ -5,22 +5,31 @@ require 'gitx/cli/base_command'
 module Gitx
   module Cli
     class UpdateCommand < BaseCommand
-      desc 'update', 'Update the current branch with latest changes from the remote feature branch and master'
+      desc 'update', 'Update the current branch with latest changes from the remote feature branch and main'
       def update
         say 'Updating '
         say "#{current_branch.name} ", :green
         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/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

@@ -1,6 +1,10 @@
 ---
 # default base branch
-base_branch: master
+base_branch: main
+
+# 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:
@@ -10,16 +14,16 @@ aggregate_branches:
 # list of branches that should not be deleted when cleaning up
 reserved_branches:
   - HEAD
-  - master
+  - main
   - next_release
   - staging
   - prototype
 
 # list of supported branches for generating buildtags
 taggable_branches:
-  - master
+  - main
   - staging
 
 # list of commands to execute after releasing feature branch
 after_release:
-  - git integrate
+  - git integrate --skip-pull-request

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 = '4.1.0'.freeze
 end

data/spec/fixtures/vcr_cassettes/pull_request_does_exist_and_then_add_label.yml

@@ -0,0 +1,160 @@
+---
+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: 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/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/gitx/cli/buildtag_command_spec.rb

@@ -23,7 +23,7 @@ describe Gitx::Cli::BuildtagCommand do
         expect { cli.buildtag }.to raise_error(/Branch must be one of the supported taggable branches/)
       end
     end
-    context 'when options[:branch] is NOT master or staging' do
+    context 'when options[:branch] is NOT main or staging' do
       let(:options) do
         {
           branch: 'feature-branch'
@@ -33,16 +33,16 @@ describe Gitx::Cli::BuildtagCommand do
         expect { cli.buildtag }.to raise_error(/Branch must be one of the supported taggable branches/)
       end
     end
-    context 'when options[:branch] is master' do
+    context 'when options[:branch] is main' do
       let(:options) do
         {
-          branch: 'master'
+          branch: 'main'
         }
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(executor).to receive(:execute).with('git', 'tag', 'builds/master/2013-10-30-10-21-28', '--annotate', '--message', '[gitx] buildtag for master').ordered
-          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/master/2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'builds/main/2013-10-30-10-21-28', '--annotate', '--message', '[gitx] buildtag for main').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/main/2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end
@@ -53,14 +53,14 @@ describe Gitx::Cli::BuildtagCommand do
     context 'when options[:message] is passed' do
       let(:options) do
         {
-          branch: 'master',
+          branch: 'main',
           message: 'custom git commit message'
         }
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(executor).to receive(:execute).with('git', 'tag', 'builds/master/2013-10-30-10-21-28', '--annotate', '--message', 'custom git commit message').ordered
-          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/master/2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'builds/main/2013-10-30-10-21-28', '--annotate', '--message', 'custom git commit message').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'builds/main/2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end

data/spec/gitx/cli/cleanup_command_spec.rb

@@ -38,7 +38,7 @@ describe Gitx::Cli::CleanupCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', 'merged-local-feature').ordered
@@ -58,7 +58,7 @@ describe Gitx::Cli::CleanupCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature').ordered
@@ -78,7 +78,7 @@ describe Gitx::Cli::CleanupCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
         expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature/review').ordered

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)
@@ -46,18 +47,18 @@ describe Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'when current_branch == master' do
-      let(:current_branch) { double('fake branch', name: 'master', head?: true) }
-      let(:local_branch_names) { ['master'] }
+    context 'when current_branch == main' do
+      let(:current_branch) { double('fake branch', name: 'main', head?: true) }
+      let(:local_branch_names) { ['main'] }
       let(:remote_branch_names) { ['origin/staging'] }
       before do
         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 master into staging', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', '[gitx] Integrate main into staging', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'HEAD').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.integrate
       end
@@ -84,7 +85,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(executor).to receive(:execute).with('git', 'update').ordered
         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', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).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
@@ -108,7 +109,7 @@ describe Gitx::Cli::IntegrateCommand do
     context 'when staging branch does not exist remotely' do
       let(:remote_branch_names) { [] }
       before do
-        expect(repo).to receive(:create_branch).with('staging', 'master')
+        expect(repo).to receive(:create_branch).with('staging', 'main')
 
         expect(executor).to receive(:execute).with('git', 'update').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', 'staging:staging').ordered
@@ -213,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/nuke_command_spec.rb

@@ -22,26 +22,26 @@ describe Gitx::Cli::NukeCommand do
   end
 
   describe '#nuke' do
-    context 'when target branch == prototype and --destination == master' do
+    context 'when target branch == prototype and --destination == main' do
       let(:options) do
         {
           destination: good_branch
         }
       end
-      let(:good_branch) { 'master' }
+      let(:good_branch) { 'main' }
       let(:bad_branch) { 'prototype' }
-      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:buildtag) { double(:tag, name: 'builds/main/2013-10-01-01') }
       let(:tags) { [buildtag] }
       before do
         expect(cli).to receive(:yes?).and_return(true)
 
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/main/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.nuke bad_branch
       end
@@ -50,21 +50,21 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when target branch == prototype and destination prompt == nil' do
-      let(:good_branch) { 'master' }
+      let(:good_branch) { 'main' }
       let(:bad_branch) { 'prototype' }
-      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:buildtag) { double(:tag, name: 'builds/main/2013-10-01-01') }
       let(:tags) { [buildtag] }
       before do
         expect(cli).to receive(:ask).and_return(good_branch)
         expect(cli).to receive(:yes?).and_return(true)
 
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/main/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.nuke 'prototype'
       end
@@ -73,14 +73,14 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when user does not confirm nuking the target branch' do
-      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:buildtag) { double(:tag, name: 'builds/main/2013-10-01-01') }
       let(:tags) { [buildtag] }
       before do
-        expect(cli).to receive(:ask).and_return('master')
+        expect(cli).to receive(:ask).and_return('main')
         expect(cli).to receive(:yes?).and_return(false)
 
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
-        expect(executor).to_not receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to_not receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.nuke 'prototype'
       end
@@ -94,7 +94,7 @@ describe Gitx::Cli::NukeCommand do
           destination: good_branch
         }
       end
-      let(:good_branch) { 'master' }
+      let(:good_branch) { 'main' }
       let(:bad_branch) { 'prototype' }
       let(:buildtags) { '' }
       it 'raises error' do
@@ -103,9 +103,9 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when database migrations exist and user cancels operation' do
-      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:buildtag) { double(:tag, name: 'builds/main/2013-10-01-01') }
       let(:tags) { [buildtag] }
-      let(:good_branch) { 'master' }
+      let(:good_branch) { 'main' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
         %w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
@@ -115,8 +115,8 @@ describe Gitx::Cli::NukeCommand do
 
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
         expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to builds/master/2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(executor).to receive(:execute).with('git', 'diff', 'builds/master/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
+        expect(cli).to receive(:yes?).with('Reset prototype to builds/main/2013-10-01-01? (y/n)', :green).and_return(true)
+        expect(executor).to receive(:execute).with('git', 'diff', 'builds/main/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(false)
 
         cli.nuke 'prototype'
@@ -129,9 +129,9 @@ describe Gitx::Cli::NukeCommand do
       end
     end
     context 'when database migrations exist and user approves operation' do
-      let(:buildtag) { double(:tag, name: 'builds/master/2013-10-01-01') }
+      let(:buildtag) { double(:tag, name: 'builds/main/2013-10-01-01') }
       let(:tags) { [buildtag] }
-      let(:good_branch) { 'master' }
+      let(:good_branch) { 'main' }
       let(:bad_branch) { 'prototype' }
       let(:migrations) do
         %w[db/migrate/20140715194946_create_users.rb db/migrate/20140730063034_update_user_account.rb].join("\n")
@@ -140,17 +140,17 @@ describe Gitx::Cli::NukeCommand do
         FileUtils.mkdir_p('db/migrate')
 
         expect(cli).to receive(:ask).and_return(good_branch)
-        expect(cli).to receive(:yes?).with('Reset prototype to builds/master/2013-10-01-01? (y/n)', :green).and_return(true)
-        expect(executor).to receive(:execute).with('git', 'diff', 'builds/master/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
+        expect(cli).to receive(:yes?).with('Reset prototype to builds/main/2013-10-01-01? (y/n)', :green).and_return(true)
+        expect(executor).to receive(:execute).with('git', 'diff', 'builds/main/2013-10-01-01...prototype', '--name-only', 'db/migrate').and_return(migrations)
         expect(cli).to receive(:yes?).with('Are you sure you want to nuke prototype? (y/n) ', :green).and_return(true)
 
         expect(executor).to receive(:execute).with('git', 'fetch', '--tags').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
         expect(executor).to receive(:execute).with('git', 'branch', '--delete', '--force', 'prototype').ordered
         expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'prototype').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/master/2013-10-01-01').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', '-b', 'prototype', 'builds/main/2013-10-01-01').ordered
         expect(executor).to receive(:execute).with('git', 'share').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+        expect(executor).to receive(:execute).with('git', 'checkout', 'main').ordered
 
         cli.nuke 'prototype'
       end

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
@@ -35,14 +36,14 @@ describe Gitx::Cli::ReleaseCommand do
       before do
         expect(repo).to receive(:workdir).and_return(temp_dir)
 
-        expect(cli).to receive(:yes?).with('Release feature-branch to master? (y/n)', :green).and_return(true)
+        expect(cli).to receive(:yes?).with('Release feature-branch to main? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: failure.  Proceed with release? (y/n)', :red).and_return(false)
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
         expect(executor).to receive(:execute).with('git', 'update').ordered
-        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', 'checkout', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\n\nConnected to #10", 'feature-branch')
         expect(executor).to_not receive(:execute).with('git', 'push', 'origin', 'HEAD')
 
         VCR.use_cassette('pull_request_does_exist_with_failure_status') do
@@ -58,15 +59,16 @@ 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
         expect(executor).to receive(:execute).with('git', 'update').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", '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').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
@@ -92,9 +94,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', 'checkout', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", '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('echo hello').ordered
 
@@ -115,11 +117,11 @@ 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', 'checkout', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", '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').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'
@@ -145,19 +147,19 @@ describe Gitx::Cli::ReleaseCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         allow(cli).to receive(:ask_editor).and_return('description')
 
-        expect(cli).to receive(:yes?).with('Release feature-branch to master? (y/n)', :green).and_return(true)
+        expect(cli).to receive(:yes?).with('Release feature-branch to main? (y/n)', :green).and_return(true)
         expect(cli).to receive(:yes?).with('Branch status is currently: pending.  Proceed with release? (y/n)', :red).and_return(true)
 
         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', 'checkout', 'feature-branch').ordered
         expect(executor).to receive(:execute).with('git', 'update').ordered
-        expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return('2013-01-01 did some stuff').ordered
-        expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", 'feature-branch').ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return('2013-01-01 did some stuff').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').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
@@ -185,11 +187,11 @@ 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', 'checkout', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').ordered
-        expect(executor).to receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to master\n\nConnected to #10", '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').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
@@ -200,5 +202,38 @@ describe Gitx::Cli::ReleaseCommand do
         should meet_expectations
       end
     end
+    context 'when user confirms release 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', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'pull', 'origin', 'main')
+        expect(executor).to_not receive(:execute).with('git', 'merge', '--no-ff', '--message', "[gitx] Release feature-branch to main\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 --skip-pull-request').ordered
+
+        VCR.use_cassette('pull_request_does_exist_and_then_add_label') do
+          cli.release
+        end
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
+    end
   end
 end

data/spec/gitx/cli/review_command_spec.rb

@@ -46,7 +46,7 @@ describe Gitx::Cli::ReviewCommand do
         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', 'update').ordered
-        expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
         expect(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return('description')
 
         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' })
@@ -82,11 +82,11 @@ describe Gitx::Cli::ReviewCommand do
         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', 'update').ordered
-        expect(executor).to receive(:execute).with('git', 'log', 'origin/master...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
+        expect(executor).to receive(:execute).with('git', 'log', 'origin/main...feature-branch', '--reverse', '--no-merges', '--pretty=format:* %B').and_return(changelog).ordered
         expect(cli).to receive(:ask_editor).with(changelog, hash_including(footer: Gitx::Github::PULL_REQUEST_FOOTER)).and_return(pull_request_description)
 
         stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
-          .with(body: { base: 'master', head: 'feature-branch', title: 'feature branch', body: pull_request_description }.to_json)
+          .with(body: { base: 'main', head: 'feature-branch', title: 'feature branch', body: pull_request_description }.to_json)
           .to_return(status: 201, body: new_pull_request.to_json, headers: { 'Content-Type' => 'application/json' })
 
         VCR.use_cassette('pull_request_does_not_exist') do

data/spec/gitx/cli/start_command_spec.rb

@@ -16,9 +16,9 @@ describe Gitx::Cli::StartCommand do
   describe '#start' do
     context 'when user inputs branch that is valid' do
       before do
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
 
@@ -30,9 +30,9 @@ describe Gitx::Cli::StartCommand do
     end
     context 'when user inputs branch with slash' do
       before do
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('foo/ryan', 'master').ordered
+        expect(repo).to receive(:create_branch).with('foo/ryan', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('foo/ryan').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on foo/ryan').ordered
 
@@ -46,9 +46,9 @@ describe Gitx::Cli::StartCommand do
       before do
         expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
 
@@ -62,9 +62,9 @@ describe Gitx::Cli::StartCommand do
       before do
         expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
 
@@ -81,9 +81,9 @@ describe Gitx::Cli::StartCommand do
 
         expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
 
@@ -100,9 +100,9 @@ describe Gitx::Cli::StartCommand do
 
         expect(cli).to receive(:ask).and_return('new-branch')
 
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', '[gitx] Start work on new-branch').ordered
 
@@ -119,9 +119,9 @@ describe Gitx::Cli::StartCommand do
         }
       end
       before do
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', "[gitx] Start work on new-branch\n\nConnected to #10").ordered
 
@@ -138,9 +138,9 @@ describe Gitx::Cli::StartCommand do
         }
       end
       before do
-        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(cli).to receive(:checkout_branch).with('main').ordered
         expect(executor).to receive(:execute).with('git', 'pull').ordered
-        expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'main').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
         expect(executor).to receive(:execute).with('git', 'commit', '--allow-empty', '--message', "[gitx] Start work on new-branch\n\nConnected to FOO-123").ordered
 

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', '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', 'master').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')
@@ -49,12 +55,15 @@ describe Gitx::Cli::UpdateCommand do
         should meet_expectations
       end
     end
-    context 'when merge conflicts occur when pulling remote master branch' do
+    context 'when merge conflicts occur when pulling remote main branch' 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', 'master').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', 'pull', 'origin', 'master').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', '.', 'main').ordered
+        expect(executor).to receive(:execute).with('git', 'share').ordered
 
         cli.update
       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: 4.1.0
 platform: ruby
 authors:
 - Ryan Sonnek
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2021-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -238,6 +238,7 @@ 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_not_exist.yml
@@ -266,7 +267,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -274,18 +275,19 @@ 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'
 requirements: []
-rubygems_version: 3.1.2
-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_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_not_exist.yml