minigit 0.0.1 → 0.0.2

data/.travis.yml

@@ -4,7 +4,10 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  # - jruby-18mode # JRuby in 1.8 mode
-  # - jruby-19mode # JRuby in 1.9 mode
+  - 2.0.0
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
   - rbx-18mode
   - rbx-19mode

data/lib/minigit.rb

@@ -1,5 +1,5 @@
 require 'pathname'
-require 'mixlib/shellout'
+require 'shellwords'
 
 require "minigit/version"
 
@@ -29,7 +29,7 @@ class MiniGit
   class GitError < RuntimeError
     attr_reader :command, :status, :info
     def initialize(command, status, info={})
-      @status = status.dup
+      @status = status.dup rescue status.to_s
       @command = command
       @info = info
       super("Failed to run git #{command.join(' ')}: #{@status}")
@@ -47,14 +47,11 @@ class MiniGit
     path = Pathname.new(where)
     raise ArgumentError, "#{where} does not seem to exist" unless path.exist?
     path = path.dirname unless path.directory?
-    grp = Mixlib::ShellOut.new(
-      git_command, 'rev-parse', '--git-dir', '--show-toplevel',
-      :cwd => path.to_s)
-    grp.run_command
-    grp.error!
-    grp.stdout.lines.map { |ln| path.join(Pathname.new(ln.strip)).realpath.to_s }
-  rescue Mixlib::ShellOut::ShellCommandFailed
-    raise ArgumentError, "Invalid repository path #{where}; Git said: #{grp.stderr.inspect}"
+    Dir.chdir(path.to_s) do
+      out = `#{git_command} rev-parse --git-dir --show-toplevel`
+      raise ArgumentError, "Invalid repository path #{where}" unless $?.success?
+      out
+    end.lines.map { |ln| path.join(Pathname.new(ln.strip)).realpath.to_s }
   end
 
   def initialize(where=nil, opts={})
@@ -70,10 +67,11 @@ class MiniGit
 
   def git(*args)
     argv = switches_for(*args)
-    system(
-      {'GIT_DIR' => git_dir, 'GIT_WORK_TREE' => git_work_tree},
-      git_command, *argv)
-    raise GitError.new(argv, $?) unless $?.success?
+    with_git_env do
+      rv = system(git_command, *argv)
+      raise GitError.new(argv, $?) unless $?.success?
+      rv
+    end
   end
 
   def method_missing(meth, *args, &block)
@@ -122,30 +120,11 @@ class MiniGit
     self
   end
 
-  if RUBY_VERSION =~ /^1\.8\./
-    def system(*args)
-      return Kernel.system(*args) unless args.first.is_a?(Hash)
-      begin
-        env, oenv = args.shift, {}
-        env.keys.each { |k| oenv[k], ENV[k] = ENV[k], env[k] }
-        Kernel.system(*args)
-      ensure
-        oenv.each { |k,v| if v.nil? then ENV.delete(k) else ENV[k] = v end }
-      end
-    end
-  end
-
   class Capturing < MiniGit
-    attr_reader :shellout
+    attr_reader :process
 
-    def git(*args)
-      argv = switches_for(*args)
-      argv << { :environment => { 'GIT_DIR' => git_dir, 'GIT_WORK_TREE' => git_work_tree } }
-      @shellout = Mixlib::ShellOut.new(git_command, *argv)
-      @shellout.run_command.error!
-      @shellout.stdout
-    rescue Mixlib::ShellOut::ShellCommandFailed
-      raise GitError.new(argv, @shellout.status, :shellout => @shellout)
+    def system(*args)
+      `#{Shellwords.join(args)}`
     end
 
     def capturing
@@ -158,4 +137,16 @@ class MiniGit
                                     :git_work_tree => @git_work_tree)
     end
   end
+
+  private
+
+  def with_git_env
+    dir, work_tree = ENV['GIT_DIR'], ENV['GIT_WORK_TREE']
+    ENV['GIT_DIR'] = git_dir
+    ENV['GIT_WORK_TREE'] = git_work_tree
+    yield
+  ensure
+    if dir then ENV['GIT_DIR'] = dir else ENV.delete('GIT_DIR') end
+    if work_tree then ENV['GIT_WORK_TREE'] = work_tree else ENV.delete('GIT_WORK_TREE') end
+  end
 end

data/lib/minigit/version.rb

@@ -1,3 +1,3 @@
 class MiniGit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/minigit.gemspec

@@ -17,8 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'mixlib-shellout'
-
   gem.add_development_dependency 'wrong', '>= 0.7.0'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'minitest'

data/spec/minigit_git_dir_spec.rb

@@ -13,33 +13,39 @@ describe MiniGit do
   end
 
   describe '#find_git_dir' do
+    BACKTICK = :` # for broken syntax highlighting: `
     let(:git) { MiniGit.new }
 
     before :each do
-      Mixlib::ShellOut.any_instance.stubs(:run_command)
-      Mixlib::ShellOut.any_instance.stubs(:error!)
+      MiniGit.stubs(BACKTICK)
+    end
+
+    def rev_parse_returns(*rv)
+      git.expects(BACKTICK).
+        with('git rev-parse --git-dir --show-toplevel').
+        returns( rv.map{|v| "#{v}\n"}.join )
     end
 
     it "Returns a pair of pathnames by running `git rev-parse`" do
-      Mixlib::ShellOut.any_instance.stubs(:stdout).returns("#{git_dir}\n#{work_tree}\n")
+      rev_parse_returns(git_dir, work_tree)
       assert { git.find_git_dir('.') == [ git_dir.realpath.to_s, work_tree.realpath.to_s ] }
     end
 
     it "returns only a single pathname when only one pathname returned" do
-      Mixlib::ShellOut.any_instance.stubs(:stdout).returns("#{bare_git_dir}\n")
+      rev_parse_returns(bare_git_dir)
       assert { git.find_git_dir('.') == [ bare_git_dir.realpath.to_s ] }
     end
 
     it 'works fine with relative pathnames' do
-      Mixlib::ShellOut.any_instance.stubs(:stdout).returns(".git\n")
+      rev_parse_returns('.git')
       assert { git.find_git_dir(work_tree.to_s) == [ git_dir.realpath.to_s ] }
 
-      Mixlib::ShellOut.any_instance.stubs(:stdout).returns(".git\n")
+      rev_parse_returns('.git')
       assert { git.find_git_dir(work_tree.relative_path_from(Pathname.getwd).to_s) == [ git_dir.realpath.to_s ] }
     end
 
     it 'works fine when given a file' do
-      Mixlib::ShellOut.any_instance.stubs(:stdout).returns(".git\n.\n")
+      rev_parse_returns('.git', '.')
       assert { git.find_git_dir(file_in_work_tree.to_s) == [ git_dir.realpath.to_s, work_tree.realpath.to_s ] }
     end
 
@@ -48,7 +54,7 @@ describe MiniGit do
     end
 
     it "throws an error when git returns error code" do
-      Mixlib::ShellOut.any_instance.stubs(:error!).raises(Mixlib::ShellOut::ShellCommandFailed)
+      Process::Status.any_instance.expects(:success?).returns(false)
       assert { ArgumentError === rescuing { git.find_git_dir('.') } }
     end
   end
@@ -77,21 +83,35 @@ describe MiniGit do
   end
 
   describe '#git' do
-    it 'Calls system() with GIT_DIR and GIT_WORK_TREE environment variables set' do
-      git = MiniGit.new
-      git.expects(:system).with({'GIT_DIR' => nil, 'GIT_WORK_TREE' => nil}, 'git', 'status')
-      git.status
-
-      MiniGit.any_instance.expects(:find_git_dir).once.returns( [ bare_git_dir.realpath.to_s ] )
-      git = MiniGit.new('.')
-      git.expects(:system).with({'GIT_DIR' => bare_git_dir.realpath.to_s, 'GIT_WORK_TREE' => nil}, 'git', 'status')
-      git.status
-
-      MiniGit.any_instance.expects(:find_git_dir).once.returns( [ git_dir.realpath.to_s, work_tree.realpath.to_s ] )
-      git = MiniGit.new('.')
-      git.expects(:system).with({'GIT_DIR' => git_dir.realpath.to_s, 'GIT_WORK_TREE' => work_tree.realpath.to_s}, 'git', 'status')
-      git.status
+    class MiniGitEnvPeek < MiniGit
+      def system(*args)
+        Hash[ENV]
+      end
+    end
 
+    it 'Calls system() with GIT_DIR and GIT_WORK_TREE environment variables set' do
+      assert { ENV['GIT_DIR'].nil? }
+      assert { ENV['GIT_WORK_TREE'].nil? }
+
+      MiniGitEnvPeek.any_instance.expects(:find_git_dir).once.returns( [ git_dir.realpath.to_s, work_tree.realpath.to_s ] )
+      git = MiniGitEnvPeek.new('.')
+      env = git.status
+      assert { env['GIT_DIR'] == git_dir.realpath.to_s }
+      assert { env['GIT_WORK_TREE'] == work_tree.realpath.to_s }
+
+      MiniGitEnvPeek.any_instance.expects(:find_git_dir).once.returns( [ bare_git_dir.realpath.to_s ] )
+      git = MiniGitEnvPeek.new('.')
+      env = git.status
+      assert { env['GIT_DIR'] == bare_git_dir.realpath.to_s }
+      assert { env['GIT_WORK_TREE'].nil? }
+
+      git = MiniGitEnvPeek.new
+      env = git.status
+      assert { env['GIT_DIR'].nil? }
+      assert { env['GIT_WORK_TREE'].nil? }
+
+      assert { ENV['GIT_DIR'].nil? }
+      assert { ENV['GIT_WORK_TREE'].nil? }
     end
   end
 end

data/spec/minigit_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe MiniGit do
-  GIT_ENV = { 'GIT_DIR' => nil, 'GIT_WORK_TREE' => nil }
   let(:git) { MiniGit.new }
 
   describe '#git_command' do
@@ -15,7 +14,7 @@ describe MiniGit do
     end
 
     it 'specifies how git is run' do
-      git.expects(:system).with(GIT_ENV, 'other', 'whatever', '--foo=bar')
+      git.expects(:system).with('other', 'whatever', '--foo=bar')
       git.git_command = 'other'
       git.whatever :foo => 'bar'
     end
@@ -62,10 +61,10 @@ describe MiniGit do
 
   describe '#git' do
     it 'calls git with given options' do
-      git.expects(:system).with(GIT_ENV, 'git', 'status')
+      git.expects(:system).with('git', 'status')
       git.git(:status)
 
-      git.expects(:system).with(GIT_ENV, 'git', 'log', '--oneline').once
+      git.expects(:system).with('git', 'log', '--oneline').once
       git.git(:log, :oneline => true)
     end
 
@@ -127,14 +126,14 @@ describe MiniGit do
 
   describe '.method_missing' do
     it 'calls out to a hidden instance of self' do
-      MiniGit.any_instance.expects(:system).with(GIT_ENV, 'git', 'status')
+      MiniGit.any_instance.expects(:system).with('git', 'status')
       MiniGit.status
     end
   end
 
   describe '.git' do
     it 'also calls out to a hidden instance of self' do
-      MiniGit.any_instance.expects(:system).with(GIT_ENV, 'git', 'status')
+      MiniGit.any_instance.expects(:system).with('git', 'status')
       MiniGit.git :status
     end
   end

data/spec/spec_helper.rb

@@ -6,7 +6,10 @@ require 'fileutils'
 require 'pathname'
 
 require 'simplecov'
-SimpleCov.start
+SimpleCov.start do
+  command_name 'MiniTest::Spec'
+  minimum_coverage 95
+end
 
 require 'minitest/spec'
 require 'minitest/autorun'

metadata

@@ -1,112 +1,104 @@
 --- !ruby/object:Gem::Specification
 name: minigit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  prerelease:
+  version: 0.0.2
 platform: ruby
 authors:
 - Maciej Pasternacki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: mixlib-shellout
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: wrong
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.0
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: A simple Ruby interface for Git
 email:
 - maciej@pasternacki.net
@@ -114,8 +106,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -131,32 +123,34 @@ files:
 - spec/spec_helper.rb~
 homepage: https://github.com/3ofcoins/minigit
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1654588845628700009
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: 1654588845628700009
+      hash: 2
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
+rubyforge_project:
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A simple Ruby interface for Git
 test_files: