git-bundle 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467edc493a125e6a31d611f2fb4ae6fcab556294
-  data.tar.gz: 86f3272c70dd19b54261a758a07bd686716fc888
+  metadata.gz: a8feeeb925b20aaf6289003e567f9f243e03d518
+  data.tar.gz: e8eac2a34eefd759c6a726c9e04e227fc736b623
 SHA512:
-  metadata.gz: f922497c2a5c2dc38b784e4216a364d6325e541c51b85bba273a83bb2aaedbd89d9c0f9d1c074af2d24bcdd3ec8f944cbfb8d4514902277726e2b3d399ab7544
-  data.tar.gz: 34bac554c411f39e3e835258ed3f275fe2618910fdf513926bd566ca6533828070c2b79bb80a071f699466a43d2803e8aa166685f620de37f8bf2349a52f5b66
+  metadata.gz: 457e165a94c0e638a4437b6eb85aa6ad983673ae4573c24abb52f08e6e41942b1ac3f5105e3a3bb79ff4e9df6edef349eb7ae06ee5807846a46809ba8196ffd5
+  data.tar.gz: f3c240557a740e25d9ee5baab591e9ff224123d7732f65f3703b8c44545418a02a747109fe489fdf3bd8df6237b9d8bc151b24ef843a74d81987ce28c3441c75

data/lib/git_bundle/commands/generic.rb

@@ -12,7 +12,7 @@ module GitBundle
         errors = []
         @repositories.each do |repo|
           puts_repo_heading(repo)
-          puts repo.execute_git(@args.join(' '))
+          puts repo.execute_git(@args, color: true)
           errors << repo.name unless $?.exitstatus == 0
         end
 

data/lib/git_bundle/repository.rb

@@ -21,7 +21,7 @@ module GitBundle
     end
 
     def branch
-      @branch ||= execute_git('rev-parse --abbrev-ref HEAD')
+      @branch ||= execute_git('rev-parse', '--abbrev-ref', 'HEAD').chomp
     end
 
     def locked_branch
@@ -29,7 +29,7 @@ module GitBundle
     end
 
     def revision
-      @revision ||= execute_git('rev-parse --verify HEAD').gsub("\n", '')
+      @revision ||= execute_git('rev-parse', '--verify', 'HEAD').gsub("\n", '')
     end
 
     def locked_revision
@@ -37,37 +37,47 @@ module GitBundle
     end
 
     def commits_not_pushed
-      execute_git("rev-list --pretty=oneline --abbrev-commit origin/#{branch}..#{branch}")
+      execute_git('rev-list', '--pretty=oneline', '--abbrev-commit', "origin/#{branch}..#{branch}")
     end
 
     def commit_messages_not_pushed
-      count = execute_git("rev-list origin/#{branch}..#{branch} --count").to_i
-      count.times.map { |num| execute_git("rev-list --pretty=oneline --skip=#{num} --max-count=1 origin/#{branch}..#{branch}").sub(/\h*\s/, '').strip }
+      count = execute_git('rev-list', "origin/#{branch}..#{branch}", '--count').to_i
+      count.times.map { |num| execute_git('rev-list', '--pretty=oneline', "--skip=#{num}", '--max-count=1', "origin/#{branch}..#{branch}").sub(/\h*\s/, '').strip }
     end
 
     def push(args)
-      puts execute_git("push #{args.join(' ')}")
+      puts execute_git('push', args)
       $?.exitstatus == 0
     end
 
     def file_changed?(filename)
-      !execute_git("diff --name-only #{filename}").empty? && $?.exitstatus == 0
+      !execute_git('diff', '--name-only', filename).empty? && $?.exitstatus == 0
     end
 
     def add_file(filename)
-      execute_git("add #{filename}")
+      execute_git('add', filename)
       $?.exitstatus == 0
     end
 
     def commit(message, *files)
-      execute_git("commit -m '#{message}' #{files.join(' ')}")
+      execute_git('commit', '-m', message, files)
       $?.exitstatus == 0
     end
 
-    def execute_git(command)
-      full_command = "git -C #{@path} #{command}"
-      puts full_command if ENV['DEBUG'] == 'true'
-      `#{full_command}`.strip
+    def execute_git(*args, **options)
+      git_command = ['git', '-C', @path]
+      git_command += %w(-c color.status=always -c color.ui=always) if options.fetch(:color, false)
+      git_command += args.flatten
+      execute(*git_command)
+    end
+
+    def execute(*args)
+      puts args.map{ |arg| "'#{arg}'" }.join(' ') if ENV['DEBUG'] == 'true'
+
+      pipe_out, pipe_in = IO.pipe
+      system *args, out: pipe_in, err: pipe_in
+      pipe_in.close
+      pipe_out.read
     end
   end
 end

data/lib/git_bundle/version.rb

@@ -1,3 +1,3 @@
 module GitBundle
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-bundle
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Pierre Pretorius
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler