torquebox-vfs 1.0.0.CR1-java → 1.0.0.CR2-java

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

@@ -52,11 +52,71 @@ class Dir
       result
     end
 
-    def [](pattern)
+    def [](*pattern)
       self.glob( pattern )
     end
 
-    def glob(pattern,flags=0, &block)
+    def glob(pattern, flags=0, &block)
+      patterns = [pattern].flatten
+      patterns.collect { |pattern| glob_one( pattern, flags, &block ) }.flatten
+    end
+    
+    def chdir(*args, &block)
+      raise "You shouldn't use chdir, but if you must, pass a block!" unless block_given?
+      chdir_before_vfs( *args.map{ |x| File.name_without_vfs(x) }, &block )
+    end
+
+    def rmdir(path)
+      name = File.name_without_vfs(path)
+      rmdir_before_vfs(name)
+    end
+    alias_method :unlink, :rmdir
+    alias_method :delete, :rmdir
+
+    def mkdir(path, mode=0777)
+      mkdir_before_vfs( File.name_without_vfs(path), mode )
+    rescue Errno::ENOTDIR => e
+      path = TorqueBox::VFS.writable_path_or_error( File.path_to_str(path), e )
+      mkdir_before_vfs( path, mode )
+    rescue Errno::ENOENT => e
+      path = TorqueBox::VFS.writable_path_or_error( File.path_to_str(path), e )
+      mkdir_before_vfs( path, mode )
+    end
+
+    # 1.8: new( dirname )
+    # 1.9: new( dirname, <, :encoding => enc> )
+    # We currently ignore the encoding.
+    def new(string, options = nil)
+      if ( ::File.exist_without_vfs?( string ) )
+        return new_before_vfs( string )
+      end
+      TorqueBox::VFS::Dir.new( string )
+    end
+
+    # 1.9 has an optional, undocumented options arg that appears to be
+    # used for encoding. We'll ignore it for now, since JRuby does as
+    # well. (see org.jruby.RubyDir.java)
+    def entries(path, options = {})
+      if ( ::File.exist_without_vfs?( path ) )
+        return entries_before_vfs(path)
+      end
+      vfs_dir = org.jboss.vfs::VFS.child( File.path_to_str(path) )
+      # Delegate to original entries if passed a nonexistent file
+      unless vfs_dir.exists?
+        return entries_before_vfs( path )
+      end
+      [ '.', '..' ] + vfs_dir.children.collect{|e| e.name }
+    end
+
+    def foreach(path, &block)
+      enum = entries(path).each(&block)
+      block_given? ? nil : enum
+    end
+
+    private
+
+    def glob_one(pattern, flags=0, &block)
+
       is_absolute_vfs = false
 
       #str_pattern = "#{pattern}"
@@ -131,58 +191,6 @@ class Dir
       end
     end
 
-    def chdir(*args, &block)
-      raise "You shouldn't use chdir, but if you must, pass a block!" unless block_given?
-      chdir_before_vfs( *args.map{ |x| File.name_without_vfs(x) }, &block )
-    end
-
-    def rmdir(path)
-      name = File.name_without_vfs(path)
-      rmdir_before_vfs(name)
-    end
-    alias_method :unlink, :rmdir
-    alias_method :delete, :rmdir
-
-    def mkdir(path, mode=0777)
-      mkdir_before_vfs( File.name_without_vfs(path), mode )
-    rescue Errno::ENOTDIR => e
-      path = TorqueBox::VFS.writable_path_or_error( File.path_to_str(path), e )
-      mkdir_before_vfs( path, mode )
-    rescue Errno::ENOENT => e
-      path = TorqueBox::VFS.writable_path_or_error( File.path_to_str(path), e )
-      mkdir_before_vfs( path, mode )
-    end
-
-    # 1.8: new( dirname )
-    # 1.9: new( dirname, <, :encoding => enc> )
-    # We currently ignore the encoding.
-    def new(string, options = nil)
-      if ( ::File.exist_without_vfs?( string ) )
-        return new_before_vfs( string )
-      end
-      TorqueBox::VFS::Dir.new( string )
-    end
-
-    # 1.9 has an optional, undocumented options arg that appears to be
-    # used for encoding. We'll ignore it for now, since JRuby does as
-    # well. (see org.jruby.RubyDir.java)
-    def entries(path, options = {})
-      if ( ::File.exist_without_vfs?( path ) )
-        return entries_before_vfs(path)
-      end
-      vfs_dir = org.jboss.vfs::VFS.child( File.path_to_str(path) )
-      # Delegate to original entries if passed a nonexistent file
-      unless vfs_dir.exists?
-        return entries_before_vfs( path )
-      end
-      [ '.', '..' ] + vfs_dir.children.collect{|e| e.name }
-    end
-
-    def foreach(path, &block)
-      enum = entries(path).each(&block)
-      block_given? ? nil : enum
-    end
-
   end
 end
 

data/lib/torquebox-vfs.rb

@@ -1,6 +1,6 @@
 module TorqueboxVfs
-  VERSION = '1.0.0.CR1'
-  MAVEN_VERSION = '1.0.0.CR1'
+  VERSION = '1.0.0.CR2'
+  MAVEN_VERSION = '1.0.0.CR2'
 end
 begin
   require 'java'

data/spec/dir_spec.rb

@@ -206,6 +206,35 @@ describe "Dir extensions for VFS" do
         items.should_not include( "#{prefix}/home/larry/archive1.jar/lib/archive4.txt" )
       end
 
+      it "should allow globbing of an array of patterns" do
+        items = []
+        lambda {
+          items = Dir.glob( ["#{prefix}/home/larry/*", "#{prefix}/home/todd/*"] )
+        }.should_not raise_error
+        
+        items.should include( "#{prefix}/home/larry/file1.txt" )
+        items.should include( "#{prefix}/home/todd/index.html.haml" )
+      end
+
+      it "should allow globbing of multiple patterns via []" do
+        items = []
+        lambda {
+          items = Dir["#{prefix}/home/larry/*", "#{prefix}/home/todd/*"]
+        }.should_not raise_error
+
+        items.should include( "#{prefix}/home/larry/file1.txt" )
+        items.should include( "#{prefix}/home/todd/index.html.haml" )
+      end
+
+      it "should allow globbing of a single pattern via []" do
+        items = []
+        lambda {
+          items = Dir["#{prefix}/home/larry/*"]
+        }.should_not raise_error
+
+        items.should include( "#{prefix}/home/larry/file1.txt" )
+      end
+
       it "should create new Dirs" do
         lambda {
           Dir.new(prefix)

metadata

@@ -2,7 +2,7 @@
 name: torquebox-vfs
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.CR1
+  version: 1.0.0.CR2
 platform: java
 authors: []
 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 -04:00
+date: 2011-04-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency