gitx 3.0.2.ci.213.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: d560c9e090736e78958caeb604e99fda7cf463c3710d96343bc989e02f19c95f
-  data.tar.gz: 017045d97ddb1a8cea1c4fa4be3a4b6d1547d5758ccbd4cbc99a43f1632d94b9
+SHA1:
+  metadata.gz: 1077ebb26e155a2ddaeca39eaa8afc89a5a6cd09
+  data.tar.gz: eabb5c99e9bdaac5512bfca7714a245cfb8d9b1c
 SHA512:
-  metadata.gz: cea6b101500897ee514090e5dedc80f1f50249e8958fa95c08791b6103f99723651587001d3e6af2ffe7a602fd62260ef3acadefdbced67db6ff6ae93b7bbc71
-  data.tar.gz: 16d16c425c97ad537c4abbbf53c7662bd8b7348e6541e716b7df374a90e6cd1504f0df395645489a939a3f362841b2b3e2182800be54601e3f44a49f29800ac9
+  metadata.gz: 6f0b0ade0d34b6d74cb77e6a3d49be8cea9fd1dfaffaf09038f8dec08bf21509263e3251cbbb9e35380a474851a0361884af6914e32de99b3fd88c5b74b324a9
+  data.tar.gz: fc1c96391e0ccecc7269ae3bb752ce8693f2f8788cde9f6336b1a225a9f9048d22d298f7425e526ca0a3f275ccd9b91ef5c50f8018fc5a433c761535b95c6375

data/gitx.gemspec

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gitx/version'
@@ -17,19 +19,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 'rubocop'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'timecop'
   spec.add_development_dependency 'vcr'
-  spec.add_development_dependency 'webmock'
+  spec.add_development_dependency 'coveralls'
+  spec.add_development_dependency 'rubocop'
 
   # 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 Gitx::Executor::ExecutionError
+        rescue
           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 = <<-MESSAGE.dedent
+      BUMP_COMMENT_FOOTER = <<-EOS.dedent
         # Bump comments should include:
         # * Summary of what changed
         #
         # This footer will automatically be stripped from the created comment
-      MESSAGE
+      EOS
       APPROVAL_COMMENT_PREFIX = '[gitx] review approved :shipit:'.freeze
-      APPROVAL_COMMENT_FOOTER = <<-MESSAGE.dedent
+      APPROVAL_COMMENT_FOOTER = <<-EOS.dedent
         # Approval comments can include:
         # * Feedback
         # * Follow-up items for after release
         #
         # This footer will automatically be stripped from the created comment
-      MESSAGE
+      EOS
       REJECTION_COMMENT_PREFIX = '[gitx] review rejected'.freeze
-      REJECTION_COMMENT_FOOTER = <<-MESSAGE.dedent
+      REJECTION_COMMENT_FOOTER = <<-EOS.dedent
         # Rejection comments should include:
         # * Feedback
         # * Required changes before approved
         #
         # This footer will automatically be stripped from the created comment
-      MESSAGE
+      EOS
 
       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/update_command.rb

@@ -21,7 +21,7 @@ module Gitx
 
       def update_branch(branch)
         run_git_cmd 'pull', 'origin', branch
-      rescue Gitx::Executor::ExecutionError
+      rescue
         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 = <<-MESSAGE.dedent
+    PULL_REQUEST_FOOTER = <<-EOS.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
-    MESSAGE
+    EOS
 
     def find_or_create_pull_request(branch)
       pull_request = find_pull_request(branch)

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(Gitx::Executor::ExecutionError).ordered
+                                             .and_raise('git merge feature-branch failed').ordered
 
         VCR.use_cassette('pull_request_does_exist_with_success_status') do
-          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/)
+          expect { cli.integrate }.to raise_error(/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/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(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'feature-branch').and_raise('merge error').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(Gitx::Executor::ExecutionError).ordered
+        expect(executor).to receive(:execute).with('git', 'pull', 'origin', 'master').and_raise('merge error occurred').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.ci.213.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2017-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: octokit
+  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: rugged
+  name: thor
   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: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,21 +81,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  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: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,21 +109,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: webmock
   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: rubocop
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: vcr
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -165,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rubocop
   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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Utility scripts for Git to increase productivity for common operations