gitx 2.13.3 → 2.13.4.ci.39.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 6879c6b0b329e85ee4fa68d2aa1ae44c95298263
-  data.tar.gz: da978aaaab7573d8dac8033b2b6522e362312cd6
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2ZjOGFjYTFiMmQ0YjU2Y2JjYTQ2ZjI3M2VjZGIzYjdlZTg4NmVmMA==
+  data.tar.gz: !binary |-
+    ZDFhZDNkYmNjOTBiZTBkNDhjZTk4YWFlY2EzZDhkMzgyMjNkZmZjMw==
 SHA512:
-  metadata.gz: 1a4dee3357477bf1304472c4cc2084560fcb31d00d02abdf3aabe270d92196730722d41a1806aebb38499fa2918da50aef02f320599d78fe0d8dcb844b0b5ab3
-  data.tar.gz: 5faca0a6beef13c58855059a5bcbe1eb9710dfdd285a52e85b91f63c8337840eba8affdf00b14588acd89f333f7e2ec7763ca43e3346d503b68d75f82c1f59bf
+  metadata.gz: !binary |-
+    ZjdlYjgxY2RiODFkODMwZWNmMWM1ZDllZDg3NzM4ZmI4YWU3MGMyM2JjOTg4
+    N2QzMTQ2OGI2MDcwNGYyOTY0MzYwMzk3NDQwY2M2ZDk4NjcwNjJlODFkODA4
+    MTM3ZmRmNWQ4ODA2ZGE1OTIyOGM4ZGVhODJlYTNjZDFlYzI0ZDk=
+  data.tar.gz: !binary |-
+    MDA2YWVhMWE0Y2UwOWZkNGRmMWE1OTc0NDdiOTk3MzNhYTliMTVhMjZjN2Fh
+    N2ZmMTI5MjkzMGIxMjk5MjI0NjM5MWUyNGNiZWJjZDVjNjEwYjU5MTU0Zjk1
+    OWQ2YzA1MDRjNzVlMzExNDZhZTA2YTE1MzYzOWQzZjM3Nzk1NzA=

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
-rvm:
-  - '2.1.2'
 before_install:
-  - git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
-  - git fetch
+- git config remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
+- git fetch
+deploy:
+  provider: rubygems
+  api_key:
+    secure: RHedFaKxfm4yxqJzSEOPZr+OrcS5B1uiPwRjpIHau4hzPysDiTHzjIiFO78o1qrl7UeX9c5k0RQZJGp+9OB/H+WgbyfUzX2C2RbUuHRZubTvFaBvf8qe2D5+7fvj0FdzYS6xKZ23N1FW4vN17M6sViJYlCncB3fxzRA/BHxQlkL1LbQOn9zChI9eZ/gQrKrnziL1IvBSAMygBLHEEMq18lFf+mHiXFJDw/2dghbnPFZh5WYWCbfe/dS7trTJZWax+4xZDmXIqNi3cZiGn5dj2HhMUBX9xHRJORVtplxvP/9ZVuxqdY499DdtsEvemZKEmdggk/jYyxkfKFy+SQSkqRkUAcAS/LmsSn0wkJRiKXSqxTyvF063nct4DQCPjd+HGIFVkVG+4Vknwusg78TZ/BoMlOJnGS7TIuZRdcRujBsoAEqnz9imCz9sMk6IJmyc4XYuwQmPaxQtn0iODt0wAtr3chuPV2IC3j5CdXnXoU00iYS+zZXfVJgBcrdiCuuHnhxGzdKixzgXQ8fUnkniN/uWc0T2X9BvGnf3gyqJEZb7uIXOkozrXF6allXBiM6fXC9X0tL06qjdhaY/WKnmFGThcIBayxrS51GIDcKOGoVaSx/juVDpScwtof2jJplLz09w+36Rz7zMB67xo4yaGp/TPI+CbMc+0+my4+3B9lg=

data/README.md

@@ -4,7 +4,10 @@
 
 # GitX
 
-> Useful Git eXtensions for improved development workflows
+> Git eXtensions for improved development workflows
+
+These custom scripts are automatically registered into the git namespace
+so they are available without learning any new commands!
 
 ### Global Options
 * `--trace` or `-v` = verbose output for debugging commands

data/gitx.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Gitx::VERSION
   spec.authors       = ['Ryan Sonnek']
   spec.email         = ['ryan.sonnek@gmail.com']
-  spec.description   = 'Git eXtensions for improved development workflow'
+  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'
@@ -35,4 +35,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'terminal-notifier'
   spec.add_development_dependency 'terminal-notifier-guard'
   spec.add_development_dependency 'rubocop'
+
+  # configure gem version for continuous integration builds
+  if ENV['TRAVIS_JOB_NUMBER']
+    spec.version = "#{spec.version}.ci.#{ENV['TRAVIS_JOB_NUMBER']}"
+  end
 end

data/lib/gitx/cli/integrate_command.rb

@@ -10,7 +10,6 @@ module Gitx
       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.'
       def integrate(integration_branch = 'staging')
         assert_aggregate_branch!(integration_branch)
 
@@ -20,13 +19,13 @@ module Gitx
         begin
           execute_command(UpdateCommand, :update)
         rescue
-          raise MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command'
+          raise MergeError, 'Merge conflict occurred.  Please fix merge conflict and rerun the integrate command'
         end
 
         integrate_branch(branch, integration_branch) unless options[:resume]
         checkout_branch branch
 
-        create_integrate_comment(branch) if options[:comment] && !config.reserved_branch?(branch)
+        create_integrate_comment(branch) unless config.reserved_branch?(branch)
       end
 
       private
@@ -44,7 +43,7 @@ module Gitx
         begin
           run_cmd "git merge #{branch}"
         rescue
-          raise 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

data/lib/gitx/version.rb

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

data/spec/gitx/cli/integrate_command_spec.rb

@@ -47,8 +47,9 @@ describe Gitx::Cli::IntegrateCommand do
       it 'defaults to staging branch' do
         should meet_expectations
       end
-      it 'does not post comment to pull request' do
-        expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+      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:' })
       end
     end
     context 'when current_branch == master' do
@@ -72,6 +73,54 @@ describe Gitx::Cli::IntegrateCommand do
       it 'does not create pull request' do
         expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/pulls')
       end
+      it 'does not post comment on pull request' do
+        expect(WebMock).to_not have_requested(:post, 'https://api.github.com/repos/wireframe/gitx/issues/10/comments')
+      end
+    end
+    context 'when a pull request doesnt exist for the feature-branch' do
+      let(:authorization_token) { '123123' }
+      let(:changelog) { '* made some fixes' }
+      let(:new_pull_request) do
+        {
+          html_url: 'https://path/to/html/pull/request',
+          issue_url: 'https://api/path/to/issue/url',
+          number: 10,
+          head: {
+            ref: 'branch_name'
+          }
+        }
+      end
+      before do
+        allow(cli).to receive(:ask_editor).and_return('description')
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
+
+        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
+        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
+        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
+        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
+        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
+        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
+        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)
+
+        VCR.use_cassette('pull_request_does_not_exist') do
+          cli.integrate
+        end
+      end
+      it 'creates github pull request' 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:' })
+      end
+      it 'runs expected commands' do
+        should meet_expectations
+      end
     end
     context 'when staging branch does not exist remotely' do
       let(:authorization_token) { '123123' }
@@ -135,7 +184,7 @@ describe Gitx::Cli::IntegrateCommand do
       before do
         expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).and_raise(Gitx::Cli::BaseCommand::MergeError)
 
-        expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge Conflict Occurred. Please Merge Conflict Occurred. Please fix merge conflict and rerun the integrate command')
+        expect { cli.integrate }.to raise_error(Gitx::Cli::BaseCommand::MergeError, 'Merge conflict occurred.  Please fix merge conflict and rerun the integrate command')
       end
       it 'raises a helpful error' do
         should meet_expectations
@@ -151,7 +200,7 @@ describe Gitx::Cli::IntegrateCommand do
         expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
         expect(cli).to receive(:run_cmd).with('git merge feature-branch').and_raise('git merge feature-branch failed').ordered
 
-        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(/Merge conflict occurred.  Please fix merge conflict and rerun command with --resume feature-branch flag/)
       end
       it 'raises a helpful error' do
         should meet_expectations
@@ -210,81 +259,5 @@ describe Gitx::Cli::IntegrateCommand do
         should meet_expectations
       end
     end
-    context 'for default integration (to staging) with --comment flag' do
-      let(:options) do
-        { comment: true }
-      end
-      let(:authorization_token) { '123123' }
-      let(:remote_branch_names) { ['origin/staging'] }
-      before do
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update)
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
-        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)
-
-        VCR.use_cassette('pull_request_does_exist_with_success_status') do
-          cli.integrate
-        end
-      end
-      it 'defaults to staging branch' 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:' })
-      end
-    end
-    context 'with --comment flag when a pull request doesn\'t exist for the feature-branch' do
-      let(:options) do
-        { comment: true }
-      end
-      let(:authorization_token) { '123123' }
-      let(:changelog) { '* made some fixes' }
-      let(:new_pull_request) do
-        {
-          html_url: 'https://path/to/html/pull/request',
-          issue_url: 'https://api/path/to/issue/url',
-          number: 10,
-          head: {
-            ref: 'branch_name'
-          }
-        }
-      end
-      before do
-        allow(cli).to receive(:ask_editor).and_return('description')
-        allow(cli).to receive(:authorization_token).and_return(authorization_token)
-        expect(cli).to receive(:execute_command).with(Gitx::Cli::UpdateCommand, :update).twice
-
-        expect(cli).to receive(:run_cmd).with('git fetch origin').ordered
-        expect(cli).to receive(:run_cmd).with('git branch -D staging', allow_failure: true).ordered
-        expect(cli).to receive(:run_cmd).with('git checkout staging').ordered
-        expect(cli).to receive(:run_cmd).with('git merge feature-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git push origin HEAD').ordered
-        expect(cli).to receive(:run_cmd).with('git checkout feature-branch').ordered
-        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)
-
-        VCR.use_cassette('pull_request_does_not_exist') do
-          cli.integrate
-        end
-      end
-      it 'creates github pull request' 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:' })
-      end
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.13.3
+  version: 2.13.4.ci.39.1
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -14,227 +14,227 @@ dependencies:
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: pry
   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'
 - !ruby/object:Gem::Dependency
   name: webmock
   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'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: vcr
   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'
 - !ruby/object:Gem::Dependency
   name: guard
   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'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   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'
 - !ruby/object:Gem::Dependency
   name: coveralls
   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'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier
   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'
 - !ruby/object:Gem::Dependency
   name: terminal-notifier-guard
   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'
 - !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
+description: Git eXtensions for improved development workflows
 email:
 - ryan.sonnek@gmail.com
 executables:
@@ -251,12 +251,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".hound.yml"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .hound.yml
+- .rspec
+- .rubocop.yml
+- .ruby-version
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - Guardfile
@@ -324,17 +324,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       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.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations