vfs 0.3.8 → 0.3.9

data/lib/vfs/entries/dir.rb

@@ -92,12 +92,17 @@ module Vfs
     # 
     # Content
     # 
-    def entries options = {}, &block
+    def entries *args, &block
+      raise "invalid arguments #{args.inspect}!" if args.size > 2
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      query = args.first
       options[:bang] = true unless options.include? :bang      
+      
       storage.open_fs do |fs| 
         begin
           list = []
-          fs.each_entry path do |name, type|
+          # query option is optional and supported only for some storages (local fs for example) 
+          fs.each_entry path, query do |name, type|
             next if options[:filter] and options[:filter] != type
             entry = if type == :dir
               dir(name)
@@ -125,14 +130,20 @@ module Vfs
     end
     alias_method :each, :entries
     
-    def files options = {}, &block
+    def files *args, &block
+      options = args.last.is_a?(Hash) ? args.pop : {}      
+      
       options[:filter] = :file
-      entries options, &block
+      args << options
+      entries *args, &block
     end
     
-    def dirs options = {}, &block
+    def dirs *args, &block
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      
       options[:filter] = :dir
-      entries options, &block
+      args << options
+      entries *args, &block
     end    
     
     def include? name

data/lib/vfs/entries/file.rb

@@ -190,7 +190,13 @@ module Vfs
       require 'tilt'
       
       args.unshift Object.new if args.size == 1 and args.first.is_a?(Hash)
-      Tilt::ERBTemplate.new(path).render *args
+      
+      template = Tilt.new path
+      template.render *args
+    end
+    
+    def size
+      get :size
     end
     
     def basename

data/lib/vfs/path.rb

@@ -44,22 +44,22 @@ module Vfs
     
     class << self
       def absolute? path
-        path =~ /^[\/~]|^\.$|^\.\//
+        path =~ /^[\/~\/]|^\.$|^\.\//
       end
-      
+            
       def valid? path, forbid_relative = true, &block
         result, err = if forbid_relative and !absolute?(path)
-          [false, "path must be started with '/', '~', or '.'"]
-        elsif path =~ /.+[\/~]$|\/\.$/
-          [false, "path can't be ended with '/', '~', or '/.'"]
-        elsif path =~ /\/[\/~]|\/\.\//
+          [false, "path must be started with '/', or '.'"]
+        elsif path =~ /.+\/~$|.+\/$|\/\.$/
+          [false, "path can't be ended with '/', '/~', or '/.'"]
+        elsif path =~ /\/\/|\/~\/|\/\.\//
           [false, "path can't include '/./', '/~/', '//' combinations!"]
-        elsif path =~ /.+[~]|\/\.\//
-          [false, "'~', or '.' can be present only at the begining of string"]
+        # elsif path =~ /.+[~]|\/\.\//
+        #   [false, "'~', or '.' can be present only at the begining of string"]
         else
           [true, nil]
         end
-    
+          
         block.call err if block and !result and err
         result
       end

data/lib/vfs/storages/hash_fs.rb

@@ -98,7 +98,9 @@ module Vfs
       #   raise 'not supported'
       # end
       
-      def each_entry path, &block
+      def each_entry path, query, &block
+        raise "hash_fs not support :each_entry with query!" if query
+        
         base, name = split_path path
         assert cd(base)[name], :include?, :dir
         cd(base)[name].each do |relative_name, content|
@@ -135,7 +137,7 @@ module Vfs
         
         if cd(to_base).include? to_name
           if cd(to_base)[to_name][:dir]
-            each_entry from_path do |name, type|
+            each_entry from_path, nil do |name, type|
               if type == :dir
                 _efficient_dir_copy "#{from_path}/#{name}", "#{to_path}/#{name}", override
               else

data/lib/vfs/storages/local.rb

@@ -23,6 +23,7 @@ module Vfs
           # attributes special for file system
           attrs[:created_at] = stat.ctime
           attrs[:updated_at] = stat.mtime
+          attrs[:size] = stat.size
           attrs
         rescue Errno::ENOENT
           {}
@@ -72,13 +73,25 @@ module Vfs
           FileUtils.rm_r path
         end      
 
-        def each_entry path, &block
-          ::Dir.foreach path do |relative_name|
-            next if relative_name == '.' or relative_name == '..'
-            if ::File.directory? "#{path}/#{relative_name}"
-              block.call relative_name, :dir
-            else
-              block.call relative_name, :file
+        def each_entry path, query, &block
+          if query
+            path_with_trailing_slash = path == '/' ? path : "#{path}/"
+            ::Dir["#{path_with_trailing_slash}#{query}"].each do |absolute_path|
+              relative_path = absolute_path.sub path_with_trailing_slash, ''
+              if ::File.directory? absolute_path
+                block.call relative_path, :dir
+              else
+                block.call relative_path, :file
+              end
+            end
+          else
+            ::Dir.foreach path do |relative_name|
+              next if relative_name == '.' or relative_name == '..'
+              if ::File.directory? "#{path}/#{relative_name}"
+                block.call relative_name, :dir
+              else
+                block.call relative_name, :file
+              end
             end
           end
         end

data/lib/vfs/storages/specification.rb

@@ -101,7 +101,7 @@ shared_examples_for 'vfs storage' do
     it 'each' do
       @storage.open_fs do |fs|
         list = {}
-        fs.each_entry(@tmp_dir){|path, type| list[path] = type}
+        fs.each_entry(@tmp_dir, nil){|path, type| list[path] = type}
         list.should be_empty
       
         dir, file = "#{@tmp_dir}/dir", "#{@tmp_dir}/file"
@@ -109,7 +109,7 @@ shared_examples_for 'vfs storage' do
         fs.write_file(file, false){|w| w.call 'something'}
       
         list = {}
-        fs.each_entry(@tmp_dir){|path, type| list[path] = type}
+        fs.each_entry(@tmp_dir, nil){|path, type| list[path] = type}
         list.should == {'dir' => :dir, 'file' => :file}
       end
     end

data/readme.md

@@ -107,26 +107,30 @@ is to provide 1-to-1 clone of underlying OS API, instead of provididing handy to
 And if you want to use remote FS - things are getting even worse and more complicated (Net::SSH & Net::SFTP use a little
 different API than local FS, and you has to remember all thouse little quirks).
   
-## TODO
+## Roadmap
 
-### v 0.1 (all done)
+### some future
 
-- Vos: Dir.bash
-- File.append
-- list of entries/files/dirs
-- support for efficient copy for Local and SSH storages
+- add storages: Hadoop DFS, MongoDB, Amazon S3
 
 ### v 0.2
 
+- refactor specs with :fakefs
 - remove :host from Vfs to Vos
 - efficient (not copy/destroy) versions of move_to, rename
-- glob search for directories: Dir['**/*.yml']
 - access via attributes and helpers for unix chmod
 - add storages: remote FS over HTTP.
 
-### future
+Done:
 
-- add storages: Hadoop DFS, MongoDB, Amazon S3
+- glob search for directories: Dir['**/*.yml']
+
+### v 0.1 (all done)
+
+- Vos: Dir.bash
+- File.append
+- list of entries/files/dirs
+- support for efficient copy for Local and SSH storages
 
 [vos]: http://github.com/alexeypetrushin/vos
 [cluster_management]: http://github.com/alexeypetrushin/cluster_management

data/spec/dir_spec.rb

@@ -86,7 +86,7 @@ describe 'Dir' do
     end
   end
   
-  describe 'content' do
+  describe 'entries, files, dirs' do
     before do
       @path.dir('dir').create
       @path.dir('dir/another_dir').create
@@ -102,6 +102,8 @@ describe 'Dir' do
       list.to_set.should be_eql([@path.dir('dir'), @path.file('file')].to_set)
     end
     
+    it "glob search support"
+    
     it 'should raise error if trying :entries on file' do
       @path.file('some_file').create
       -> {@path.dir('some_file').entries}.should raise_error(/File/)

data/spec/entry_spec.rb

@@ -30,5 +30,7 @@ describe 'Entry' do
     it 'created_at'
     
     it 'updated_at'
+    
+    it 'size'
   end
 end

data/spec/file_spec.rb

@@ -189,5 +189,7 @@ describe 'File' do
   
   describe "extra stuff" do
     it 'render'
+    
+    it 'size'
   end
 end

data/spec/path_spec.rb

@@ -12,7 +12,10 @@ describe "Path" do
       /a/../c      
       /a/...      
       ~/a   
-      ./a   
+      ./a
+      /~a
+      /a~b
+      /a.b~ 
     ).each{|path| Path.should be_valid(path)}    
     
     special = ['']
@@ -35,9 +38,10 @@ describe "Path" do
       /a        /a
       ~/a       ~/a
       ./a       ./a
-      /a/../c   /c
+      /a/../c   /c      
       /         /
       ~         ~
+      /a~/b    /a~/b
       .         .
     ) + special).each_slice(2) do |path, normalized_path| 
       Path.normalize(path).should == normalized_path

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vfs
 version: !ruby/object:Gem::Version 
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors: 
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 +04:00
+date: 2011-08-03 00:00:00 +04:00
 default_executable: 
 dependencies: []