TempFile changes to support JRUBY

robertodecurnex · robertodecurnex · commit 27c468842a50 · 2013-04-29T14:10:12.000-03:00
closes ruby-git#72
diff --git a/lib/git/base.rb b/lib/git/base.rb
@@ -416,9 +416,17 @@ def with_index(new_index) # :yields: new_index
     end
     
     def with_temp_index &blk
-      tempfile = Tempfile.new('temp-index')
-      temp_path = tempfile.path
-      tempfile.unlink
+      # Workaround for JRUBY, since they handle the TempFile path different.
+      # MUST be improved to be safer and OS independent. 
+      if RUBY_PLATFORM == 'java'
+        temp_path = "/tmp/temp-index-#{(0...15).map{ ('a'..'z').to_a[rand(26)] }.join}"
+      else
+        tempfile = Tempfile.new('temp-index')
+        temp_path = tempfile.path
+        tempfile.close
+        tempfile.unlink
+      end
+
       with_index(temp_path, &blk)
     end
     
@@ -466,6 +474,7 @@ def with_working(work_dir) # :yields: the Git::WorkingDirectory
     def with_temp_working &blk
       tempfile = Tempfile.new("temp-workdir")
       temp_dir = tempfile.path
+      tempfile.close
       tempfile.unlink
       Dir.mkdir(temp_dir, 0700)
       with_working(temp_dir, &blk)
diff --git a/lib/git/path.rb b/lib/git/path.rb
@@ -1,14 +1,15 @@
 module Git
-  class Path
+ 
+ class Path
     
     attr_accessor :path
     
-    def initialize(path, check_path = true)
-      if !check_path || File.exists?(path)
-        @path = File.expand_path(path)
-      else
+    def initialize(path, check_path=true)
+      if check_path && !File.exists?(path)
         raise ArgumentError, 'path does not exist', [File.expand_path(path)]
       end
+      
+      @path = File.expand_path(path)
     end
     
     def readable?
@@ -24,4 +25,5 @@ def to_s
     end
     
   end
+
 end
diff --git a/tests/units/test_tree_ops.rb b/tests/units/test_tree_ops.rb
@@ -90,6 +90,7 @@ def test_read_tree
         
         tmp = Tempfile.new('tesxt')
         tmppath = tmp.path
+        tmp.close
         tmp.unlink
         
         g.with_index(tmppath) do
