Added better 1.8-compatibility, but only by re-adding some Dir.chdir calls.

mbishop-fiksu · mbishop-fiksu · commit 70a837101329 · 2014-12-01T11:30:36.000-05:00
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -118,8 +118,16 @@ def chdir # :yields: the Git::Path
     end
     
     # returns the repository size in bytes
-    def repo_size
-      return IO.popen("du -s", {:chdir => repo.path}).read.chomp.split.first.to_i
+    if (RUBY_VERSION.to_f < 1.9)
+      def repo_size
+        Dir.chdir(repo.path) do
+          return IO.popen("du -s").read.chomp.split.first.to_i
+        end
+      end
+    else
+      def repo_size
+        return IO.popen("du -s", {:chdir => repo.path}).read.chomp.split.first.to_i
+      end
     end
     
     #g.config('user.name', 'Scott Chacon') # sets value
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -806,16 +806,27 @@ def log_path_options(opts)
       arr_opts
     end
     
-    def run_command(git_cmd, chdir = nil, &block)
-      commands = [git_cmd]
-      commands << {:chdir => chdir} unless chdir.nil?
-      if block_given?
-        retval = IO.popen(*commands, &block)
-        return retval, $?
+    # run_command
+    if (RUBY_VERSION.to_f < 1.9)
+      # in Ruby 1.8 we just have to run inside Dir.chdir. No getting around it
+      def run_command(git_cmd, chdir = nil, &block)
+        Dir.chdir(chdir || Dir.getwd) do
+          return IO.popen(git_cmd, &block), $? if block_given?
+          return `#{git_cmd}`.chomp, $?
+        end
       end
-      out, process_status = Open3.capture2(*commands)
+    else
+      def run_command(git_cmd, chdir = nil, &block)
+        commands = [git_cmd]
+        commands << {:chdir => chdir} unless chdir.nil?
+        if block_given?
+          retval = IO.popen(*commands, &block)
+          return retval, $?
+        end
+        out, process_status = Open3.capture2(*commands)
       
-      return out.chomp, process_status
+        return out.chomp, process_status
+      end
     end
 
     def escape(s)
