vfs 0.3.15 → 0.4.0

data/spec/entry_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'Entry' do
-  with_test_fs
+  with_test_dir
 
   before do
-    @path = test_fs['a/b/c']
+    @path = test_dir['a/b/c']
   end
 
   it "name" do
@@ -17,12 +17,12 @@ describe 'Entry' do
   end
 
   it 'tmp' do
-    tmp = test_fs.tmp
+    tmp = test_dir.tmp
     tmp.should be_dir
     tmp.destroy
 
     tmp = nil
-    test_fs.tmp do |path|
+    test_dir.tmp do |path|
       tmp = path
       tmp.should be_dir
     end
@@ -30,11 +30,11 @@ describe 'Entry' do
   end
 
   it 'should respond to local?' do
-    test_fs.should respond_to(:local?)
+    test_dir.should respond_to(:local?)
   end
 
   it 'created_at, updated_at, size' do
-    file = test_fs.file('file').write 'data'
+    file = test_dir.file('file').write 'data'
     file.created_at.class.should == Time
     file.updated_at.class.should == Time
     file.size.should == 4

data/spec/file_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'File' do
-  with_test_fs
+  with_test_dir
 
   before do
-    @path = test_fs['a/b/c']
+    @path = test_dir['a/b/c']
   end
 
   describe 'existence' do
@@ -13,7 +13,7 @@ describe 'File' do
       @path.dir.create
       @path.should be_dir
       @path.file.should_not exist
-      @path.file.create!
+      @path.file.create
       @path.should be_file
       @path.file.should exist
     end
@@ -38,10 +38,10 @@ describe 'File' do
       data = ""; @path.read{|buff| data << buff}; data.should == 'something'
     end
 
-    it 'content' do
-      @path.write('something')
-      @path.content.should == 'something'
-    end
+    # it 'content' do
+    #   @path.write('something')
+    #   @path.content.should == 'something'
+    # end
   end
 
   describe 'creation' do
@@ -50,14 +50,10 @@ describe 'File' do
 
       file.should_receive(:write).with('', {})
       file.create
-
-      file.should_receive(:write).with('', override: true)
-      file.create!
     end
 
     it 'should be chainable' do
       @path.file.create.should == @path
-      @path.file.create!.should == @path
     end
   end
 
@@ -68,20 +64,17 @@ describe 'File' do
       @path.read.should == 'something'
     end
 
-    it 'should not override existing file, only if :override specified' do
+    it 'should override existing file' do
       @path.write 'something'
       @path.should be_file
-      -> {@path.write 'another'}.should raise_error(Vfs::Error, /exist/)
-
-      @path.write! 'other'
+      @path.write 'other'
       @path.read.should == 'other'
     end
 
-    it 'should override existing dir if :override specified' do
+    it 'should override existing dir' do
       @path.dir.create
       @path.should be_dir
-      -> {@path.write 'another'}.should raise_error(Vfs::Error, /exist/)
-      @path.write! 'another'
+      @path.write 'another'
       @path.read.should == 'another'
     end
 
@@ -89,7 +82,7 @@ describe 'File' do
       @path.write 'something'
       @path.read.should == 'something'
 
-      @path.write! do |writer|
+      @path.write do |writer|
         writer.write 'another'
       end
       @path.read.should == 'another'
@@ -102,8 +95,7 @@ describe 'File' do
     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/)
+      -> {test_dir['test'].write{|writer| raise 'some error'}}.should raise_error(/some error/)
     end
   end
 
@@ -131,33 +123,32 @@ describe 'File' do
       target.read.should == 'something'
       target.should == to
 
-      @from.write! 'another'
-      -> {@from.copy_to to}.should raise_error(Vfs::Error, /exist/)
-      target = @from.copy_to! to
+      # overriding
+      @from.write 'another'
+      target = @from.copy_to to
       target.read.should == 'another'
       target.should == to
     end
 
-    it 'should copy to file (and overwrite if forced)' do
-      check_copy_for test_fs.file('to')
+    it 'should copy to file (and overwrite)' do
+      check_copy_for test_dir.file('to')
     end
 
-    it 'should copy to dir (and overwrite if forced)' do
-      check_copy_for test_fs.dir("to")
+    it 'should copy to dir (and overwrite)' do
+      check_copy_for test_dir.dir("to")
     end
 
-    it 'should copy to UniversalEntry (and overwrite if forced)' do
-      check_copy_for test_fs.entry('to')
+    it 'should copy to UniversalEntry (and overwrite)' do
+      check_copy_for test_dir.entry('to')
     end
 
     it 'should be chainable' do
-      to = test_fs['to']
+      to = test_dir['to']
       @from.copy_to(to).should == to
-      @from.copy_to!(to).should == to
     end
 
     it "should autocreate parent's path if not exist (from error)" do
-      to = test_fs['parent_path/to']
+      to = test_dir['parent_path/to']
       @from.copy_to(to)
       to.read.should == 'something'
     end
@@ -166,27 +157,21 @@ describe 'File' do
   describe 'moving' do
     it 'move_to' do
       from, to = @path.file('from'), @path.file('to')
-      from.should_receive(:copy_to).with(to, {})
-      from.should_receive(:destroy).with({})
+      from.should_receive(:copy_to).with(to)
+      from.should_receive(:destroy).with()
       from.move_to to
-
-      from.should_receive(:move_to).with(to, override: true)
-      from.move_to! to
     end
 
     it 'should be chainable' do
       from, to = @path.file('from').create, @path.file('to')
       from.move_to(to).should == to
-      from.create
-      from.move_to!(to).should == to
     end
   end
 
   describe 'destroying' do
-    it "should raise error if it's trying to destroy a dir (unless force specified)" do
+    it "should not raise error if it's trying to destroy a dir" do
       @path.dir.create
-      -> {@path.file.destroy}.should raise_error(Vfs::Error, /can't destroy Dir/)
-      @path.file.destroy!
+      @path.file.destroy
       @path.entry.should_not exist
     end
 
@@ -196,13 +181,12 @@ describe 'File' do
 
     it 'should be chainable' do
       @path.file.destroy.should == @path
-      @path.file.destroy!.should == @path
     end
   end
 
   describe "extra stuff" do
     it 'render' do
-      template = test_fs / 'letter.erb'
+      template = test_dir / 'letter.erb'
       template.write "Hello dear <%= name %>"
       template.render(name: 'Mary').should == "Hello dear Mary"
     end
@@ -211,7 +195,7 @@ describe 'File' do
       require 'haml'
 
       it 'render using other template engines' do
-        template = test_fs / 'letter.haml'
+        template = test_dir / 'letter.haml'
         template.write "Hello dear \#{name}"
         template.render(name: 'Mary').should =~ /Hello dear Mary/
       end

data/spec/misc_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe 'Miscellaneous' do
+  with_test_dir
+
+  it "File should respond to :to_file, :to_entry" do
+    path = "#{test_dir.path}/file"
+    File.open(path, 'w'){|f| f.write 'something'}
+
+    file = nil
+    begin
+      file = File.open path
+      file.to_file.path.should == file.path
+      file.to_entry.path.should == file.path
+    ensure
+      file.close
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,22 +5,22 @@ require 'tilt'
 require 'vfs'
 
 rspec do
-  def self.with_test_fs
+  def self.with_test_dir
     before do
-      @test_fs = "/tmp/test_fs".to_dir
+      @test_dir = "/tmp/test_dir".to_dir
 
-      FileUtils.rm_r test_fs.path if File.exist? test_fs.path
-      FileUtils.mkdir_p test_fs.path
+      FileUtils.rm_r test_dir.path if File.exist? test_dir.path
+      FileUtils.mkdir_p test_dir.path
     end
 
     after do
-      FileUtils.rm_r test_fs.path if File.exist? test_fs.path
-      @test_fs = nil
+      FileUtils.rm_r test_dir.path if File.exist? test_dir.path
+      @test_dir = nil
     end
   end
 
-  def test_fs
-    @test_fs
+  def test_dir
+    @test_dir
   end
 end
 

data/spec/storages/local_spec.rb

@@ -1,24 +1,24 @@
-require 'vfs/storages/local'
-require 'vfs/storages/specification'
+require 'vfs/drivers/local'
+require 'vfs/drivers/specification'
 
-describe Vfs::Storages::Local do
+describe Vfs::Drivers::Local do
   with_tmp_spec_dir
 
   before do
-    @storage = Vfs::Storages::Local.new spec_dir
-    @storage.open
+    @driver = Vfs::Drivers::Local.new root: spec_dir
+    @driver.open
   end
 
   after do
-    @storage.close
+    @driver.close
   end
 
-  it_should_behave_like 'vfs storage basic'
-  it_should_behave_like 'vfs storage attributes basic'
-  it_should_behave_like 'vfs storage files'
-  it_should_behave_like 'vfs storage full attributes for files'
-  it_should_behave_like 'vfs storage dirs'
-  it_should_behave_like 'vfs storage full attributes for dirs'
-  it_should_behave_like 'vfs storage query'
-  it_should_behave_like 'vfs storage tmp dir'
+  it_should_behave_like 'vfs driver basic'
+  it_should_behave_like 'vfs driver attributes basic'
+  it_should_behave_like 'vfs driver files'
+  it_should_behave_like 'vfs driver full attributes for files'
+  it_should_behave_like 'vfs driver dirs'
+  it_should_behave_like 'vfs driver full attributes for dirs'
+  it_should_behave_like 'vfs driver query'
+  it_should_behave_like 'vfs driver tmp dir'
 end

data/spec/universal_entry_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe 'UniversalEntry' do
-  with_test_fs
+  with_test_dir
 
   before do
-    @path = test_fs['a/b/c']
+    @path = test_dir['a/b/c']
   end
 
   describe 'existence' do
@@ -14,7 +14,7 @@ describe 'UniversalEntry' do
       @path.should be_dir
       @path.should exist
 
-      @path.file.create!
+      @path.file.create
       @path.should be_file
       @path.should exist
     end
@@ -24,17 +24,13 @@ describe 'UniversalEntry' do
     it "should destroy both files and dirs" do
       @path.dir.create
       @path.should be_dir
-      @path.destroy
+      @path.entry.destroy
       @path.should_not exist
 
       @path.file.create
       @path.should be_file
-      @path.destroy
+      @path.entry.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
@@ -42,6 +38,32 @@ describe 'UniversalEntry' do
     end
   end
 
-  describe 'copy_to'
+  describe 'copy_to' do
+    before do
+      @from = @path.dir
+      @from.create
+      @from.file('file').write 'something'
+      @from.dir('dir').create.tap do |dir|
+        dir.file('file2').write 'something2'
+      end
+
+      @to = test_dir['to']
+    end
+
+    it "shoud copy dir" do
+      @from.entry.copy_to @to
+      @to['dir/file2'].file?.should be_true
+    end
+
+    it "should copy file" do
+      @from['file'].entry.copy_to @to
+      @to.file.should be_true
+    end
+
+    it "should raise if entry not exist" do
+      -> {@from['non existing'].entry.copy_to @to}.should raise_error(/not exist/)
+    end
+  end
+
   describe 'move_to'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vfs
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-25 00:00:00.000000000Z
+date: 2011-09-08 00:00:00.000000000Z
 dependencies: []
 description: 
 email: 
@@ -19,23 +19,23 @@ extra_rdoc_files: []
 files:
 - Rakefile
 - readme.md
+- lib/vfs/drivers/local.rb
+- lib/vfs/drivers/specification.rb
 - lib/vfs/entries/dir.rb
 - lib/vfs/entries/entry.rb
 - lib/vfs/entries/file.rb
 - lib/vfs/entries/universal_entry.rb
 - lib/vfs/entry_proxy.rb
 - lib/vfs/error.rb
-- lib/vfs/integration/string.rb
+- lib/vfs/integration.rb
 - lib/vfs/path.rb
-- lib/vfs/storages/local.rb
-- lib/vfs/storages/specification.rb
-- lib/vfs/support.rb
 - lib/vfs/vfs.rb
 - lib/vfs.rb
 - spec/container_spec.rb
 - spec/dir_spec.rb
 - spec/entry_spec.rb
 - spec/file_spec.rb
+- spec/misc_spec.rb
 - spec/path_spec.rb
 - spec/spec_helper.rb
 - spec/storages/local_spec/emptygit

data/lib/vfs/integration/string.rb

@@ -1,20 +0,0 @@
-class String
-  def to_entry_on storage = nil
-    path = self
-    storage ||= Vfs.default_storage
-
-    path = "./#{path}" unless path =~ /^[\/\.\~]/
-    Vfs::Dir.new(storage, path)
-  end
-  alias_method :to_entry, :to_entry_on
-
-  def to_file_on storage = nil
-    to_entry_on(storage).file
-  end
-  alias_method :to_file, :to_file_on
-
-  def to_dir_on storage = nil
-    to_entry_on(storage).dir
-  end
-  alias_method :to_dir, :to_dir_on
-end