gitx 2.21.2.ci.130.1 → 2.21.2.ci.134.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNiYzc5OWViYWQ3OTdlMWUxZjk0ZTcyZjQ3YzU0MGFhOWZkOGU2Mw==
+    ZGIzMjE3ZWNjNmRmNGIyYzBiYWQ4Y2I4OGUyMGYwNTEyMzlhMWM5Mg==
   data.tar.gz: !binary |-
-    NDMwNTQ5MGU0ODBkNjk1NzM5MmZiNTM1MzA0YmM5ZmQ5NjU0MzE5NQ==
+    MjI1MGY5MGI4MzU5ZDUyMWExYzZhOGViMWQyODMwMjg4NTc1NTA1Yg==
 SHA512:
   metadata.gz: !binary |-
-    Zjc0OGQxOTJiZTAzYzhiOTNkMGYyMTgwODNhMzJjNWIwYmYzMGExNTdmOWU2
-    NDEzNmM0ODg3Yjc2ODMxY2Q2OGJlZjU2MGQzMGNiN2I2NDkyY2U0MzJkMDlm
-    NjdmMjA1Y2Q2ZDc5NmU4NmZkNmQ2MzAxMzg4OGExODVmYWQzNGE=
+    MzhjMmFjOWY2NWQ3ODlhNmU0M2IyYjYyZTNiM2MzY2EzNDQ4NjdkYWRiYTk5
+    ZDI0YWIzMTU0YjExN2FjMzI0MjExNzI3ODI5OTZiMThkYmNmOWRmMGFjN2Zi
+    YjU1M2MzOWY0ZTU3YjIwNmE0YTlmZTM4YWY0Njc5MzVhZWE1ZGI=
   data.tar.gz: !binary |-
-    MjU4NmIwMzMzZmMwNzhmZWQ2YTNmZDA4NWZmN2I4ZDc1YTIxZDIwYWE0NGYz
-    NWQxZTM2ZDliMmU4ODI5Nzk1OTY1ZTNmNTBlNTdlYWE5NzQ4ZDFkNDY4YjZi
-    NTE1YTkzOTdjMGQ5YjI1NmViZTA5YmJkZjU4NmNjYjI3MDlmN2U=
+    NWM5ZWI3ZjRkZmI1ZmViYzcwY2FkNWI0MDhiNGRmYzVjZTQ4YmI4NzUyYmU3
+    MzZhNTA5YzJiMTc3MTVjMzdhY2RkYzhjYzg5ODMyZGJkYWVkZTE2ZTAxNTM1
+    YTA5NzIwMGRkN2YwNjIzYTQ3MDZjYzRlOTA3MmM0ZjQ3OWYxZmI=

data/lib/gitx/cli/base_command.rb

@@ -26,6 +26,10 @@ module Gitx
         end
       end
 
+      def run_git_cmd(*cmd)
+        run_cmd('git', *cmd)
+      end
+
       def checkout_branch(branch_name)
         run_cmd "git checkout #{branch_name}"
       end

data/lib/gitx/cli/start_command.rb

@@ -16,10 +16,10 @@ module Gitx
         end
 
         checkout_branch config.base_branch
-        run_cmd 'git pull'
+        run_git_cmd 'pull'
         repo.create_branch branch_name, config.base_branch
         checkout_branch branch_name
-        run_cmd(%Q(git commit -m "Starting work on #{branch_name} (Issue ##{options[:issue]})" --allow-empty)) if options[:issue]
+        run_git_cmd('commit', '--allow-empty', '--message', "Starting work on #{branch_name} (Issue ##{options[:issue]})") if options[:issue]
       end
 
       private

data/lib/gitx/extensions/thor.rb

@@ -12,7 +12,7 @@ class Thor
 
       Open3.popen2e(*cmd) do |stdin, stdout_err, wait_thr|
         while line = stdout_err.gets
-          say line, :yellow
+          say(line, :yellow) if options[:trace]
           output << line
         end
 

data/spec/gitx/cli/start_command_spec.rb

@@ -11,12 +11,15 @@ describe Gitx::Cli::StartCommand do
   end
   let(:cli) { described_class.new(args, options, config) }
   let(:repo) { cli.send(:repo) }
+  let(:exit_value) { double(:exit_value, success?: true) }
+  let(:thread) { double(:thread, value: exit_value) }
+  let(:stdoutput) { StringIO.new('') }
 
   describe '#start' do
     context 'when user inputs branch that is valid' do
       before do
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -31,7 +34,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -46,7 +49,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -64,7 +67,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -82,7 +85,7 @@ describe Gitx::Cli::StartCommand do
         expect(cli).to receive(:ask).and_return('new-branch')
 
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
 
@@ -100,10 +103,10 @@ describe Gitx::Cli::StartCommand do
       end
       before do
         expect(cli).to receive(:checkout_branch).with('master').ordered
-        expect(cli).to receive(:run_cmd).with('git pull').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'pull').and_yield(nil, stdoutput, thread).ordered
         expect(repo).to receive(:create_branch).with('new-branch', 'master').ordered
         expect(cli).to receive(:checkout_branch).with('new-branch').ordered
-        expect(cli).to receive(:run_cmd).with('git commit -m "Starting work on new-branch (Issue #10)" --allow-empty').ordered
+        expect(Open3).to receive(:popen2e).with('git', 'commit', '--allow-empty', '--message', 'Starting work on new-branch (Issue #10)').and_yield(nil, stdoutput, thread).ordered
 
         cli.start 'new-branch'
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitx
 version: !ruby/object:Gem::Version
-  version: 2.21.2.ci.130.1
+  version: 2.21.2.ci.134.1
 platform: ruby
 authors:
 - Ryan Sonnek