ruby-appraiser 1.0.1 → 1.0.2

data/lib/ruby-appraiser.rb

@@ -52,9 +52,9 @@ class RubyAppraiser
       # true if file has a ruby shebang
       begin
         return true if File.open(filepath) do |file|
-          file.read(20).chomp =~ /\A#\!.+ruby/
+          file.readline(20).chomp =~ /\A#\!.+ruby/
         end
-      rescue Errno::ENOENT
+      rescue EOFError      # file was empty
       rescue ArgumentError # invalid byte sequence
       end
 

data/lib/ruby-appraiser/cli.rb

@@ -79,7 +79,8 @@ class RubyAppraiser
         @appraisal.add_adapter(adapter) or
           raise "Unknown adapter '#{adapter}'"
       end
-      Dir::chdir((`git rev-parse --show-toplevel`).chomp)
+      git_base = Git.run('rev-parse', '--show-toplevel', &:read).chomp
+      Dir.chdir(git_base)
     end
 
     def options

data/lib/ruby-appraiser/git.rb

@@ -1,33 +1,24 @@
 # encoding: utf-8
+require 'open3'
 
 class RubyAppraiser
   module Git
     extend self
 
     def authored_lines(options = {})
-      diff_command = ['git', 'diff']
+      diff_command = ['diff']
       if options[:range]
         diff_command << options[:range]
       else
         diff_command << (options[:staged] ? '--cached' : 'HEAD')
       end
 
-      diff_io = IO.popen(diff_command << {err: [:child, :out]})
-      diff_output = diff_io.read
-
-      case diff_output
-      when /^fatal: Not a git/i
-        then raise 'ruby-appraiser only works in git repos.'
-      when /^fatal: ambiguous argument 'HEAD'/i
-        then raise 'this ruby-appraiser mode only works with previous ' +
-                   'commits, and your repository doesn\t appear to have ' +
-                   'any. Make some commits first, or try a different mode.'
-      end
+      diff_out = run(*diff_command)
 
       current_path, current_line = nil, nil
       authored_lines = Hash.new { |hash, key| hash[key] = [] }
 
-      diff_output.lines do |line|
+      diff_out.each_line do |line|
         case line
         when /^---/ then next
         when /^\+\+\+ (?:b\/)?(.*)/
@@ -47,5 +38,22 @@ class RubyAppraiser
         not RubyAppraiser::rubytype? filepath
       end
     end
+
+    def run(*git_command)
+      stdin, stdout, stderr = Open3.popen3('git', *git_command)
+      stdin.close
+
+      case stderr.read
+      when /^fatal: Not a git/i
+        then raise 'ruby-appraiser only works in git repos.'
+      when /^fatal: ambiguous argument 'HEAD'/i
+        then raise 'this ruby-appraiser mode only works with previous ' +
+                   'commits, and your repository doesn\'t appear to have ' +
+                   'any. Make some commits first, or try a different mode.'
+      end
+
+      return yield(stdout) if block_given?
+      stdout
+    end
   end
 end

data/lib/ruby-appraiser/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 class RubyAppraiser
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-appraiser
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-07 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake