gitx 2.13.2 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16bfeebb4be9f34943f8f4021d1ad46e7300f3e7
-  data.tar.gz: c54f875837167ec17d446ad1eddc913f5f721fc8
+  metadata.gz: 6879c6b0b329e85ee4fa68d2aa1ae44c95298263
+  data.tar.gz: da978aaaab7573d8dac8033b2b6522e362312cd6
 SHA512:
-  metadata.gz: 3a841e4f74d84b196beab4723755861969621d5269f692b6461a35683edc134171414a79ac8225096e04cbf4df2fc53ef84d7aa5e54fc60992df8fedadf01669
-  data.tar.gz: 086ae548dddcb3a93d473d1d134f214646890a15c5a9bb55af64a86c0e0a36d31bd84fe6a8a4d239461b604545c2ee8051e5e5827d1b8778298c649029697f6d
+  metadata.gz: 1a4dee3357477bf1304472c4cc2084560fcb31d00d02abdf3aabe270d92196730722d41a1806aebb38499fa2918da50aef02f320599d78fe0d8dcb844b0b5ab3
+  data.tar.gz: 5faca0a6beef13c58855059a5bcbe1eb9710dfdd285a52e85b91f63c8337840eba8affdf00b14588acd89f333f7e2ec7763ca43e3346d503b68d75f82c1f59bf

data/.hound.yml

@@ -0,0 +1,2 @@
+ruby:
+  config_file: .rubocop.yml

data/.rubocop.yml

