vfs 0.3.13 → 0.3.14

data/lib/vfs/entries/dir.rb

@@ -40,7 +40,8 @@ module Vfs
               raise Error, "entry #{self} already exist!"
             end
           elsif attrs[:dir]
-            # do nothing
+            # dir already exist, no need to recreate it
+            return self
           else
             parent = self.parent
             if parent.exist?
@@ -51,7 +52,7 @@ module Vfs
             end
           end
 
-          retry if try < 2
+          try < 2 ? retry : raise(error)
         end
       end
       self

data/lib/vfs/entries/file.rb

@@ -53,41 +53,46 @@ module Vfs
     end
 
     def write *args, &block
+      if block
+        options = args.first || {}
+      else
+        data, options = *args
+        options ||= {}
+      end
+      raise "can't do :override and :append at the same time!" if options[:override] and options[:append]
+
       storage.open_fs do |fs|
+        # TODO2 Performance lost, extra call to check file existence
+        # We need to check if the file exist before writing to it, otherwise it's
+        # impossible to distinguish if the StandardError caused by the 'already exist' error or
+        # some other error.
+        entry = self.entry
+        if entry.exist?
+          if options[:override]
+            entry.destroy
+          else
+            raise Error, "entry #{self} already exist!"
+          end
+        end
+
         try = 0
         begin
           try += 1
-          if block
-            options = args.first || {}
-          else
-            data, options = *args
-            options ||= {}
-          end
-          raise "can't do :override and :append at the same time!" if options[:override] and options[:append]
           if block
             fs.write_file(path, options[:append], &block)
           else
             fs.write_file(path, options[:append]){|writer| writer.write data}
           end
         rescue StandardError => error
-          entry = self.entry
-          if entry.exist?
-            if options[:override]
-              entry.destroy
-            else
-              raise Error, "entry #{self} already exist!"
-            end
+          parent = self.parent
+          if parent.exist?
+            # some unknown error
+            raise error
           else
-            parent = self.parent
-            if parent.exist?
-              # some unknown error
-              raise error
-            else
-              parent.create(options)
-            end
+            parent.create(options)
           end
 
-          retry if try < 2
+          try < 2 ? retry : raise(error)
         end
       end
       self
@@ -98,6 +103,18 @@ module Vfs
       write *args, &block
     end
 
+    def append *args, &block
+      options = (args.last.is_a?(Hash) && args.pop) || {}
+      options[:append] = true
+      write(*(args << options), &block)
+    end
+
+    def update options = {}, &block
+      options[:override] = true
+      data = read options
+      write block.call(data), options
+    end
+
     def destroy options = {}
       storage.open_fs do |fs|
         begin
@@ -126,24 +143,6 @@ module Vfs
       destroy options
     end
 
-    def append *args, &block
-      if block
-        options = args.first || {}
-      else
-        data, options = *args
-        options ||= {}
-      end
-
-      options[:append] = true
-      write data, options, &block
-    end
-
-    def update options = {}, &block
-      options[:override] = true
-      data = read options
-      write block.call(data), options
-    end
-
 
     #
     # Transfers

data/lib/vfs/entries/universal_entry.rb

@@ -12,7 +12,7 @@ module Vfs
     #
     # CRUD
     #
-    def destroy
+    def destroy options = {}
       storage.open_fs do |fs|
         attrs = get
         fs.delete_dir path if attrs[:dir]
@@ -20,5 +20,6 @@ module Vfs
       end
       self
     end
+    alias_method :destroy!, :destroy
   end
 end

data/lib/vfs/entry_proxy.rb

@@ -1,10 +1,9 @@
 #
-# It allows you dynamically (magically) switch between UniversalEntry/Dir/File
+# It allows dynamically (magically) switching between UniversalEntry/Dir/File
 #
 module Vfs
   class EntryProxy < BasicObject
     attr_reader :_target
-    # WRAP = [:[], :entry, :dir, :file].to_set
 
     def initialize entry
       raise 'something wrong happening here!' if entry.respond_to?(:proxy?) and entry.proxy?
@@ -31,8 +30,6 @@ module Vfs
         end
 
         _target.send m, *a, &b
-
-        # return WRAP.include?(m) ? EntryProxy.new(result) : result
       end
   end
 end

data/lib/vfs/integration/string.rb

@@ -3,7 +3,8 @@ class String
     path = self
     storage ||= Vfs.default_storage
 
-    Vfs::Dir.new(storage, '/')[path]
+    path = "./#{path}" unless path =~ /^[\/\.\~]/
+    Vfs::Dir.new(storage, path)
   end
   alias_method :to_entry, :to_entry_on
 

data/lib/vfs/storages/local.rb

@@ -1,17 +1,12 @@
-warn 'remove trailing spaces'
 require 'tempfile'
 
 module Vfs
   module Storages
     class Local
       class Writer
-        def initialize out
-          @out = out
-        end
+        def initialize out; @out = out end
 
-        def write data
-          @out.write data
-        end
+        def write data; @out.write data end
       end
 
       module LocalVfsHelper
@@ -133,7 +128,7 @@ module Vfs
         def local?; true end
 
         def tmp &block
-          tmp_dir = "#{::Dir.tmpdir}/#{rand(10**3)}"
+          tmp_dir = "#{::Dir.tmpdir}/#{rand(10**6)}"
           if block
             begin
               create_dir tmp_dir

data/readme.md

@@ -32,32 +32,23 @@ $ gem install vos
 ## Code samples:
 
 ``` ruby
-gem 'vfs'                                    # Virtual File System
-require 'vfs'
-
-gem 'vos'                                    # Virtual Operating System
-require 'vos'
-```
+require 'vfs'                                    # Virtual File System
+require 'vos'                                    # Virtual Operating System
 
 # Connections, let's deploy our 'cool_app' project from our local box to remote server
 
-``` ruby
 server = Box.new('cool_app.com')             # it will use id_rsa, or You can add {user: 'me', password: 'secret'}
 me = '~'.to_dir                              # handy shortcut for local FS
 
 deploy_dir = server['apps/cool_app']
 projects = me['projects']
-```
 
 # Working with dirs, copying dir from any source to any destination (local/remote/custom_storage_type)
 
-``` ruby
 projects['cool_app'].copy_to deploy_dir
-```
 
 # Working with files
 
-``` ruby
 dbc = deploy_dir.file('config/database.yml') # <= the 'config' dir not exist yet
 dbc.write("user: root\npassword: secret")    # <= now the 'database.yml' and parent 'config' has been created
 dbc.content =~ /database/                    # => false, we forgot to add the database
@@ -74,15 +65,19 @@ projects['cool_app/config/database.yml'].    # or just overwrite it with our loc
 There are also streaming support (read/write/append) with &block, please go to specs for details
 
 # Checks
+
+``` ruby
 deploy_dir['config'].exist?                  # => true
 deploy_dir.dir('config').exist?              # => true
 deploy_dir.file('config').exist?             # => false
 
 deploy_dir['config'].dir?                    # => true
 deploy_dir['config'].file?                   # => false
-
+```
 
 # Navigation
+
+``` ruby
 config = deploy_dir['config']
 config.parent                                # => </apps/cool_app>
 config['../..']                              # => </>
@@ -115,9 +110,9 @@ 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).
 
-Copyright (c) Alexey Petrushin http://petrush.in, released under the MIT license.
+## License
 
-## Please let me know about bugs and Your proposals, there's the 'Issues' tab at the top, feel free to submit.
+Copyright (c) Alexey Petrushin http://petrush.in, released under the MIT license.
 
 [vos]: http://github.com/alexeypetrushin/vos
 [cluster_management]: http://github.com/alexeypetrushin/cluster_management

data/spec/entry_spec.rb

@@ -11,6 +11,11 @@ describe 'Entry' do
     @path.name.should == 'c'
   end
 
+  it "string integration" do
+    '/'.to_entry.path.should == '/'
+    'a'.to_entry.path.should == "./a"
+  end
+
   it 'tmp' do
     tmp = test_fs.tmp
     tmp.should be_dir

data/spec/file_spec.rb

@@ -100,6 +100,11 @@ describe 'File' do
       file.should_receive(:write).with('something', append: true)
       file.append 'something'
     end
+
+    it 'should correctly display errors (from error)' do
+      -> {test_fs['test'].write{|writer| raise 'some error'}}.should raise_error(/some error/)
+      -> {test_fs['test'].write!{|writer| raise 'some error'}}.should raise_error(/some error/)
+    end
   end
 
   it 'update' do

data/spec/universal_entry_spec.rb

@@ -31,6 +31,10 @@ describe 'UniversalEntry' do
       @path.should be_file
       @path.destroy
       @path.should_not exist
+
+      @path.file.create
+      @path.destroy!
+      @path.file.should_not exist
     end
 
     it "shouldn't raise if file not exist" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vfs
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-10 00:00:00.000000000Z
+date: 2011-08-20 00:00:00.000000000Z
 dependencies: []
 description: 
 email: