torquebox-vfs 1.1.1-java → 2.0.0.beta1-java

data/lib/gem_hook.rb

@@ -1,15 +1,15 @@
 # Copyright 2008-2011 Red Hat, Inc, and individual contributors.
-#
+# 
 # This is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
-#
+# 
 # This software is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 # Lesser General Public License for more details.
-#
+# 
 # You should have received a copy of the GNU Lesser General Public
 # License along with this software; if not, write to the Free
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA

data/lib/torquebox-vfs.rb

@@ -1,17 +1,10 @@
 module TorqueboxVfs
-  VERSION = '1.1.1'
-  MAVEN_VERSION = '1.1.1'
+  VERSION = '2.0.0.beta1'
+  MAVEN_VERSION = '2.0.0.beta1'
 end
 begin
   require 'java'
   require File.dirname(__FILE__) + '/torquebox-vfs.jar'
-  require File.dirname(__FILE__) + '/jboss-vfs-3.0.0.GA.jar'
-  require File.dirname(__FILE__) + '/jboss-logging-spi-2.2.0.CR1.jar'
-  require File.dirname(__FILE__) + '/jboss-logging-3.0.0.Beta4.jar'
-  require File.dirname(__FILE__) + '/jboss-logmanager-1.2.0.CR9.jar'
-  require File.dirname(__FILE__) + '/jboss-logmanager-log4j-1.0.0.CR3.jar'
-  require File.dirname(__FILE__) + '/log4j-1.2.14.jar'
-  require File.dirname(__FILE__) + '/jboss-common-core-2.2.17.GA.jar'
 rescue LoadError
   puts 'JAR-based gems require JRuby to load. Please visit www.jruby.org.'
   raise

data/lib/torquebox/vfs.rb

@@ -33,11 +33,15 @@ require 'torquebox/vfs/ext/dir'
 require 'torquebox/vfs/ext/pathname'
 require 'torquebox/vfs/ext/kernel'
 require 'torquebox/vfs/ext/jdbc'
+require 'torquebox/vfs/ext/process'
 
 
 module TorqueBox
   module VFS
     def self.resolve_within_archive(path)
+      if ( path.respond_to?(:vfs_path?) && path.vfs_path? )
+        return "vfs:#{path.to_s}" 
+      end
       path = path.to_s
       return path if ( path =~ %r(^vfs:) )
       cur = path

data/lib/torquebox/vfs/ext/dir.rb

@@ -117,7 +117,7 @@ class Dir
 
     def glob_one(pattern, flags=0, &block)
       #str_pattern = "#{pattern}"
-      str_pattern = pattern.to_str
+      str_pattern = File.path_to_str(pattern)
 
       segments = str_pattern.split( '/' )
 
@@ -144,7 +144,7 @@ class Dir
 
       matcher_segments = segments - base_segments
       matcher = matcher_segments.join( '/' )
-      dirs_only = (str_pattern[-1,1] == '/')
+      dirs_only = ( str_pattern[-1,1] == '/' )
       #puts "matcher [#{matcher}]"
 
       begin
@@ -164,8 +164,15 @@ class Dir
         #puts "base=#{base}"
         # puts "preparing glob filter for path #{child_path} and match #{matcher}"
         filter = TorqueBox::VFS::GlobFilter.new( child_path, matcher, dirs_only )
-        #puts "filter is #{filter}"
-        paths = starting_point.getChildrenRecursively( filter ).collect{|e|
+        paths = starting_point.getChildrenRecursively( filter )
+        
+        if ( str_pattern[str_pattern.length - 3, str_pattern.length - 1] == '**/' )
+          # if asking for double-splat and a trailing slash, the root counts too.
+          paths << org.jboss.vfs.VFS.child( child_path )
+        end
+        
+        # paths = starting_point.getChildrenRecursively( filter ).collect{ |e|
+        paths = paths.collect {	|e|
           #path_name = e.path_name
           path_name = e.getPathNameRelativeTo( starting_point )
           #puts "(collect) path_name=#{path_name}"

data/lib/torquebox/vfs/ext/file.rb

@@ -41,6 +41,26 @@ class File
     alias_method :new_without_vfs,         :new
     alias_method :rename_without_vfs,      :rename
     alias_method :join_without_vfs,        :join
+    alias_method :to_s_without_vfs,        :to_s
+    
+    def to_s
+      s = to_s_without_vfs
+      vfs_path?( s ) ? s[4..-1] : s
+    end
+
+    #
+    # File.realpath is a 1.9ism
+    #
+    if ( File.respond_to? :realpath )
+      alias_method :realpath_without_vfs,    :realpath
+      def realpath(path, dir_string=nil)
+        if vfs_path?( path )
+	  virtual_file = TorqueBox::VFS.virtual_file( path )
+	  return virtual_file.physical_file.to_s
+	end
+	realpath_without_vfs( path, dir_string )
+      end
+    end
 
     def open(fname,mode_str='r', flags=nil, &block)
       if ( Fixnum === fname )
@@ -267,6 +287,8 @@ class File
     end
     
     def vfs_path?(path)
+      return path.vfs_path? if path.respond_to?(:vfs_path?)
+      return path.path =~ /^vfs:/ if path.respond_to?(:path)
       path.to_s =~ /^vfs:/
     end
 

data/lib/torquebox/vfs/ext/io.rb

@@ -31,31 +31,23 @@ class IO
       write    = false
       read     = false
       create   = false
+      binary   = false
       case ( mode_str )
         when /r/
           read   = true
-          write  = false
-          append = false
-          create = false
         when /r\+/
           read   = true
           write  = true
-          create = false
-          append = false
         when /w/
-          read     = false
           write    = true
           create   = true
-          append   = false
           truncate = true
         when /w\+/
-          read   = false
+          read   = true
           write  = true
           create = true
-          append = false
           truncate = true
         when /a/
-          read   = false
           write  = true
           create = true
           append = true
@@ -63,6 +55,7 @@ class IO
           read   = true
           write  = true
           create = true
+          append = true
         when Fixnum
           if ( mode_str & File::RDONLY != 0 )
             read  = true
@@ -88,13 +81,15 @@ class IO
           end
       end
 
+      binary = mode_str =~ /b/
+
       # VFS doesn't correctly handle relative paths when
       # retrieving the physical file so expand it
       fd = File.expand_path( fd )
       virtual_file = org.jboss.vfs.VFS.child( fd )
 
       if ( ! create && ! virtual_file.exists )
-        raise Errno::ENOENT
+        raise Errno::ENOENT, fd
       end
 
       if ( read && ! write )
@@ -105,16 +100,17 @@ class IO
         java_out = java.io::FileOutputStream.new( physical_file, append )
         ruby_io = java_out.to_io
       elsif ( read && write )
-        raise Error.new( "Random-access on VFS not supported" )
+        raise ArgumentError.new( "Random-access on VFS not supported" )
       end
 
+      ruby_io.binmode if binary
       file_io = TorqueBox::VFS::Ext::VirtualFile.new( ruby_io, fd )
 
       if ( block )
         begin
           block.call( file_io )
         ensure
-          file_io.close
+          file_io.close unless file_io.closed?
         end
       else
         return file_io
@@ -153,6 +149,15 @@ class IO
         vfs_open( name ).readlines( *options )
       end
     end
+
+    if RUBY_VERSION =~ /1.9/
+      alias_method :copy_stream_without_vfs, :copy_stream
+      def copy_stream(src, dst, *args)
+        src = src.__getobj__ if src.is_a?( TorqueBox::VFS::Ext::VirtualFile )
+        dst = dst.__getobj__ if dst.is_a?( TorqueBox::VFS::Ext::VirtualFile )
+        copy_stream_without_vfs( src, dst, *args )
+      end
+    end
   end
 
 end

data/lib/torquebox/vfs/ext/jdbc.rb

@@ -23,15 +23,18 @@ class Java::java.sql::DriverManager
     # Monkey patch getConnection so we can sort out local filesystem url's for
     # SQLite (we need to remove the 'vfs:' from the url). This works
     # for activerecord-jdbc-adapter v1.1.2 and under. For v1.1.3 and
-    # up, see web/web-core/src/main/java/org/torquebox/rails/core/boot.rb
+    # up, see web/src/main/java/org/torquebox/rails/boot.rb
     def getConnection(url, *params)
 
       # Remove any VFS prefix from the url (for SQLite)
       url = url.sub(':vfs:', ':')
 
       # Call the correct version based on the number of arguments
-      raise NotImplementedError.new('Need to hande the single param version of getConnection') if params.count == 0
-      params.count == 1 ? get_connection_with_properties(url, params.first) : get_connection_with_username_password(url, params[0], params[1])
+      case params.count
+      when 0 then get_connection_with_url(url)
+      when 1 then get_connection_with_properties(url, params.first)
+      when 2 then get_connection_with_username_password(url, params[0], params[1])
+      end
     end
 
     def registerDriver(driver)
@@ -41,12 +44,22 @@ class Java::java.sql::DriverManager
 
     private
 
+    # The 1 param version of getConnection passing in a url
+    def get_connection_with_url(url)
+      get_connection_without_vfs(url)
+    rescue => e
+      raise e unless @driver
+      # If we did register a driver, try to connect using it directly
+      props = java.util.Properties.new
+      @driver.connect(url, props)
+    end
+
     # The 2 param version of getConnection passing in url and a hash of properties
     def get_connection_with_properties(url, properties)
       get_connection_without_vfs(url, properties)
     rescue => e
       raise e unless @driver
-      # If we did register a driver, try to connection using it directly
+      # If we did register a driver, try to connect using it directly
       @driver.connect(url, properties)
     end
 

data/lib/torquebox/vfs/ext/kernel.rb

@@ -19,6 +19,7 @@ module Kernel
 
   private
   alias_method :open_without_vfs, :open
+  alias_method :backtick_without_vfs, '`'
 
   def open(name, *rest, &block)
     if ( name =~ /^vfs:/ )
@@ -27,4 +28,11 @@ module Kernel
     open_without_vfs( name, *rest, &block )
   end
 
+  def `(*args)
+    non_vfs_args = args.map do |arg|
+       arg.is_a?(String) ? arg.gsub("vfs:", "") : arg
+    end
+    backtick_without_vfs(*non_vfs_args)
+  end
+
 end

data/lib/torquebox/vfs/ext/pathname.rb

@@ -21,16 +21,23 @@ class Pathname
 
   alias_method :realpath_without_vfs, :realpath
   alias_method :relative_without_vfs, :relative?
+  alias_method :to_s_without_vfs, :to_s
 
   def realpath
     vfs_path? ? expand_path : realpath_without_vfs
   end
 
   def vfs_path?
-    @path.to_s =~ /^vfs:/
+    @path =~ /^vfs:/
   end
 
   def relative?
     vfs_path? ? false : relative_without_vfs
   end
+  
+  def to_s
+    s = to_s_without_vfs
+    vfs_path? ? s[4..-1] : s
+  end
+  
 end

data/lib/torquebox/vfs/ext/process.rb

@@ -0,0 +1,34 @@
+# Copyright 2008-2011 Red Hat, Inc, and individual contributors.
+# 
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as
+# published by the Free Software Foundation; either version 2.1 of
+# the License, or (at your option) any later version.
+# 
+# This software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public
+# License along with this software; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+
+module Process
+
+  class << self
+
+    if self.respond_to?(:spawn)
+      alias_method :spawn_without_vfs, :spawn
+      def spawn(*args)
+        non_vfs_args = args.map do |arg|
+          arg.is_a?(String) ? arg.gsub("vfs:", "") : arg
+        end
+        spawn_without_vfs(*non_vfs_args)
+      end
+    end
+
+  end
+
+end

data/lib/torquebox/vfs/glob_filter.rb

@@ -36,7 +36,6 @@ module TorqueBox
         end
         @regexp = Regexp.new( regexp_str )
         @dirs_only = dirs_only
-        # puts "glob #{glob} ==> #{@regexp}"
       end
       
       def accepts(file)

data/licenses/lgpl-2.1.txt

@@ -1,5 +1,5 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
@@ -10,7 +10,7 @@
  as the successor of the GNU Library Public License, version 2, hence
  the version number 2.1.]
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -112,7 +112,7 @@ modification follow.  Pay close attention to the difference between a
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
-		  GNU LESSER GENERAL PUBLIC LICENSE
+                  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any software library or other
@@ -146,7 +146,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
@@ -432,7 +432,7 @@ decision will be guided by the two goals of preserving the free status
 of all derivatives of our free software and of promoting the sharing
 and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
 WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
@@ -455,7 +455,7 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS
 
            How to Apply These Terms to Your New Libraries
 
@@ -500,5 +500,3 @@ necessary.  Here is a sample; alter the names:
   Ty Coon, President of Vice
 
 That's all there is to it!
-
-

data/spec/dir_spec.rb

@@ -44,21 +44,21 @@ describe "Dir extensions for VFS" do
       end
       
       it "should ignore dotdirs by default" do
-      	items = Dir.glob( "#{prefix}/**/*" )
-      	items.should_not be_empty
-      	items.size.should eql(32)
+        items = Dir.glob( "#{prefix}/**/*" )
+        items.should_not be_empty
+        items.size.should eql(33)
       end
 
       it "should handle trailing double splats" do
-      	items = Dir.glob( "#{prefix}/**" )
-      	items.should_not be_empty
-      	items.size.should eql(5)
+        items = Dir.glob( "#{prefix}/**" )
+        items.should_not be_empty
+        items.size.should eql(6)
       end
       
       it "should handle Rails 2 glob-related arglebargle" do
-      	items = Dir.glob( "#{prefix}/**/*/**" )
-      	items.should_not be_empty
-      	items.size.should eql(27)
+        items = Dir.glob( "#{prefix}/**/*/**" )
+        items.should_not be_empty
+        items.size.should eql(27)
       end
       
       it "should ignore dotfiles by default" do
@@ -247,6 +247,51 @@ describe "Dir extensions for VFS" do
         items.should include( "#{prefix}/home" )
         items.should include( "#{prefix}/sound of music" )
       end
+      
+      it "should match the current directory on a double-splat with trailing slash" do
+        items = Dir.glob( "#{prefix}/**/" )
+        
+        puts "\nFor 255:"
+        items.each {|i| puts i}
+        
+        items.should_not be_empty
+        items.size.should eql(4)
+        items.should include( "#{prefix}/" )
+        items.should include( "#{prefix}/dotfiles" )
+        items.should include( "#{prefix}/home" )
+        items.should include( "#{prefix}/sound of music" )
+      end
+      
+      it "should match files on a double splat without a trailing slash" do
+        items = Dir.glob( "#{prefix}/**" )
+        items.should_not be_empty
+        items.size.should eql(6)
+        items.should include( "#{prefix}/dotfiles" )
+        items.should include( "#{prefix}/home" )
+        items.should include( "#{prefix}/sound of music" )
+        items.should include( "#{prefix}/#bad-uri#" )
+        items.should include( "#{prefix}/biscuit.jpg" )
+        items.should include( "#{prefix}/views%2Flocalhost%3A8080%2Fposts" )
+      end
+      
+      it "should match using question marks" do
+        items = Dir.glob( "#{prefix}/biscuit.jp?" )
+        items.should_not be_empty
+        items.size.should eql(1)
+        items.should include( "#{prefix}/biscuit.jpg" )
+      end
+      
+      it "should match files on a single splat without a trailing slash" do
+        items = Dir.glob( "#{prefix}/*" )
+        items.should_not be_empty
+        items.size.should eql(6)
+        items.should include( "#{prefix}/dotfiles" )
+        items.should include( "#{prefix}/home" )
+        items.should include( "#{prefix}/sound of music" )
+        items.should include( "#{prefix}/#bad-uri#" )
+        items.should include( "#{prefix}/biscuit.jpg" )
+        items.should include( "#{prefix}/views%2Flocalhost%3A8080%2Fposts" )
+      end
 
       it "should allow for multiple single-star globbing" do
         items = Dir.glob( "#{prefix}/home/**/*file*.txt" )
@@ -274,6 +319,16 @@ describe "Dir extensions for VFS" do
         items.should include( "#{prefix}/home/larry/file1.txt" )
       end
 
+      it "should allow globbing with pathnames via []" do
+        items = []
+        path = Pathname.new( prefix ).join( "home", "larry", "*" )
+        lambda {
+          items = Dir[path]
+        }.should_not raise_error
+
+        items.should include( "#{prefix}/home/larry/file1.txt" )
+      end
+
       it "should create new Dirs" do
         lambda {
           Dir.new(prefix)

data/spec/file_spec.rb

@@ -7,6 +7,20 @@ describe "File extensions for VFS" do
 
   extend TestDataCopyHelper
 
+  it "should set __FILE__ correctly" do
+    __FILE__.should =~ /^#{absolute_prefix}/
+  end
+
+  if ( File.respond_to? :realpath) 
+    it "should handle realpath on a normal path" do
+      File.realpath( __FILE__ ).should == __FILE__
+    end
+  
+    it "should handle realpath on a VFS path" do
+      File.realpath( vfs_path(__FILE__) ).should =~ /^#{absolute_prefix}/
+    end
+  end
+
   it "should report writable-ness for VFS urls" do
     prefix = test_copy_base_path( :relative )
     url = vfs_path( "#{prefix}/home/larry/file1.txt" )
@@ -40,12 +54,12 @@ describe "File extensions for VFS" do
 
     it "should expand paths relative to VFS pathnames as VFS" do
       absolute = File.expand_path("db/development.sqlite3", Pathname.new( vfs_path( "/path/to/app" ) ) )
-      absolute.should eql( vfs_path("#{absolute_prefix}/path/to/app/db/development.sqlite3") )
+      absolute.should eql( vfs_path( "#{absolute_prefix}/path/to/app/db/development.sqlite3" ) )
     end
 
     it "should expand absolute Pathname objects correctly" do
       File.expand_path( vfs_path("/foo") ).should eql( vfs_path("/foo") )
-      File.expand_path(Pathname.new( vfs_path("/foo"))).should eql( vfs_path("/foo") )
+      File.expand_path(Pathname.new( vfs_path("/foo"))).should eql( "/foo" )
     end
 
     it "should return first path when given two vfs paths" do
@@ -206,6 +220,26 @@ describe "File extensions for VFS" do
 	f.close
       }.should_not raise_error
     end
+
+    it "should respect binary mode for vfs files that don't yet exist" do 
+       prefix = test_copy_base_path( :absolute )
+       in_path = "#{prefix}/biscuit.jpg"
+       out_path = vfs_path( "#{prefix}/binfile" )
+       data = File.read( in_path )
+       File.open( out_path, 'wb' ) { |f| f.write( data ) }
+       File.size( out_path ).should == File.size( in_path )
+       File.read( out_path ).should == data
+    end
+
+    it "should respect binary mode for vfs files that already exist" do 
+       prefix = test_copy_base_path( :absolute )
+       path = "#{prefix}/biscuit.jpg"
+       data = File.read( path )
+       size = File.size( path )
+       File.open( path, 'wb' ) { |f| f.write( data ) }
+       File.size( path ).should == size
+       File.read( path ).should == data
+    end
   end
 
   describe "new" do

data/spec/fileutils_spec.rb

@@ -0,0 +1,15 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'fileutils'
+
+describe "fileutils compatibility with VFS" do
+
+  extend TestDataCopyHelper
+
+  it "should support fileutils.cp for vfs paths" do
+    prefix = test_copy_base_path( :vfs )
+    source = File.join( prefix, "home", "larry", "file1.txt" )
+    destination = File.join( prefix, "home", "larry", "file1_copy.txt" )
+    FileUtils.cp( source, destination )
+    File.exist?( destination ).should be_true
+  end
+end

data/spec/io_spec.rb

@@ -5,6 +5,18 @@ describe "IO extensions for VFS" do
 
   extend TestDataHelper
 
+  describe "vfs_open" do
+    before(:each) do
+      @file = vfs_path( test_data_base_path( :absolute ) + "/home/larry/file1.txt" ) 
+    end
+    
+    it "should raise when given RDWR" do
+      lambda { 
+        IO.vfs_open( @file, File::RDWR )
+      }.should raise_error( ArgumentError )
+    end
+  end
+  
   [ :absolute, :relative ].each do |style|
     [ :vfs, :normal ].each do |vfs_style|
       describe "with #{vfs_style} #{style} paths" do
@@ -13,6 +25,14 @@ describe "IO extensions for VFS" do
         prefix = vfs_path( prefix ) if vfs_style == :vfs
 
         describe 'read' do
+        
+          it "should raise a proper exception if file not found" do
+            begin
+              content = IO.read( "#{prefix}/joey/jo/jo/junior.shabadoo" )
+            rescue => ex
+              ex.message.should include "joey/jo/jo/junior.shabadoo"
+            end
+          end
           
           it "should allow reading of regular files" do
             content = IO.read( "#{prefix}/home/larry/file1.txt" ).chomp

data/spec/jdbc_spec.rb

@@ -11,6 +11,12 @@ describe "JDBC Extensions for VFS" do
 
     describe "getConnection" do
 
+      it "should call get_connection_with_url if passed a single argument" do
+        @driver_manager.should_receive(:get_connection_with_url).
+          with("url")
+        @driver_manager.getConnection("url")
+      end
+
       it "should call get_connection_with_properties if passed two arguments" do
         properties = Properties.new
         @driver_manager.should_receive(:get_connection_with_properties).
@@ -26,6 +32,23 @@ describe "JDBC Extensions for VFS" do
 
     end
 
+    describe "get_connection_with_url" do
+
+      it "should delegate to original method" do
+        @driver_manager.should_receive(:get_connection_without_vfs).
+          with("url")
+        @driver_manager.send(:get_connection_with_url, "url")
+      end
+
+      it "should fall back to connect directly" do
+        driver = mock('driver')
+        driver.should_receive(:connect).with("url", an_instance_of(Properties))
+        @driver_manager.registerDriver(driver)
+        @driver_manager.send(:get_connection_with_url, "url")
+      end
+
+    end
+
     describe "get_connection_with_properties" do
 
       it "should delegate to original method" do

data/spec/kernel_spec.rb

@@ -0,0 +1,32 @@
+
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Kernel stuff" do
+
+  extend PathHelper
+  extend TestDataCopyHelper
+
+  # 
+  # Kernel.require_relative is a 1.9ism
+  #
+
+  if ( Kernel.respond_to? :require_relative )
+    it "should be able to handle require_relative" do
+      require_relative "relatively_requireable"
+    end
+  
+    it "should be able to handle require_relative with VFS __FILE__" do
+      eval( 'require_relative "relatively_requireable"', binding, vfs_path(__FILE__) )
+    end
+  end
+
+  unless TESTING_ON_WINDOWS
+    it "should remove vfs: prefix from backtick commands" do
+      prefix = test_copy_base_path( :vfs )
+      path = File.join( prefix, "home", "larry", "file1.txt" )
+      result = `ls #{path} 2>&1`
+      result.should_not match( /No such file/i )
+    end
+  end
+
+end

data/spec/pathname_spec.rb

@@ -4,13 +4,34 @@ require 'pathname'
 
 describe "Pathname extensions for VFS" do
 
+  it "should test VFSness nicely" do
+    pathname = Pathname.new("vfs:/tmp/test")
+    pathname.should be_vfs_path
+  end
+
+  it "should test VFSness nicely for Windows" do
+    pathname = Pathname.new("vfs:/C/tmp/test")
+    pathname.should be_vfs_path
+  end
+
   describe "realpath" do
+
     it "should expand VFS paths" do
       pathname = Pathname.new("vfs:/tmp/test")
       pathname.should_receive(:expand_path).and_return(Pathname.new("/expanded/path"))
       pathname.realpath.to_s.should == "/expanded/path"
     end
 
+    it "should expand VFS paths correctly on Windows" do
+      pathname = Pathname.new("vfs:/C:/tmp/test")
+      pathname.expand_path.to_s.should == "/C:/tmp/test" and pathname.vfs_path?.should be_true
+    end
+
+    it "should apply realpath to VFS paths correctly on windows" do
+      pathname = Pathname.new("vfs:/C:/tmp/test")
+      pathname.realpath.to_s.should == "/C:/tmp/test" and pathname.vfs_path?.should be_true
+    end
+
     it "should find real path for non-VFS paths" do
       pathname = Pathname.new("/tmp/test")
       pathname.should_receive(:realpath_without_vfs).and_return(Pathname.new("/real/path"))

data/spec/process_spec.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+describe "Process compatibility with VFS" do
+
+  extend TestDataCopyHelper
+
+  if Process.respond_to?(:spawn) && !TESTING_ON_WINDOWS
+    it "should remove vfs: prefix from spawned commands" do
+      prefix = test_copy_base_path( :vfs )
+      path = File.join( prefix, "home", "larry", "file1.txt" )
+      r, w = IO.pipe
+      Process.spawn( {}, "ls #{path} 2>&1", STDERR => w, STDOUT => w )
+      w.close
+      result = r.readlines.join("")
+      r.close
+      result.should_not match( /No such file/i )
+    end
+  end
+
+end

data/spec/relatively_requireable.rb

@@ -0,0 +1,2 @@
+
+puts "required, yay."

data/spec/vfs_spec.rb

@@ -11,7 +11,7 @@ describe "VFS path resolution" do
     it "should return pathnames with vfs: prefix unmodified" do
       pathname = Pathname.new("vfs:/tmp/foo")
       path = TorqueBox::VFS.resolve_within_archive(pathname)
-      path.should == pathname.to_s
+      pathname.vfs_path?.should be_true and path.should == "vfs:#{pathname}"
     end
   end
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: torquebox-vfs
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.1
+  prerelease: 6
+  version: 2.0.0.beta1
 platform: java
 authors: 
   - The TorqueBox Team
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 -04:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rspec
@@ -21,7 +20,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 2.3.0
+            version: 2.7.0
     type: :development
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -30,9 +29,12 @@ dependencies:
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
             version: 0.8.7
+        - - <
+          - !ruby/object:Gem::Version 
+            version: 1.0.0
     type: :development
     version_requirements: *id002
 description: ""
@@ -48,13 +50,6 @@ files:
   - licenses/lgpl-2.1.txt
   - lib/torquebox-vfs.jar
   - lib/torquebox-vfs.rb
-  - lib/jboss-vfs-3.0.0.GA.jar
-  - lib/jboss-logging-spi-2.2.0.CR1.jar
-  - lib/jboss-logging-3.0.0.Beta4.jar
-  - lib/jboss-logmanager-1.2.0.CR9.jar
-  - lib/jboss-logmanager-log4j-1.0.0.CR3.jar
-  - lib/log4j-1.2.14.jar
-  - lib/jboss-common-core-2.2.17.GA.jar
   - lib/gem_hook.rb
   - lib/org.torquebox.vfs.rb
   - lib/vfs.rb
@@ -71,20 +66,24 @@ files:
   - lib/torquebox/vfs/ext/jdbc.rb
   - lib/torquebox/vfs/ext/kernel.rb
   - lib/torquebox/vfs/ext/pathname.rb
+  - lib/torquebox/vfs/ext/process.rb
   - lib/torquebox/vfs/ext/tempfile.rb
   - lib/torquebox/vfs/ext/vfs.rb
   - lib/torquebox/vfs/ext/virtual_file.rb
   - spec/dir_spec.rb
   - spec/file_spec.rb
   - spec/file_test_spec.rb
+  - spec/fileutils_spec.rb
   - spec/io_spec.rb
   - spec/jdbc_spec.rb
+  - spec/kernel_spec.rb
   - spec/pathname_spec.rb
+  - spec/process_spec.rb
+  - spec/relatively_requireable.rb
   - spec/spec_helper.rb
   - spec/vfs_dir_spec.rb
   - spec/vfs_spec.rb
-has_rdoc: true
-homepage: http://www.torquebox.org/gem-parent/torquebox-vfs/
+homepage: http://www.torquebox.org/torquebox-gems-parent/torquebox-vfs/
 licenses: 
   - lgpl
 post_install_message: 
@@ -101,13 +100,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: TorqueBox VFS
@@ -115,8 +114,11 @@ test_files:
   - spec/dir_spec.rb
   - spec/file_spec.rb
   - spec/file_test_spec.rb
+  - spec/fileutils_spec.rb
   - spec/io_spec.rb
   - spec/jdbc_spec.rb
+  - spec/kernel_spec.rb
   - spec/pathname_spec.rb
+  - spec/process_spec.rb
   - spec/vfs_dir_spec.rb
   - spec/vfs_spec.rb