thegarage-gitx 2.3.0.pre1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40f446859a3964035cde6606580ad207ceee9c5
-  data.tar.gz: 56f224ffe1dd7fde762fa726ed9a3a5f166f1679
+  metadata.gz: 6700841a12c4d93f59977bba1870d434d2cb6610
+  data.tar.gz: 6a4230ce7ffe3ffe7b9367b58f53db83d2fd5631
 SHA512:
-  metadata.gz: 9f77fe954ce841e57c90b0d4ff8403363e2f940c9bbb80af5205186f3924242b30195f50aa30a8710843ea035c2713b8b0e798ce09db22dda81ec0b1a975fae5
-  data.tar.gz: 415cb3c76b07da640e028275b07eacb857e11cbbaab02cac28ef78e9c52b63e9585012e4513a64b1d54de629335225d7368685c14ea52a27c6dcc0f39b1ed676
+  metadata.gz: 77738d6c2dbddd45b473dbda6c69bd866774a50242be7e48e8d21d2170ffa7de31987b7c7f13172b9da4633df44a997abeaf54ebf31532db578a4811b04c33d4
+  data.tar.gz: d8726869143d111f1975b89b9a247966837c7b16ffe65c2a680c9b9f7413df30aed2ffd35459f7319db05072256fba10cd1e78117c2f77ee6a90a741a98cea80

data/README.md

@@ -34,6 +34,7 @@ in order to re-assign pull requests.
 options:
 * `--assign` or `-a` = assign pull request to github user
 * `--open` or `-o` = open pull request in default web browser.
+* `--bump` or `-b` = bump an existing pull request by posting a comment to re-review new changes
 
 
 ## git release

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

@@ -1,7 +1,6 @@
 require 'thor'
 require 'pathname'
 require 'rugged'
-require 'English'
 require 'thegarage/gitx'
 
 module Thegarage
@@ -37,16 +36,6 @@ module Thegarage
           repo.branches.find(&:head?)
         end
 
-        # execute a shell command and raise an error if non-zero exit code is returned
-        # return the string output from the command
-        def run_cmd(cmd, options = {})
-          say "$ #{cmd}"
-          output = `#{cmd}`
-          success = $CHILD_STATUS.to_i == 0
-          fail "#{cmd} failed" unless success || options[:allow_failure]
-          output
-        end
-
         def aggregate_branch?(branch)
           AGGREGATE_BRANCHES.include?(branch)
         end
@@ -54,21 +43,6 @@ module Thegarage
         def assert_not_protected_branch!(branch, action)
           raise "Cannot #{action} reserved branch" if RESERVED_BRANCHES.include?(branch) || aggregate_branch?(branch)
         end
-
-        # retrieve a list of branches
-        def branches(options = {})
-          branches = []
-          args = []
-          args << '-r' if options[:remote]
-          args << "--merged #{options[:merged].is_a?(String) ? options[:merged] : ''}" if options[:merged]
-          output = `git branch #{args.join(' ')}`.split("\n")
-          output.each do |branch|
-            branch = branch.gsub(/\*/, '').strip.split(' ').first
-            branch = branch.split('/').last if options[:remote]
-            branches << branch unless RESERVED_BRANCHES.include?(branch)
-          end
-          branches.uniq
-        end
       end
     end
   end

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

@@ -14,22 +14,32 @@ module Thegarage
 
           say "Deleting local and remote branches that have been merged into "
           say Thegarage::Gitx::BASE_BRANCH, :green
-          merged_remote_branches.each do |branch|
+          merged_branches(remote: true).each do |branch|
             run_cmd "git push origin --delete #{branch}"
           end
-          merged_local_branches.each do |branch|
+          merged_branches(remote: false).each do |branch|
             run_cmd "git branch -d #{branch}"
           end
         end
 
         private
 
-        def merged_local_branches
-          branches(:merged => true).reject { |b| aggregate_branch?(b) }
-        end
+        # @return list of branches that have been merged
+        def merged_branches(options = {})
+          args = []
+          args << '-r' if options[:remote]
+          args << "--merged"
+          output = run_cmd("git branch #{args.join(' ')}").split("\n")
+          branches = output.map do |branch|
+            branch = branch.gsub(/\*/, '').strip.split(' ').first
+            branch = branch.split('/').last if options[:remote]
+            branch
+          end
+          branches.uniq!
+          branches -= RESERVED_BRANCHES
+          branches.reject! { |b| aggregate_branch?(b) }
 
-        def merged_remote_branches
-          branches(:merged => true, :remote => true).reject { |b| aggregate_branch?(b) }
+          branches
         end
       end
     end

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

@@ -22,7 +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'
+        method_option :bump, :type => :boolean, :aliases => '-b', :desc => 'bump an existing pull request by posting a comment to re-review new changes'
         # @see http://developer.github.com/v3/pulls/
         def review
           fail 'Github authorization token not found' unless authorization_token

data/lib/thegarage/gitx/thor_extensions.rb

@@ -1,5 +1,17 @@
+require 'English'
+
 class Thor
   module Actions
+    # execute a shell command and raise an error if non-zero exit code is returned
+    # return the string output from the command
+    def run_cmd(cmd, options = {})
+      say "$ #{cmd}"
+      output = `#{cmd}`
+      success = $CHILD_STATUS.to_i == 0
+      fail "#{cmd} failed" unless success || options[:allow_failure]
+      output
+    end
+
     # launch configured editor to retreive message/string
     # see http://osdir.com/ml/ruby-talk/2010-06/msg01424.html
     # see https://gist.github.com/rkumar/456809

data/lib/thegarage/gitx/version.rb

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

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

@@ -20,13 +20,12 @@ describe Thegarage::Gitx::Cli::CleanupCommand do
     before do
       allow(cli).to receive(:say)
 
-      expect(cli).to receive(:merged_remote_branches).and_return(%w( merged-remote-feature ))
-      expect(cli).to receive(:merged_local_branches).and_return(%w( merged-local-feature ))
-
       expect(cli).to receive(:run_cmd).with('git checkout master').ordered
       expect(cli).to receive(:run_cmd).with('git pull').ordered
       expect(cli).to receive(:run_cmd).with('git remote prune origin').ordered
+      expect(cli).to receive(:run_cmd).with('git branch -r --merged').and_return("merged-remote-feature").ordered
       expect(cli).to receive(:run_cmd).with('git push origin --delete merged-remote-feature').ordered
+      expect(cli).to receive(:run_cmd).with('git branch --merged').and_return("merged-local-feature").ordered
       expect(cli).to receive(:run_cmd).with('git branch -d merged-local-feature').ordered
 
       cli.cleanup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thegarage-gitx
 version: !ruby/object:Gem::Version
-  version: 2.3.0.pre1
+  version: 2.3.0
 platform: ruby
 authors:
 - Ryan Sonnek
@@ -309,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2