gitx 3.0.2 → 3.1.0.ci.216.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1077ebb26e155a2ddaeca39eaa8afc89a5a6cd09
-  data.tar.gz: eabb5c99e9bdaac5512bfca7714a245cfb8d9b1c
+SHA256:
+  metadata.gz: 9a0e5095268a2282c0869ce70378bc5133d88596954107555e2d67e320afc3c6
+  data.tar.gz: f5b18e5c168961348ea0737f56e072629b0ec1d2d06fd531d547960e18658412
 SHA512:
-  metadata.gz: 6f0b0ade0d34b6d74cb77e6a3d49be8cea9fd1dfaffaf09038f8dec08bf21509263e3251cbbb9e35380a474851a0361884af6914e32de99b3fd88c5b74b324a9
-  data.tar.gz: fc1c96391e0ccecc7269ae3bb752ce8693f2f8788cde9f6336b1a225a9f9048d22d298f7425e526ca0a3f275ccd9b91ef5c50f8018fc5a433c761535b95c6375
+  metadata.gz: 5e43223974ea4505f234ef68af94ef99e76d2dff4c90c1e6e092993d23c1885738b72eaa50ea1a6acff00e935b7efd58c4962ae94563932a1860d1de8ee5a504
+  data.tar.gz: a48b3516a6c9d36566c3f42edf6cc5ef4c01556da25c45b377cbac151875e824ab1d71047679aa7d486407d8e8cd265986da92f986b302c42df1eda007c7be70

data/gitx.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
@@ -19,19 +17,19 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  spec.add_runtime_dependency 'octokit'
   spec.add_runtime_dependency 'rugged', '~> 0.26.0'
   spec.add_runtime_dependency 'thor'
-  spec.add_runtime_dependency 'octokit'
 
   spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'coveralls'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'webmock'
 
   # configure gem version for continuous integration builds
   if ENV['TRAVIS_JOB_NUMBER']

data/lib/gitx/cli/integrate_command.rb

@@ -41,7 +41,7 @@ module Gitx
         fetch_remote_branch(integration_branch)
         begin
           run_git_cmd 'merge', '--no-ff', '--message', commit_message(branch, integration_branch, pull_request), branch
-        rescue
+        rescue Gitx::Executor::ExecutionError
           raise MergeError, "Merge conflict occurred.  Please fix merge conflict and rerun command with --resume #{branch} flag"
         end
         run_git_cmd 'push', 'origin', 'HEAD'

data/lib/gitx/cli/review_command.rb

@@ -9,28 +9,28 @@ module Gitx
       include Gitx::Github
 
       BUMP_COMMENT_PREFIX = '[gitx] review bump :tada:'.freeze
-      BUMP_COMMENT_FOOTER = <<-EOS.dedent
+      BUMP_COMMENT_FOOTER = <<-MESSAGE.dedent
         # Bump comments should include:
         # * Summary of what changed
         #
         # This footer will automatically be stripped from the created comment
-      EOS
+      MESSAGE
       APPROVAL_COMMENT_PREFIX = '[gitx] review approved :shipit:'.freeze
-      APPROVAL_COMMENT_FOOTER = <<-EOS.dedent
+      APPROVAL_COMMENT_FOOTER = <<-MESSAGE.dedent
         # Approval comments can include:
         # * Feedback
         # * Follow-up items for after release
         #
         # This footer will automatically be stripped from the created comment
-      EOS
+      MESSAGE
       REJECTION_COMMENT_PREFIX = '[gitx] review rejected'.freeze
-      REJECTION_COMMENT_FOOTER = <<-EOS.dedent
+      REJECTION_COMMENT_FOOTER = <<-MESSAGE.dedent
         # Rejection comments should include:
         # * Feedback
         # * Required changes before approved
         #
         # This footer will automatically be stripped from the created comment
-      EOS
+      MESSAGE
 
       desc 'review', 'Create or update a pull request on github'
       method_option :title, type: :string, aliases: '-t', desc: 'pull request title'

data/lib/gitx/cli/start_command.rb

@@ -9,7 +9,7 @@ module Gitx
       VALID_BRANCH_NAME_REGEX = /^[A-Za-z0-9\-_]+$/
 
       desc 'start', 'start a new git branch with latest changes from master'
-      method_option :issue, type: :numeric, aliases: '-i', desc: 'Github issue number'
+      method_option :issue, type: :string, aliases: '-i', desc: 'Issue identifier'
       def start(branch_name = nil)
         until valid_new_branch_name?(branch_name)
           branch_name = ask("What would you like to name your branch? (ex: #{EXAMPLE_BRANCH_NAMES.sample})")
@@ -26,7 +26,10 @@ module Gitx
 
       def commit_message(branch_name)
         message = "[gitx] Start work on #{branch_name}"
-        message += "\n\nConnected to ##{options[:issue]}" if options[:issue]
+        if (issue = options[:issue])
+          issue = issue.dup.prepend('#') if issue =~ /\A\d+\z/
+          message += "\n\nConnected to #{issue}"
+        end
         message
       end
 

data/lib/gitx/cli/update_command.rb

@@ -21,7 +21,7 @@ module Gitx
 
       def update_branch(branch)
         run_git_cmd 'pull', 'origin', branch
-      rescue
+      rescue Gitx::Executor::ExecutionError
         raise MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command'
       end
 

data/lib/gitx/github.rb

@@ -7,7 +7,7 @@ module Gitx
     GLOBAL_CONFIG_FILE = '~/.config/gitx/github.yml'.freeze
     REVIEW_CONTEXT = 'peer_review'.freeze
     CLIENT_URL = 'https://github.com/wireframe/gitx'.freeze
-    PULL_REQUEST_FOOTER = <<-EOS.dedent
+    PULL_REQUEST_FOOTER = <<-MESSAGE.dedent
       # Pull Request Protips(tm):
       # * Describe how this change accomplishes the task at hand
       # * Use GitHub flavored Markdown http://github.github.com/github-flavored-markdown/
@@ -16,7 +16,7 @@ module Gitx
       # * Review CONTRIBUTING.md for relevant workflow requirements
       #
       # This footer will automatically be stripped from the pull request description
-    EOS
+    MESSAGE
 
     def find_or_create_pull_request(branch)
       pull_request = find_pull_request(branch)

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/spec/gitx/cli/integrate_command_spec.rb

@@ -159,10 +159,10 @@ describe Gitx::Cli::IntegrateCommand do
         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\n\nConnected to #10", 'feature-branch')
-                                             .and_raise('git merge feature-branch failed').ordered
+                                             .and_raise(Gitx::Executor::ExecutionError).ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
-          expect { cli.integrate }.to raise_error(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
+          expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, /Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
         end
       end
       it 'raises a helpful error' do

data/spec/gitx/cli/start_command_spec.rb

@@ -112,10 +112,10 @@ describe Gitx::Cli::StartCommand do
         should meet_expectations
       end
     end
-    context 'when --issue option is used' do
+    context 'when --issue option is used with a numeric issue ID' do
       let(:options) do
         {
-          issue: 10
+          issue: '10'
         }
       end
       before do
@@ -131,5 +131,24 @@ describe Gitx::Cli::StartCommand do
         should meet_expectations
       end
     end
+    context 'when --issue option is used with a non-numeric issue ID' do
+      let(:options) do
+        {
+          issue: 'FOO-123'
+        }
+      end
+      before do
+        expect(cli).to receive(:checkout_branch).with('master').ordered
+        expect(executor).to receive(:execute).with('git', 'pull').ordered
+        expect(repo).to receive(:create_branch).with('new-branch', 'master').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
+
+        cli.start 'new-branch'
+      end
+      it 'creates empty commit with link to issue id' do
+        should meet_expectations
+      end
+    end
   end
 end

data/spec/gitx/cli/update_command_spec.rb

@@ -41,7 +41,7 @@ describe Gitx::Cli::UpdateCommand do
       before do
         allow(cli).to receive(:say)
 
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').and_raise('merge error').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')
       end
@@ -54,7 +54,7 @@ describe Gitx::Cli::UpdateCommand do
         allow(cli).to receive(:say)
 
         expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').ordered
-        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').and_raise('merge error occurred').ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').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

metadata

@@ -1,45 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.1.0.ci.216.1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-25 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rugged
+  name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
-  name: octokit
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -277,12 +277,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.7.1
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations