gitx 2.21.3 → 2.21.4.ci.145.1

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 55c4613b3110f7334a5a2b4db2089b1847c26ad8
-  data.tar.gz: a2f450ee343e9eb85974c24611e13739085e2c47
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmZmMzE3ZGYxNzI4YTQ4NzVjMmFmNGM1YjEyY2UxZDE5ZTBiMDY0OQ==
+  data.tar.gz: !binary |-
+    MmQ5YzNlMWYxZjZjYjU0NmY0MTJiYjZlMTIxZDZlMjA0NDY1MWQ0OQ==
 SHA512:
-  metadata.gz: 0e60cb3c0c2f34c1fe553326c6bc490621753dfc8558e331a1e486478e891a6e3b01b9aee11215c87de89564e41af7c2a93395a9675fba71b6e40a39e56c9691
-  data.tar.gz: 3aa2adf8efe47a7da168aaefc92baa1406a7af55a8c20d16af624f540592624314808d5d8ce4ee24356275ff2112218cad38bdab6263c00930003d62c643055a
+  metadata.gz: !binary |-
+    YzVlZTNlYjAwMjRkYzI1Nzc1Y2Y2NTczM2ZjZWM2ODg2NjE3MWQ4NjBlNzdm
+    MGUyMjIwZDg1MzZhNGFlZjgzOWYyNmE1MTRhZjgxMjIxNDEzMGIzNDQxODA3
+    YTI5MmZkZDg0MDFkNmZkNzk3OWY3MzJlMmUzOWMyMjE1YWMzZWE=
+  data.tar.gz: !binary |-
+    ZjVlMGVkNDczMWI5NTBjYTllNGRiZGE2MjRjZjY3Y2Q4ODU0NWM5YmJjY2Vm
+    ZTYxZDhiMWRkMjUyOGNjOGZhMTVkOTI1YWU3MmUwZGU2YmVjZDVjNzY2N2Vi
+    Njk5YTMwMTYyM2ExZDRhNzc4ZDUzYzM2MzA2ODhlNzg2ZmRmMDU=

data/README.md

@@ -15,10 +15,6 @@ so they are available without learning any new commands!
 $ gem install gitx
 ```
 
-### Global Options
-* `--trace` or `-v` = verbose output for debugging commands
-* `--pretend` or `-p` = dry run commands and do not actually invoke operations
-
 ## git start <new_branch_name (optional)>
 
 update local repository with latest upstream changes and create a new feature branch

data/lib/gitx/cli/base_command.rb

@@ -2,6 +2,7 @@ require 'thor'
 require 'pathname'
 require 'rugged'
 require 'gitx'
+require 'gitx/executor'
 
 module Gitx
   module Cli
@@ -12,11 +13,6 @@ module Gitx
 
       add_runtime_options!
 
-      method_option :trace, type: :boolean, aliases: '-v'
-      def initialize(*args)
-        super(*args)
-      end
-
       private
 
       def repo
@@ -26,12 +22,18 @@ module Gitx
         end
       end
 
+      def run_cmd(*cmd)
+        executor.execute(*cmd) do |output|
+          say(output, :yellow)
+        end
+      end
+
       def run_git_cmd(*cmd)
         run_cmd('git', *cmd)
       end
 
       def checkout_branch(branch_name)
-        run_cmd "git checkout #{branch_name}"
+        run_git_cmd 'checkout', branch_name
       end
 
       # lookup the current branch of the repo
@@ -47,14 +49,13 @@ module Gitx
         fail "Cannot #{action} reserved branch" if config.reserved_branch?(branch) || config.aggregate_branch?(branch)
       end
 
-      # helper to invoke other CLI commands
-      def execute_command(command_class, method, args = [])
-        command_class.new.send(method, *args)
-      end
-
       def config
         @configuration ||= Gitx::Configuration.new(repo.workdir)
       end
+
+      def executor
+        @executor ||= Gitx::Executor.new
+      end
     end
   end
 end

data/lib/gitx/cli/buildtag_command.rb

@@ -10,8 +10,8 @@ module Gitx
       method_option :message, type: :string, aliases: '-m', desc: 'message to attach to the buildtag'
       def buildtag
         fail "Branch must be one of the supported taggable branches: #{config.taggable_branches}" unless config.taggable_branch?(branch_name)
-        run_cmd "git tag #{git_tag} -a -m '#{label}'"
-        run_cmd "git push origin #{git_tag}"
+        run_git_cmd 'tag', git_tag, '--annotate', '--message', label
+        run_git_cmd 'push', 'origin', git_tag
       end
 
       private

data/lib/gitx/cli/cleanup_command.rb

@@ -8,16 +8,16 @@ module Gitx
       desc 'cleanup', 'Cleanup branches that have been merged into master from the repo'
       def cleanup
         checkout_branch config.base_branch
-        run_cmd 'git pull'
-        run_cmd 'git remote prune origin'
+        run_git_cmd 'pull'
+        run_git_cmd 'remote', 'prune', 'origin'
 
         say 'Deleting local and remote branches that have been merged into '
         say config.base_branch, :green
         merged_branches(remote: true).each do |branch|
-          run_cmd "git push origin --delete #{branch}"
+          run_git_cmd 'push', 'origin', '--delete', branch
         end
         merged_branches(remote: false).each do |branch|
-          run_cmd "git branch -d #{branch}"
+          run_git_cmd 'branch', '--delete', branch
         end
       end
 
@@ -26,9 +26,9 @@ module Gitx
       # @return list of branches that have been merged
       def merged_branches(options = {})
         args = []
-        args << '-r' if options[:remote]
+        args << '--remote' if options[:remote]
         args << '--merged'
-        output = run_cmd("git branch #{args.join(' ')}").split("\n")
+        output = run_git_cmd('branch', *args).split("\n")
         branches = output.map do |branch|
           branch = branch.gsub(/\*/, '').strip.split(' ').first
           branch = branch.split('/').last if options[:remote]

data/lib/gitx/cli/integrate_command.rb

@@ -16,12 +16,7 @@ module Gitx
         branch = feature_branch_name
         print_message(branch, integration_branch)
 
-        begin
-          execute_command(UpdateCommand, :update)
-        rescue
-          raise MergeError, 'Merge conflict occurred.  Please fix merge conflict and rerun the integrate command'
-        end
-
+        run_git_cmd 'update'
         pull_request = pull_request_for_branch(branch)
         integrate_branch(branch, integration_branch, pull_request) unless options[:resume]
         checkout_branch branch
@@ -47,11 +42,11 @@ module Gitx
         commit_message = "[gitx] Integrating #{branch} into #{integration_branch}"
         commit_message += " (Pull request ##{pull_request.number})" if pull_request
         begin
-          run_cmd %Q(git merge --no-ff -m "#{commit_message}" #{branch})
+          run_git_cmd 'merge', '--no-ff', '--message', commit_message, branch
         rescue
           raise MergeError, "Merge conflict occurred.  Please fix merge conflict and rerun command with --resume #{branch} flag"
         end
-        run_cmd 'git push origin HEAD'
+        run_git_cmd 'push', 'origin', 'HEAD'
       end
 
       def feature_branch_name
@@ -67,8 +62,8 @@ module Gitx
       # nuke local branch and pull fresh version from remote repo
       def fetch_remote_branch(target_branch)
         create_remote_branch(target_branch) unless remote_branch_exists?(target_branch)
-        run_cmd 'git fetch origin'
-        run_cmd "git branch -D #{target_branch}", allow_failure: true
+        run_git_cmd 'fetch', 'origin'
+        run_git_cmd('branch', '--delete', '--force', target_branch) rescue Gitx::Executor::ExecutionError
         checkout_branch target_branch
       end
 
@@ -86,7 +81,7 @@ module Gitx
 
       def create_remote_branch(target_branch)
         repo.create_branch(target_branch, config.base_branch)
-        run_cmd "git push origin #{target_branch}:#{target_branch}"
+        run_git_cmd 'push', 'origin', "#{target_branch}:#{target_branch}"
       end
     end
   end

data/lib/gitx/cli/nuke_command.rb

@@ -22,11 +22,10 @@ module Gitx
         say last_known_good_tag, :green
 
         checkout_branch config.base_branch
-        run_cmd "git branch -D #{bad_branch}", allow_failure: true
-        run_cmd "git push origin --delete #{bad_branch}", allow_failure: true
-        run_cmd "git checkout -b #{bad_branch} #{last_known_good_tag}"
-        run_cmd "git push origin #{bad_branch}"
-        run_cmd "git branch --set-upstream-to origin/#{bad_branch}"
+        run_git_cmd('branch', '--delete', '--force', bad_branch) rescue Gitx::Executor::ExecutionError
+        run_git_cmd('push', 'origin', '--delete', bad_branch) rescue Gitx::Executor::ExecutionError
+        run_git_cmd 'checkout', '-b', bad_branch, last_known_good_tag
+        run_git_cmd 'share'
         checkout_branch config.base_branch
       end
 
@@ -34,7 +33,7 @@ module Gitx
 
       def migrations_need_to_be_reverted?(bad_branch, last_known_good_tag)
         return false unless File.exist?('db/migrate')
-        outdated_migrations = run_cmd("git diff #{last_known_good_tag}...#{bad_branch} --name-only db/migrate").split
+        outdated_migrations = run_git_cmd('diff', "#{last_known_good_tag}...#{bad_branch}", '--name-only', 'db/migrate').split
         return false if outdated_migrations.empty?
 
         say "#{bad_branch} contains migrations that may need to be reverted.  Ensure any reversable migrations are reverted on affected databases before nuking.", :red
@@ -53,8 +52,8 @@ module Gitx
       end
 
       def build_tags_for_branch(branch)
-        run_cmd 'git fetch --tags'
-        build_tags = run_cmd("git tag -l 'build-#{branch}-*'").split
+        run_git_cmd 'fetch', '--tags'
+        build_tags = run_git_cmd('tag', '--list', "build-#{branch}-*").split
         build_tags.sort
       end
     end

data/lib/gitx/cli/release_command.rb

@@ -1,7 +1,6 @@
 require 'thor'
 require 'gitx'
 require 'gitx/cli/base_command'
-require 'gitx/cli/update_command'
 require 'gitx/github'
 
 module Gitx
@@ -17,15 +16,15 @@ module Gitx
         branch ||= current_branch.name
         assert_not_protected_branch!(branch, 'release')
         checkout_branch(branch)
-        execute_command(UpdateCommand, :update)
+        run_git_cmd 'update'
 
         pull_request = find_or_create_pull_request(branch)
         return unless confirm_branch_status?(branch)
 
         checkout_branch config.base_branch
-        run_cmd "git pull origin #{config.base_branch}"
-        run_cmd %Q(git merge --no-ff -m "[gitx] Releasing #{branch} to #{config.base_branch} (Pull request ##{pull_request.number})" #{branch})
-        run_cmd 'git push origin HEAD'
+        run_git_cmd 'pull', 'origin', config.base_branch
+        run_git_cmd 'merge', '--no-ff', '--message', "[gitx] Releasing #{branch} to #{config.base_branch} (Pull request ##{pull_request.number})", branch
+        run_git_cmd 'push', 'origin', 'HEAD'
 
         after_release
       end

data/lib/gitx/cli/review_command.rb

@@ -50,7 +50,7 @@ module Gitx
         reject_pull_request(pull_request) if options[:reject]
         assign_pull_request(pull_request) if options[:assignee]
 
-        run_cmd "open #{pull_request.html_url}" if options[:open]
+        run_cmd('open', pull_request.html_url) if options[:open]
       end
 
       private

data/lib/gitx/cli/share_command.rb

@@ -7,8 +7,8 @@ module Gitx
     class ShareCommand < BaseCommand
       desc 'share', 'Share the current branch in the remote repository'
       def share
-        run_cmd "git push origin #{current_branch.name}"
-        run_cmd "git branch --set-upstream-to origin/#{current_branch.name}"
+        run_git_cmd 'push', 'origin', current_branch.name
+        run_git_cmd 'track'
       end
     end
   end

data/lib/gitx/cli/track_command.rb

@@ -7,7 +7,7 @@ module Gitx
     class TrackCommand < BaseCommand
       desc 'track', 'set the current branch to track the remote branch with the same name'
       def track
-        run_cmd "git branch --set-upstream-to origin/#{current_branch.name}"
+        run_git_cmd 'branch', '--set-upstream-to', "origin/#{current_branch.name}"
       end
     end
   end

data/lib/gitx/cli/update_command.rb

@@ -14,15 +14,15 @@ module Gitx
 
         update_branch(current_branch.name) if remote_branch_exists?(current_branch.name)
         update_branch(config.base_branch)
-        run_cmd 'git push origin HEAD'
+        run_git_cmd 'share'
       end
 
       private
 
       def update_branch(branch)
-        run_cmd "git pull origin #{branch}"
+        run_git_cmd 'pull', 'origin', branch
       rescue
-        raise MergeError, 'Merge Conflict Occurred. Please fix merge conflict and rerun the update command'
+        raise MergeError, 'Merge conflict occurred. Please fix merge conflict and rerun the command'
       end
 
       def remote_branch_exists?(branch)

data/lib/gitx/executor.rb

@@ -0,0 +1,26 @@
+require 'open3'
+
+module Gitx
+  class Executor
+    ExecutionError = Class.new(StandardError)
+
+    # execute a shell command and raise an error if non-zero exit code is returned
+    # return the string output from the command
+    # block argument is passed all output from the executed thread
+    def execute(*cmd)
+      yield "$ #{cmd.join(' ')}" if block_given?
+      output = ''
+
+      Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thread|
+        while line = stdout_err.gets
+          output << line
+          yield line if block_given?
+        end
+
+        exit_status = wait_thread.value
+        fail ExecutionError, "#{cmd.join(' ')} failed" unless exit_status.success?
+      end
+      output
+    end
+  end
+end

data/lib/gitx/extensions/thor.rb

@@ -1,27 +1,5 @@
-require 'open3'
-
 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(*args)
-      options = args.last.is_a?(Hash) ? args.pop : {}
-      cmd = args
-      say "$ #{cmd.join(' ')}", :yellow
-      output = ''
-
-      Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thr|
-        while line = stdout_err.gets
-          say(line, :yellow) if options[:trace]
-          output << line
-        end
-
-        exit_status = wait_thr.value
-        fail "#{cmd.join(' ')} failed" unless exit_status.success? || options[:allow_failure]
-      end
-      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/gitx/github.rb

@@ -1,7 +1,6 @@
 require 'octokit'
 require 'fileutils'
 require 'yaml'
-require 'gitx/cli/update_command'
 
 module Gitx
   module Github
@@ -23,7 +22,7 @@ module Gitx
       pull_request = find_pull_request(branch)
       pull_request ||= begin
         checkout_branch(branch)
-        execute_command(Gitx::Cli::UpdateCommand, :update)
+        run_git_cmd 'update'
         pull_request = create_pull_request(branch)
         say 'Created pull request: '
         say pull_request.html_url, :green
@@ -73,7 +72,7 @@ module Gitx
     end
 
     def pull_request_body(branch)
-      changelog = run_cmd("git log #{config.base_branch}...#{branch} --reverse --no-merges --pretty=format:'* %B'")
+      changelog = run_git_cmd('log', "#{config.base_branch}...#{branch}", '--reverse', '--no-merges', "--pretty=format:'* %B'")
       description = options[:description]
 
       description_template = []

data/lib/gitx/version.rb

@@ -1,3 +1,3 @@
 module Gitx
-  VERSION = '2.21.3'
+  VERSION = '2.21.4'
 end

data/spec/gitx/cli/buildtag_command_spec.rb

@@ -10,6 +10,7 @@ describe Gitx::Cli::BuildtagCommand do
     }
   end
   let(:cli) { described_class.new(args, options, config) }
+  let(:executor) { cli.send(:executor) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
 
   before do
@@ -40,8 +41,8 @@ describe Gitx::Cli::BuildtagCommand do
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m '[gitx] buildtag for master'").ordered
-          expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'build-master-2013-10-30-10-21-28', '--annotate', '--message', '[gitx] buildtag for master').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'build-master-2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end
@@ -58,8 +59,8 @@ describe Gitx::Cli::BuildtagCommand do
       end
       before do
         Timecop.freeze(Time.utc(2013, 10, 30, 10, 21, 28)) do
-          expect(cli).to receive(:run_cmd).with("git tag build-master-2013-10-30-10-21-28 -a -m 'custom git commit message'").ordered
-          expect(cli).to receive(:run_cmd).with('git push origin build-master-2013-10-30-10-21-28').ordered
+          expect(executor).to receive(:execute).with('git', 'tag', 'build-master-2013-10-30-10-21-28', '--annotate', '--message', 'custom git commit message').ordered
+          expect(executor).to receive(:execute).with('git', 'push', 'origin', 'build-master-2013-10-30-10-21-28').ordered
           cli.buildtag
         end
       end

data/spec/gitx/cli/cleanup_command_spec.rb

@@ -9,8 +9,11 @@ describe Gitx::Cli::CleanupCommand do
       pretend: true
     }
   end
-  let(:cli) { Gitx::Cli::CleanupCommand.new(args, options, config) }
+  let(:cli) { described_class.new(args, options, config) }
+  let(:executor) { cli.send(:executor) }
   let(:branch) { double('fake branch', name: 'feature-branch') }
+  let(:remote_branches) { 'merged-remote-feature' }
+  let(:local_branches) { 'merged-local-feature' }
 
   before do
     allow(cli).to receive(:current_branch).and_return(branch)
@@ -20,13 +23,13 @@ describe Gitx::Cli::CleanupCommand do
     before do
       allow(cli).to receive(:say)
 
-      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
+      expect(executor).to receive(:execute).with('git', 'checkout', 'master').ordered
+      expect(executor).to receive(:execute).with('git', 'pull').ordered
+      expect(executor).to receive(:execute).with('git', 'remote', 'prune', 'origin').ordered
+      expect(executor).to receive(:execute).with('git', 'branch', '--remote', '--merged').and_return(remote_branches).ordered
+      expect(executor).to receive(:execute).with('git', 'push', 'origin', '--delete', 'merged-remote-feature').ordered
+      expect(executor).to receive(:execute).with('git', 'branch', '--merged').and_return(local_branches).ordered
+      expect(executor).to receive(:execute).with('git', 'branch', '--delete', 'merged-local-feature').ordered
 
       cli.cleanup
     end