thegarage-gitx 2.2.3 → 2.3.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccffa73969aa2bc6ae79fec560b1aadec0274e61
-  data.tar.gz: 02b8b2fd2557ad910010e3933422c28e61d6901c
+  metadata.gz: f40f446859a3964035cde6606580ad207ceee9c5
+  data.tar.gz: 56f224ffe1dd7fde762fa726ed9a3a5f166f1679
 SHA512:
-  metadata.gz: 9f1c773b6c2c5494efb28363523c22b21651fcecc0ab78c0fd90baa0833cb67330c64b07030a437849f1c82819704d9bc6ac5e9a6d9bbf77afd068d000ece92a
-  data.tar.gz: 59d5c07db179d13f38c774be57a1bd41a8e385c6f6724cebe270f21cab6dda639952a22e23a53ee16e4392a3e6a959461fec970e736cdc7698bc1064eb8b4586
+  metadata.gz: 9f77fe954ce841e57c90b0d4ff8403363e2f940c9bbb80af5205186f3924242b30195f50aa30a8710843ea035c2713b8b0e798ce09db22dda81ec0b1a975fae5
+  data.tar.gz: 415cb3c76b07da640e028275b07eacb857e11cbbaab02cac28ef78e9c52b63e9585012e4513a64b1d54de629335225d7368685c14ea52a27c6dcc0f39b1ed676

data/.rspec

@@ -1,3 +1,2 @@
 --color
---warnings
 --require spec_helper

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec, cmd: 'rspec' do
+guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/lib/thegarage/gitx/cli/integrate_command.rb

@@ -10,8 +10,7 @@ module Thegarage
         desc 'integrate', 'integrate the current branch into one of the aggregate development branches (default = staging)'
         def integrate(target_branch = 'staging')
           branch = current_branch.name
-          assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(target_branch)
-          raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch) || target_branch == Thegarage::Gitx::BASE_BRANCH
+          assert_integratable_branch!(branch, target_branch)
 
           UpdateCommand.new.update
 
@@ -28,6 +27,11 @@ module Thegarage
 
         private
 
+        def assert_integratable_branch!(branch, target_branch)
+          assert_not_protected_branch!(branch, 'integrate') unless aggregate_branch?(target_branch)
+          raise "Only aggregate branches are allowed for integration: #{AGGREGATE_BRANCHES}" unless aggregate_branch?(target_branch) || target_branch == Thegarage::Gitx::BASE_BRANCH
+        end
+
         # nuke local branch and pull fresh version from remote repo
         def refresh_branch_from_remote(target_branch)
           run_cmd "git branch -D #{target_branch}", :allow_failure => true

data/lib/thegarage/gitx/cli/review_command.rb

@@ -22,6 +22,7 @@ module Thegarage
         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 review with a github comment to re-request review'
         # @see http://developer.github.com/v3/pulls/
         def review
           fail 'Github authorization token not found' unless authorization_token
@@ -37,14 +38,17 @@ module Thegarage
 
         def find_or_create_pull_request(branch)
           pull_request = find_pull_request(branch)
-          return pull_request if pull_request
-
-          UpdateCommand.new.update
-          pull_request = create_pull_request(branch)
-          say 'Pull request created: '
-          say pull_request.html_url, :green
-
-          pull_request
+          if pull_request
+            create_bump_comment(pull_request) if options[:bump]
+            pull_request
+          else
+            UpdateCommand.new.update
+            pull_request = create_pull_request(branch)
+            say 'Pull request created: '
+            say pull_request.html_url, :green
+
+            pull_request
+          end
         end
 
         # token is cached in local git config for future use
@@ -70,7 +74,7 @@ module Thegarage
 
         def authorization_request_options
           timestamp = Time.now.utc.strftime('%Y-%m-%dT%H:%M:%S%z')
-          client_name = "The Garage Git eXtensions - #{remote_origin_name} #{timestamp}"
+          client_name = "The Garage Git eXtensions - #{github_slug} #{timestamp}"
           options = {
             :scopes => ['repo'],
             :note => client_name,
@@ -89,12 +93,11 @@ module Thegarage
           say "against "
           say "#{Thegarage::Gitx::BASE_BRANCH} ", :green
           say "in "
-          say remote_origin_name, :green
+          say github_slug, :green
 
-          client = Octokit::Client.new(:access_token => authorization_token)
           title = branch
           body = pull_request_body(branch)
-          client.create_pull_request(remote_origin_name, Thegarage::Gitx::BASE_BRANCH, branch, title, body)
+          github_client.create_pull_request(github_slug, Thegarage::Gitx::BASE_BRANCH, branch, title, body)
         end
 
         def assign_pull_request(pull_request)
@@ -102,28 +105,41 @@ module Thegarage
           say "Assigning pull request to "
           say assignee, :green
 
-          client = Octokit::Client.new(:access_token => authorization_token)
           title = pull_request.title
           body = pull_request.body
           options = {
             assignee: assignee
           }
-          client.update_issue(remote_origin_name, pull_request.number, title, body, options)
+          github_client.update_issue(github_slug, pull_request.number, title, body, options)
         end
 
         # @return [Sawyer::Resource] data structure of pull request info if found
         # @return nil if no pull request found
         def find_pull_request(branch)
-          head_reference = "#{repo_organization_name}:#{branch}"
+          head_reference = "#{github_organization}:#{branch}"
           params = {
             head: head_reference,
             state: 'open'
           }
-          client = Octokit::Client.new(:access_token => authorization_token)
-          pull_requests = client.pull_requests(remote_origin_name, params)
+          pull_requests = github_client.pull_requests(github_slug, params)
           pull_requests.first
         end
 
+        def create_bump_comment(pull_request)
+          comment_template = []
+          comment_template << '[gitx] review bump :tada:'
+          comment_template << ''
+          comment_template << '### Summary of Changes'
+
+          comment = ask_editor(comment_template.join("\n"), repo.config['core.editor'])
+          comment = comment.chomp.strip
+          github_client.add_comment(github_slug, pull_request.number, comment)
+        end
+
+        def github_client
+          @client ||= Octokit::Client.new(:access_token => authorization_token)
+        end
+
         # @return [String] github username (ex: 'wireframe') of the current github.user
         # @raise error if github.user is not configured
         def username
@@ -132,15 +148,18 @@ module Thegarage
           username
         end
 
-        # lookup the current repository of the PWD
-        # ex: git@github.com:socialcast/thegarage/gitx.git OR https://github.com/socialcast/thegarage/gitx.git
-        def remote_origin_name
+        # @return the github slug for the current repository's remote origin url.
+        # @example
+        #   git@github.com:socialcast/thegarage/gitx.git #=> thegarage/gitx
+        # @example
+        #   https://github.com/socialcast/thegarage/gitx.git #=> thegarage/gitx
+        def github_slug
           remote = repo.config['remote.origin.url']
           remote.to_s.gsub(/\.git$/,'').split(/[:\/]/).last(2).join('/')
         end
 
-        def repo_organization_name
-          remote_origin_name.split('/').first
+        def github_organization
+          github_slug.split('/').first
         end
 
         def pull_request_body(branch)
@@ -153,7 +172,7 @@ module Thegarage
           description_template << changelog
           description_template << PULL_REQUEST_FOOTER
 
-          body = ask_editor(description_template.join("\n"))
+          body = ask_editor(description_template.join("\n"), repo.config['core.editor'])
           body.gsub(PULL_REQUEST_FOOTER, '').chomp.strip
         end
       end

data/lib/thegarage/gitx/thor_extensions.rb

@@ -4,12 +4,12 @@ class Thor
     # see http://osdir.com/ml/ruby-talk/2010-06/msg01424.html
     # see https://gist.github.com/rkumar/456809
     # see http://rdoc.info/github/visionmedia/commander/master/Commander/UI.ask_editor
-    def ask_editor(initial_text = '')
+    def ask_editor(initial_text = '', editor = nil)
+      editor ||= ENV['EDITOR'] || 'vi'
       Tempfile.open('reviewrequest.md') do |f|
         f << initial_text
         f.flush
 
-        editor = repo.config['core.editor'] || ENV['EDITOR'] || 'vi'
         flags = case editor
         when 'mate', 'emacs', 'subl'
           '-w'

data/lib/thegarage/gitx/version.rb

@@ -1,5 +1,5 @@
 module Thegarage
   module Gitx
-    VERSION = '2.2.3'
+    VERSION = '2.3.0.pre1'
   end
 end

data/spec/spec_helper.rb

@@ -44,7 +44,7 @@ RSpec.configure do |config|
   # Print the 10 slowest examples and example groups at the
   # end of the spec run, to help surface which specs are running
   # particularly slow.
-  config.profile_examples = 10
+  # config.profile_examples = 10
 
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing

data/spec/support/stub_execution.rb

@@ -1,7 +1,20 @@
 # protip to prevent execution of shell commands during testsuite
 # see http://stackoverflow.com/questions/1628586/mock-system-call-in-ruby
-module Kernel
-  def `(cmd)
-    puts "stubbing execution within tests of command: #{cmd}"
+module ShellExecutionStub
+  def included(base)
+    base.class_eval do
+      alias_method :execute_without_stub, :`
+      alias_method :`, :execute_with_stub
+    end
+  end
+
+  def execute_with_stub(cmd)
+    if cmd.include?('git')
+      puts "WARNING: stubbing command execution within tests of command: #{cmd}", :red
+    else
+      execute_without_stub(cmd)
+    end
   end
 end
+
+Kernel.send(:include, ShellExecutionStub)

data/spec/thegarage/gitx/cli/review_command_spec.rb

@@ -88,7 +88,7 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
       before do
         allow(cli).to receive(:authorization_token).and_return(authorization_token)
 
-        stub_request(:patch, 'https://api.github.com/repos/thegarage/thegarage-gitx/issues/10').to_return(:status => 200)
+        stub_request(:patch, /.*api.github.com.*/).to_return(:status => 200)
 
         VCR.use_cassette('pull_request_does_exist') do
           cli.review
@@ -116,6 +116,26 @@ describe Thegarage::Gitx::Cli::ReviewCommand do
         should meet_expectations
       end
     end
+    context 'when --bump flag is passed' do
+      let(:options) do
+        {
+          bump: true
+        }
+      end
+      let(:authorization_token) { '123123' }
+      before do
+        allow(cli).to receive(:authorization_token).and_return(authorization_token)
+        expect(cli).to receive(:ask_editor).and_return('comment description')
+        stub_request(:post, /.*api.github.com.*/).to_return(:status => 201)
+
+        VCR.use_cassette('pull_request_does_exist') do
+          cli.review
+        end
+      end
+      it 'posts comment to github' do
+        expect(WebMock).to have_requested(:post, "https://api.github.com/repos/thegarage/thegarage-gitx/issues/10/comments")
+      end
+    end
   end
 
   describe '#authorization_token' do

data/thegarage-gitx.gemspec

@@ -32,4 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard"
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'terminal-notifier'
+  spec.add_development_dependency 'terminal-notifier-guard'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.3.0.pre1
 platform: ruby
 authors:
 - Ryan Sonnek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -192,6 +192,34 @@ dependencies:
     - - ">="
       - !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'
 description: Git eXtensions for common development workflow
 email:
 - ryan.sonnek@gmail.com
@@ -281,9 +309,9 @@ 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.2.2