@@ -0,0 +1,12 @@
+LineLength:
+  Max: 200
+
+Documentation:
+  Enabled: false
+
+StringLiterals:
+  EnforcedStyle: single_quotes
+
+FileName:
+  Exclude:
+    - bin/*

data/Rakefile

@@ -2,4 +2,4 @@ require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new('spec')
-task :default => :spec
+task default: :spec

data/bin/git-buildtag

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/buildtag_command'
 args = ARGV.dup.unshift('buildtag')
 Gitx::Cli::BuildtagCommand.start(args)

data/bin/git-cleanup

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/cleanup_command'
 args = ARGV.dup.unshift('cleanup')
 Gitx::Cli::CleanupCommand.start(args)
-

data/bin/git-integrate

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/integrate_command'
 args = ARGV.dup.unshift('integrate')
 Gitx::Cli::IntegrateCommand.start(args)

data/bin/git-nuke

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/nuke_command'
 args = ARGV.dup.unshift('nuke')
 Gitx::Cli::NukeCommand.start(args)

data/bin/git-release

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/release_command'
 args = ARGV.dup.unshift('release')
 Gitx::Cli::ReleaseCommand.start(args)

data/bin/git-review

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/review_command'
 args = ARGV.dup.unshift('review')
 Gitx::Cli::ReviewCommand.start(args)

data/bin/git-share

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/share_command'
 args = ARGV.dup.unshift('share')
 Gitx::Cli::ShareCommand.start(args)

data/bin/git-start

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/start_command'
 args = ARGV.dup.unshift('start')
 Gitx::Cli::StartCommand.start(args)

data/bin/git-track

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/track_command'
 args = ARGV.dup.unshift('track')
 Gitx::Cli::TrackCommand.start(args)

data/bin/git-update

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'gitx/cli/update_command'
 args = ARGV.dup.unshift('update')
 Gitx::Cli::UpdateCommand.start(args)

data/gitx.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |spec|
   spec.version       = Gitx::VERSION
   spec.authors       = ['Ryan Sonnek']
   spec.email         = ['ryan.sonnek@gmail.com']
-  spec.description   = %q{Git eXtensions for improved development workflow}
-  spec.summary       = %q{Utility scripts for Git to increase productivity for common operations}
+  spec.description   = 'Git eXtensions for improved development workflow'
+  spec.summary       = 'Utility scripts for Git to increase productivity for common operations'
   spec.homepage      = ''
   spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  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']
@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'terminal-notifier'
   spec.add_development_dependency 'terminal-notifier-guard'
+  spec.add_development_dependency 'rubocop'
 end

data/lib/gitx/cli/base_command.rb

@@ -12,7 +12,7 @@ module Gitx
 
       add_runtime_options!
 
-      method_option :trace, :type => :boolean, :aliases => '-v'
+      method_option :trace, type: :boolean, aliases: '-v'
       def initialize(*args)
         super(*args)
       end
@@ -40,7 +40,7 @@ module Gitx
       end
 
       def assert_not_protected_branch!(branch, action)
-        raise "Cannot #{action} reserved branch" if config.reserved_branch?(branch) || config.aggregate_branch?(branch)
+        fail "Cannot #{action} reserved branch" if config.reserved_branch?(branch) || config.aggregate_branch?(branch)
       end
 
       # helper to invoke other CLI commands

data/lib/gitx/cli/buildtag_command.rb

@@ -5,7 +5,6 @@ require 'gitx/cli/base_command'
 module Gitx
   module Cli
     class BuildtagCommand < BaseCommand
-
       desc 'buildtag', 'create a tag for the current build and push it back to origin (supports Travis CI and Codeship)'
       def buildtag
         fail 'Unknown branch. Environment variables TRAVIS_BRANCH or CI_BRANCH are required' unless branch_name

data/lib/gitx/cli/integrate_command.rb

@@ -9,8 +9,8 @@ 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 :resume, :type => :string, :aliases => '-r', :desc => 'resume merging of feature-branch'
-      method_option :comment, :type => :boolean, :aliases => '-c', :desc => 'add a comment to the pull request for this branch. Creates a new PR if none exists.'
+      method_option :resume, type: :string, aliases: '-r', desc: 'resume merging of feature-branch'
+      method_option :comment, type: :boolean, aliases: '-c', desc: 'add a comment to the pull request for this branch. Creates a new PR if none exists.'
       def integrate(integration_branch = 'staging')
         assert_aggregate_branch!(integration_branch)
 
@@ -20,7 +20,7 @@ module Gitx
         begin
           execute_command(UpdateCommand, :update)
         rescue
-          fail MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command'
+          raise MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command'
         end
 
         integrate_branch(branch, integration_branch) unless options[:resume]
@@ -44,7 +44,7 @@ module Gitx
         begin
           run_cmd "git merge #{branch}"
         rescue
-          fail MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
+          raise MergeError, "Merge Conflict Occurred. Please fix merge conflict and rerun command with --resume #{branch} flag"
         end
         run_cmd 'git push origin HEAD'
       end
@@ -63,7 +63,7 @@ module Gitx
       def fetch_remote_branch(target_branch)
         create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
         run_cmd 'git fetch origin'
-        run_cmd "git branch -D #{target_branch}", :allow_failure => true
+        run_cmd "git branch -D #{target_branch}", allow_failure: true
         checkout_branch target_branch
       end
 

data/lib/gitx/cli/nuke_command.rb

@@ -6,7 +6,7 @@ module Gitx
   module Cli
     class NukeCommand < BaseCommand
       desc 'nuke', 'nuke the specified aggregate branch and reset it to a known good state'
-      method_option :destination, :type => :string, :aliases => '-d', :desc => 'destination branch to reset to'
+      method_option :destination, type: :string, aliases: '-d', desc: 'destination branch to reset to'
       def nuke(bad_branch)
         good_branch = options[:destination] || ask("What branch do you want to reset #{bad_branch} to? (default: #{bad_branch})")
         good_branch = bad_branch if good_branch.length == 0
@@ -22,8 +22,8 @@ module Gitx
         say last_known_good_tag, :green
 
         checkout_branch Gitx::BASE_BRANCH
-        run_cmd "git branch -D #{bad_branch}", :allow_failure => true
-        run_cmd "git push origin --delete #{bad_branch}", :allow_failure => true
+        run_cmd "git branch -D #{bad_branch}", allow_failure: true
+        run_cmd "git push origin --delete #{bad_branch}", allow_failure: true
         run_cmd "git checkout -b #{bad_branch} #{last_known_good_tag}"
         run_cmd "git push origin #{bad_branch}"
         run_cmd "git branch --set-upstream-to origin/#{bad_branch}"
@@ -39,7 +39,7 @@ module Gitx
 
         say "#{bad_branch} contains migrations that may need to be reverted.  Ensure any reversable migrations are reverted on affected databases before nuking.", :red
         say 'Example commands to revert outdated migrations:'
-        outdated_migrations.reverse.each do |migration|
+        outdated_migrations.reverse_each do |migration|
           version = File.basename(migration).split('_').first
           say "rake db:migrate:down VERSION=#{version}"
         end
@@ -48,7 +48,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 'build-#{branch}-*'`" unless last_build_tag
+        fail "No known good tag found for branch: #{branch}.  Verify tag exists via `git tag -l 'build-#{branch}-*'`" unless last_build_tag
         last_build_tag
       end
 

data/lib/gitx/cli/release_command.rb

@@ -12,7 +12,7 @@ module Gitx
       include Gitx::Github
 
       desc 'release', 'release the current branch to production'
-      method_option :cleanup, :type => :boolean, :desc => 'cleanup merged branches after release'
+      method_option :cleanup, type: :boolean, desc: 'cleanup merged branches after release'
       def release(branch = nil)
         return unless yes?("Release #{current_branch.name} to production? (y/n)", :green)
 

data/lib/gitx/cli/review_command.rb

@@ -10,34 +10,34 @@ module Gitx
 
       BUMP_COMMENT_PREFIX = '[gitx] review bump :tada:'
       BUMP_COMMENT_FOOTER = <<-EOS.dedent
-  # Bump comments should include:
-  # * summary of what changed
-  #
-  # This footer will automatically be stripped from the created comment
+        # Bump comments should include:
+        # * summary of what changed
+        #
+        # This footer will automatically be stripped from the created comment
       EOS
       APPROVAL_COMMENT_PREFIX  = '[gitx] review approved :shipit:'
       APPROVAL_COMMENT_FOOTER = <<-EOS.dedent
-  # Approval comments can include:
-  # * feedback
-  # * post-release follow-up items
-  #
-  # This footer will automatically be stripped from the created comment
+        # Approval comments can include:
+        # * feedback
+        # * post-release follow-up items
+        #
+        # This footer will automatically be stripped from the created comment
       EOS
       REJECTION_COMMENT_PREFIX = '[gitx] review rejected'
       REJECTION_COMMENT_FOOTER = <<-EOS.dedent
-  # Rejection comments should include:
-  # * feedback for fixes required before approved
-  #
-  # This footer will automatically be stripped from the created comment
+        # Rejection comments should include:
+        # * feedback for fixes required before approved
+        #
+        # This footer will automatically be stripped from the created comment
       EOS
 
       desc 'review', 'Create or update a pull request on github'
-      method_option :description, :type => :string, :aliases => '-d', :desc => 'pull request description'
-      method_option :assignee, :type => :string, :aliases => '-a', :desc => 'pull request assignee'
-      method_option :open, :type => :boolean, :aliases => '-o', :desc => 'open the pull request in a web browser'
-      method_option :bump, :type => :boolean, :aliases => '-b', :desc => 'bump an existing pull request by posting a comment to re-review new changes'
-      method_option :approve, :type => :boolean, :desc => 'approve the pull request an post comment on pull request'
-      method_option :reject, :type => :boolean, :desc => 'reject the pull request an post comment on pull request'
+      method_option :description, type: :string, aliases: '-d', desc: 'pull request description'
+      method_option :assignee, type: :string, aliases: '-a', desc: 'pull request assignee'
+      method_option :open, type: :boolean, aliases: '-o', desc: 'open the pull request in a web browser'
+      method_option :bump, type: :boolean, aliases: '-b', desc: 'bump an existing pull request by posting a comment to re-review new changes'
+      method_option :approve, type: :boolean, desc: 'approve the pull request an post comment on pull request'
+      method_option :reject, type: :boolean, desc: 'reject the pull request an post comment on pull request'
       # @see http://developer.github.com/v3/pulls/
       def review(branch = nil)
         fail 'Github authorization token not found' unless authorization_token
@@ -68,17 +68,17 @@ module Gitx
       end
 
       def bump_pull_request(pull_request)
-        comment = comment_from_template(pull_request, BUMP_COMMENT_PREFIX, BUMP_COMMENT_FOOTER)
+        comment_from_template(pull_request, BUMP_COMMENT_PREFIX, BUMP_COMMENT_FOOTER)
         update_review_status(pull_request, 'pending', 'Peer review in progress')
       end
 
       def reject_pull_request(pull_request)
-        comment = comment_from_template(pull_request, REJECTION_COMMENT_PREFIX, REJECTION_COMMENT_FOOTER)
+        comment_from_template(pull_request, REJECTION_COMMENT_PREFIX, REJECTION_COMMENT_FOOTER)
         update_review_status(pull_request, 'failure', 'Peer review rejected')
       end
 
       def approve_pull_request(pull_request)
-        comment = comment_from_template(pull_request, APPROVAL_COMMENT_PREFIX, APPROVAL_COMMENT_FOOTER)
+        comment_from_template(pull_request, APPROVAL_COMMENT_PREFIX, APPROVAL_COMMENT_FOOTER)
         update_review_status(pull_request, 'success', 'Peer review approved')
       end
 

data/lib/gitx/cli/update_command.rb

@@ -20,11 +20,9 @@ module Gitx
       private
 
       def update_branch(branch)
-        begin
-          run_cmd "git pull origin #{branch}"
-        rescue
-          fail MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command'
-        end
+        run_cmd "git pull origin #{branch}"
+      rescue
+        raise MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command'
       end
 
       def remote_branch_exists?(branch)

data/lib/gitx/extensions/string.rb

@@ -4,9 +4,9 @@ class String
     indent = scan(/^[ \t]*(?=\S)/).min.size || 0
     gsub(/^[ \t]{#{indent}}/, '')
   end
-  alias :dedent :undent
+  alias_method :dedent, :undent
 
   def blank?
-    self.to_s == ''
+    to_s == ''
   end
 end

data/lib/gitx/github.rb

@@ -103,12 +103,12 @@ module Gitx
       password = ask_without_echo("Github password for #{username}: ")
       client = Octokit::Client.new(login: username, password: password)
       options = {
-        :scopes => ['repo'],
-        :note => github_client_name,
-        :note_url => CLIENT_URL
+        scopes: ['repo'],
+        note: github_client_name,
+        note_url: CLIENT_URL
       }
       two_factor_auth_token = ask_without_echo('Github two factor authorization token (if enabled): ')
-      options[:headers] = {'X-GitHub-OTP' => two_factor_auth_token} if two_factor_auth_token
+      options[:headers] = { 'X-GitHub-OTP' => two_factor_auth_token } if two_factor_auth_token
       response = client.create_authorization(options)
       response.token
     rescue Octokit::ClientError => e
@@ -122,7 +122,7 @@ module Gitx
     end
 
     def github_client
-      @client ||= Octokit::Client.new(:access_token => authorization_token)
+      @client ||= Octokit::Client.new(access_token: authorization_token)
     end
 
     # @return [String] github username (ex: 'wireframe') of the current github.user
@@ -140,7 +140,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(/[:\/]/).last(2).join('/')
+      remote.to_s.gsub(/\.git$/, '').split(/[:\/]/).last(2).join('/')
     end
 
     def github_organization
@@ -153,13 +153,13 @@ module Gitx
 
     def global_config
       @config ||= begin
-        File.exists?(global_config_file) ? YAML.load_file(global_config_file) : {}
+        File.exist?(global_config_file) ? YAML.load_file(global_config_file) : {}
       end
     end
 
     def save_global_config(options)
       config_dir = File.dirname(global_config_file)
-      ::FileUtils.mkdir_p(config_dir, mode: 0700) unless File.exists?(config_dir)
+      ::FileUtils.mkdir_p(config_dir, mode: 0700) unless File.exist?(config_dir)
 
       @config = global_config.merge(options)
       File.open(global_config_file, 'a+') do |file|

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.13.2'
+  VERSION = '2.13.3'
 end

data/spec/gitx/cli/base_command_spec.rb

@@ -21,9 +21,9 @@ describe Gitx::Cli::BaseCommand do
   describe 'with custom .gitx.yml config file' do
     let(:config) do
       {
-  'aggregate_branches' => %w( foo bar ),
-  'reserved_branches' => %w( baz qux ),
-  'taggable_branches' => %w( quux corge )
+        'aggregate_branches' => %w( foo bar ),
+        'reserved_branches' => %w( baz qux ),
+        'taggable_branches' => %w( quux corge )
       }
     end
     before do

data/spec/gitx/cli/integrate_command_spec.rb

@@ -38,7 +38,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -91,7 +91,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -115,7 +115,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate 'prototype'
@@ -174,7 +174,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch')
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -201,7 +201,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).not_to receive(:run_cmd).with('git push origin HEAD')
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
         end
@@ -227,7 +227,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
 
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.integrate
@@ -237,8 +237,8 @@ describe Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
       it 'posts comment to pull request' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
       end
     end
     context 'with --comment flag when a pull request doesn\'t exist for the feature-branch' do
@@ -271,8 +271,8 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
         expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return('2013-01-01 did some stuff').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'})
-        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(:status => 201)
+        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' })
+        stub_request(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_not_exist') do
           cli.integrate
@@ -282,8 +282,8 @@ describe Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
       it 'creates github comment for integration' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: '[gitx] integrated into staging :twisted_rightwards_arrows:'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: '[gitx] integrated into staging :twisted_rightwards_arrows:' })
       end
     end
   end

data/spec/gitx/cli/release_command_spec.rb

@@ -128,7 +128,7 @@ describe Gitx::Cli::ReleaseCommand do
         expect(cli).to receive(:run_cmd).with('git merge --no-ff feature-branch').ordered
         expect(cli).to receive(:run_cmd).with('git push origin HEAD').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'})
+        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
           cli.release
         end

data/spec/gitx/cli/review_command_spec.rb

@@ -47,7 +47,7 @@ describe Gitx::Cli::ReviewCommand do
         expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("* old commit\n\n* new commit").ordered
         expect(cli).to receive(:ask_editor).with("### Changelog\n* old commit\n\n* new commit\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).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'})
+        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
           cli.review
@@ -82,7 +82,7 @@ describe Gitx::Cli::ReviewCommand do
         expect(cli).to receive(:run_cmd).with("git log master...feature-branch --reverse --no-merges --pretty=format:'* %s%n%b'").and_return("* old commit\n\n* new commit").ordered
         expect(cli).to receive(:ask_editor).with("### Changelog\n* old commit\n\n* new commit\n#{Gitx::Github::PULL_REQUEST_FOOTER}", anything).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'})
+        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
           cli.review 'feature-branch'
@@ -126,7 +126,7 @@ describe Gitx::Cli::ReviewCommand do
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        stub_request(:patch, /.*api.github.com.*/).to_return(:status => 200)
+        stub_request(:patch, /.*api.github.com.*/).to_return(status: 200)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.review
@@ -166,19 +166,19 @@ describe Gitx::Cli::ReviewCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:ask_editor).and_return('comment description')
         allow(repo).to receive(:head).and_return(reference)
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.review
         end
       end
       it 'posts comment to github' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: "[gitx] review bump :tada:\n\ncomment description"})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: "[gitx] review bump :tada:\n\ncomment description" })
       end
       it 'creates pending build status for latest commit' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4').
-          with(body: {state: 'pending', context: 'peer_review', description: 'Peer review in progress'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4')
+          .with(body: { state: 'pending', context: 'peer_review', description: 'Peer review in progress' })
       end
     end
     context 'when --reject flag is passed' do
@@ -193,19 +193,19 @@ describe Gitx::Cli::ReviewCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:ask_editor).and_return('comment body')
         allow(repo).to receive(:head).and_return(reference)
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.review
         end
       end
       it 'posts comment to github' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: "[gitx] review rejected\n\ncomment body"})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: "[gitx] review rejected\n\ncomment body" })
       end
       it 'creates failure build status for latest commit' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4').
-          with(body: {state: 'failure', context: 'peer_review', description: 'Peer review rejected'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4')
+          .with(body: { state: 'failure', context: 'peer_review', description: 'Peer review rejected' })
       end
     end
     context 'when --approve flag is passed' do
@@ -220,19 +220,19 @@ describe Gitx::Cli::ReviewCommand do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
         expect(cli).to receive(:ask_editor).and_return('comment body')
         allow(repo).to receive(:head).and_return(reference)
-        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+        stub_request(:post, /.*api.github.com.*/).to_return(status: 201)
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
           cli.review
         end
       end
       it 'posts comment to github' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments').
-          with(body: {body: "[gitx] review approved :shipit:\n\ncomment body"})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+          .with(body: { body: "[gitx] review approved :shipit:\n\ncomment body" })
       end
       it 'creates success build status for latest commit' do
-        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4').
-          with(body: {state: 'success', context: 'peer_review', description: 'Peer review approved'})
+        expect(WebMock).to have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/statuses/e12da4')
+          .with(body: { state: 'success', context: 'peer_review', description: 'Peer review approved' })
       end
     end
   end
@@ -268,11 +268,11 @@ describe Gitx::Cli::ReviewCommand do
       let(:github_password) { 'secretz' }
       let(:authorization_token) { '123981239123' }
       before do
-        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations').
-          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'})
+        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
+          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
 
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(nil)
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password)
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(nil)
 
         @auth_token = cli.send(:authorization_token)
       end
@@ -291,13 +291,13 @@ describe Gitx::Cli::ReviewCommand do
       let(:github_password) { 'secretz' }
       let(:authorization_token) { '123981239123' }
       before do
-        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations').
-          to_return(:status => 401, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'}).
-          then.
-          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'})
+        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
+          .to_return(status: 401, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
+          .then
+          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
 
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password).twice
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(nil).twice
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password).twice
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(nil).twice
 
         @auth_token = cli.send(:authorization_token)
       end
@@ -338,12 +338,12 @@ describe Gitx::Cli::ReviewCommand do
       let(:authorization_token) { '123981239123' }
       let(:two_factor_auth_token) { '456456' }
       before do
-        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations').
-          with(headers: {'X-GitHub-OTP' => two_factor_auth_token}).
-          to_return(:status => 200, :body => JSON.dump(token: authorization_token), :headers => {'Content-Type' => 'application/json'})
+        stub_request(:post, 'https://ryan@codecrate.com:secretz@api.github.com/authorizations')
+          .with(headers: { 'X-GitHub-OTP' => two_factor_auth_token })
+          .to_return(status: 200, body: JSON.dump(token: authorization_token), headers: { 'Content-Type' => 'application/json' })
 
-        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', {:echo => false}).and_return(github_password)
-        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', {:echo => false}).and_return(two_factor_auth_token)
+        expect(cli).to receive(:ask).with('Github password for ryan@codecrate.com: ', echo: false).and_return(github_password)
+        expect(cli).to receive(:ask).with('Github two factor authorization token (if enabled): ', echo: false).and_return(two_factor_auth_token)
 
         @auth_token = cli.send(:authorization_token)
       end

data/spec/support/matchers/meet_expectations_matcher.rb

@@ -1,6 +1,6 @@
 # empty matcher to allow for mock expectations to fire
-RSpec::Matchers.define :meet_expectations do |expected|
-  match do |actual|
+RSpec::Matchers.define :meet_expectations do |_expected|
+  match do |_actual|
     # do nothing
     expect(true).to be true
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.13.3
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Git eXtensions for improved development workflow
 email:
 - ryan.sonnek@gmail.com
@@ -238,7 +252,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".ruby-version"
 - ".travis.yml"
 - CONTRIBUTING.md