bc3 0.1.0 → 0.1.1

data/unittest/unittest_bc3_snapshot.rb

@@ -16,7 +16,8 @@ class Test_snapshot < Test::Unit::TestCase
     assert_nothing_raised{ bc3 << BC3::File.new( filename: 'file', filesize: 1 )}
     assert_raise(ArgumentError){ bc3 << 1 }
     
-    assert_equal(2, bc3.each.size)
+    assert_equal(1, bc3.each.size)
+    assert_equal(2, bc3.each(:files, :folders).size)
   end
   def test_hash()
     bc3 = BC3::Snapshot.new('x', $timestamp)
@@ -39,36 +40,36 @@ class Test_snapshot < Test::Unit::TestCase
       }, bc3.to_hash
     )    
   end
-  def test_newh_interface()
+  def test_new_hash_interface()
     #Test no-hash
-    assert_raise(ArgumentError){ BC3::Snapshot.newh('x')}
-    assert_raise(ArgumentError){ BC3::Snapshot.newh('1')}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash('x')}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash('1')}
     #Hash must contain snapshot and content
-    assert_raise(ArgumentError){ BC3::Snapshot.newh({})}
-    assert_raise(ArgumentError){ BC3::Snapshot.newh({snapshot: 'x' })}
-    assert_raise(ArgumentError){ BC3::Snapshot.newh({snapshot: 'x' })}
-    assert_raise(ArgumentError){ BC3::Snapshot.newh({snapshot: 'x', timestamp: $timestamp })}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash({})}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash({snapshot: 'x' })}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash({snapshot: 'x' })}
+    assert_raise(ArgumentError){ BC3::Snapshot.new_hash({snapshot: 'x', timestamp: $timestamp })}
     
-    assert_nothing_raised{ bc3 = BC3::Snapshot.newh({ snapshot: 'x', content: [] })}
+    assert_nothing_raised{ bc3 = BC3::Snapshot.new_hash({ snapshot: 'x', content: [] })}
     #Content must be an array
-    assert_raise(ArgumentError){ bc3 = BC3::Snapshot.newh({ snapshot: 'x', content: :x })}
+    assert_raise(ArgumentError){ bc3 = BC3::Snapshot.new_hash({ snapshot: 'x', content: :x })}
   end
-  def test_newh()
+  def test_new_hash()
     hash = {     snapshot: 'x', timestamp: $timestamp,
       content: [
         filename: 'file1', filesize: 5, timestamp: $timestamp, crc: nil, attributes: BC3::Attrib::Archive,
       ]      
     }
-    assert_equal(hash, BC3::Snapshot.newh( hash ).to_hash)
+    assert_equal(hash, BC3::Snapshot.new_hash( hash ).to_hash)
     
     hash[:content] << { filename: 'file2', filesize: 15, timestamp: $timestamp, crc: nil, attributes: BC3::Attrib::Archive, }
-    assert_equal(hash, BC3::Snapshot.newh( hash ).to_hash)
+    assert_equal(hash, BC3::Snapshot.new_hash( hash ).to_hash)
     
     hash[:content] << { dirname: 'dir1', timestamp: $timestamp, :content => [], attributes: BC3::Attrib::Directory, }
-    assert_equal(hash, BC3::Snapshot.newh( hash ).to_hash)
+    assert_equal(hash, BC3::Snapshot.new_hash( hash ).to_hash)
   end
-  def test_newd()
-    bc3 = BC3::Snapshot.newd( '../examples/folder1' )
+  def test_new_filesystem()
+    bc3 = BC3::Snapshot.new_filesystem( '../examples/folder1' )
     
     #timestamp change
     #~ assert_equal(%{
@@ -84,37 +85,224 @@ class Test_snapshot < Test::Unit::TestCase
     
     assert_equal(1, bc3.each.size)
     assert_equal(1, bc3.each(:files).size)
-    assert_equal(1, bc3.each(:recursive).size)
+    #~ assert_equal(0, bc3.each(:recursive).size)#no files/folders defined
     assert_equal(1, bc3.each(:recursive, :files).size)
+    assert_equal(0, bc3.each(:recursive, :folders).size)
+    assert_equal(1, bc3.each(:recursive, :folders, :files).size)
     
     assert_equal('file1.txt', bc3.each.first.first)
     
   end
-  def test_new_list()
-    pend 'BC3::Snapshot.new_list'
-    bc3 = BC3::Snapshot.new_list( 'dir', %w{
+  def test_new_filelist()
+    #~ pend 'BC3::Snapshot.new_filelist'
+    bc3 = BC3::Snapshot.new_filelist( 'dir', %{
                 file
                 folder/file1
                 folder/subfolder/subfile1
                 folder/subfolder2/
       }
     )
-    
-    assert_equal(2, bc3.each.size)
-    assert_equal(1, bc3.each(:files).size)
-    assert_equal(5, bc3.each(:recursive).size)
-    assert_equal(2, bc3.each(:recursive, :files).size)
-    assert_equal(3, bc3.each(:recursive, :folders).size)
 
     assert_equal( %w{
                 file
-                folder
+                folder/
+                folder/file1
+                folder/subfolder/
+                folder/subfolder/subfile1
+                folder/subfolder2/
+      }, bc3.each(:files, :folders ).keys)
+
+    assert_equal( %w{
+                file
+                folder/
+      }, bc3.each(:rootonly, :files, :folders ).keys)
+      
+    assert_equal( %w{
+                folder/
+                folder/subfolder/
+                folder/subfolder2/
+      }, bc3.each(:folders ).keys)
+      
+    assert_equal( %w{
+                file
                 folder/file1
-                folder/subfolder
                 folder/subfolder/subfile1
-                folder/subfolder2
-      }, bc3.each(:recursive, :files).keys)
+      }, bc3.each(:files ).keys)
+
+
+    assert_equal(3, bc3.each.size)
+    assert_equal(3, bc3.each(:files).size)
+    assert_equal(3, bc3.each(:folders).size)
+    assert_equal(6, bc3.each(:folders, :files).size)
+
+    assert_equal(1, bc3.each(:rootonly, :files).size)
+    assert_equal(1, bc3.each(:rootonly, :folders).size)
+    assert_equal(2, bc3.each(:rootonly, :folders, :files).size)
+  end
+
+  
+  def test_statistic()
+    bc3 = BC3::Snapshot.new_hash( YAML.load(%{
+      :snapshot: x
+      :content: 
+      - :dirname: dir
+        :attributes: 16
+        :content: []
+
+      - :filename: file
+        :filesize: 1
+        :crc: 
+        :attributes: 32
+    }))
+
+    stat = bc3.statistic
+    assert_kind_of(Hash, stat)
+    assert_equal(%w{folders  files}, stat.keys) #no duplicates
+    assert_equal(1, stat['files'])
+    assert_equal(1, stat['folders'])
     
+  end
+  
+  def test_statistic_dup()
+    bc3 = BC3::Snapshot.new_hash( YAML.load(%{
+      :snapshot: x
+      :content: 
+      - :filename: file15
+        :filesize: 1
+        :crc: 15
+        :attributes: 32
+      - :filename: file15b
+        :filesize: 1
+        :crc: 15
+        :attributes: 32
+      - :filename: file16
+        :filesize: 1
+        :crc: 16
+        :attributes: 32
+      - :filename: file0
+        :filesize: 1
+      - :filename: file0b
+        :filesize: 1
+        
+    }))
+
+    stat = bc3.statistic
+    assert_kind_of(Hash, stat)
+    assert_equal(%w{files duplicates_by_crc}, stat.keys) #no folders
+    assert_equal(5, stat['files'])
+    assert_equal(0, stat['folders'])  #even there is no folder, the default of the hash is 0.
+    
+    assert_kind_of(Hash, stat['duplicates_by_crc'])
+    assert_equal(1, stat['duplicates_by_crc'].size)
+    assert_equal(nil, stat['duplicates_by_crc'][16])
+    assert_equal(2, stat['duplicates_by_crc'][15].size)
+    assert_equal({15=>["file15", "file15b"]}, stat['duplicates_by_crc'])
+  end
+  
+  def test_index()
+    #~ pend 'BC3::Snapshot.new_filelist'
+    bc3 = BC3::Snapshot.new_filelist( 'dir', %{
+                file
+                folder/file1
+                folder/subfolder/subfile1
+                folder/subfolder2/
+      } )
+    #extend object
+    class << bc3;      attr_reader :index;    end
+    assert_nil( bc3.index )
+    bc3.build_index
+    assert_kind_of( Hash, bc3.index )
+
+    bc3.reset_index()
+    assert_nil( bc3.index )
+    bc3.build_index
+    assert_kind_of( Hash, bc3.index )
+
+    #test index
+    assert_equal(%w{
+                file
+                folder/
+                folder/file1
+                folder/subfolder/
+                folder/subfolder/subfile1
+                folder/subfolder2/
+      }, bc3.index.keys)
+  end #test_index
+  def test_index_automatic_reset()
+    #~ pend 'BC3::Snapshot.new_filelist'
+    bc3 = BC3::Snapshot.new_filelist( 'dir', %{
+                file
+                folder/file1
+                folder/subfolder/subfile1
+                folder/subfolder2/
+      } )
+    #extend object
+    class << bc3;      attr_reader :index;    end
+    assert_nil( bc3.index )
+    
+    bc3.build_index
+    assert_kind_of( Hash, bc3.index )
+    
+    #Check changes in root
+    folder = bc3 << BC3::Folder.new('folder')
+    assert_nil( bc3.index )
+=begin
+Remark:
+    bc3 << folder = BC3::Folder.new('folder')
+  will not work.
+  The mixin mechanism throws away the given folder and 
+  adds the content to the already existing folder.
+=end
+    
+    bc3.build_index
+    assert_kind_of( Hash, bc3.index )
+
+    #check changes in subdirectories
+    folder << BC3::Folder.new('folder')
+    assert_nil( bc3.index )
+    
+  end    #test_index_automatic_reset
+
+  def test_get()
+    bc3 = BC3::Snapshot.new('x')
+    
+    bc3 << folder = BC3::Folder.new('dir')
+    bc3 << file = BC3::File.new( filename: 'file', filesize: 1 )
+    folder << file2 = BC3::File.new( filename: 'file', filesize: 1 )
+    
+    assert_equal(folder, bc3['dir/'])
+    assert_equal(file, bc3['file'])
+    assert_equal(file2, bc3['dir/file'])
+    
+    assert_not_equal(file2, bc3['file'])
+    assert_not_equal(file, bc3['dir/file'])
+  end
+end #Test_snapshot
+
+=begin
+Tests with File creation
+=end
+class Test_snapshot_IO < Test::Unit::TestCase  
+  TestFiles = %w{test.bcss test.yaml test.yml}
+      
+  def self.startup
+    TestFiles.each{|f| File.delete(f) if File.exist?(f)}
+  end
+  
+  def self.shutdown
+    TestFiles.each{|f| File.delete(f) if File.exist?(f)}
+  end
+  def test_save()
+    bc3 = BC3::Snapshot.new_filesystem( '../examples/folder1' )
+    #~ bc3 = BC3::Snapshot.new('x')
+    assert_nothing_raised{ bc3.save('test.bcss')}
+    assert_nothing_raised{ bc3.save('test.yaml')}
+    assert_nothing_raised{ bc3.save('test.yml')}
+    assert_raise(ArgumentError){ bc3.save('test.txt') }
+
+    assert_equal(File.read('test.yaml'), File.read('test.yml') )
+    assert_equal(File.read('test.yaml'), bc3.to_hash.to_yaml )
+    assert_equal(YAML.load(File.read('test.yaml')), bc3.to_hash )
     
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bc3
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Knut Lickert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +01:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,21 +35,24 @@ dependencies:
 description: |
   Build and analyse Beyond Compare (BC3) Snapshot-Files.
   This gem allows flexible definition of BC3-snapshots and
-  actions like snapshot merge...
+  actions like snapshot merge, snapshot search...
   
   More about Beyond compare at http://www.scootersoftware.com
 
 email: knut@lickert.net
 executables: 
 - bc3_merge.rb
+- bc3_search.rb
 extensions: []
 
 extra_rdoc_files: 
 - BCSS_Binary_Format.txt
 - bin/bc3_merge.rb
+- bin/bc3_search.rb
 files: 
 - BCSS_Binary_Format.txt
 - bin/bc3_merge.rb
+- bin/bc3_search.rb
 - lib/bc3.rb
 - lib/bc3/file.rb
 - lib/bc3/folder.rb
@@ -62,6 +65,7 @@ files:
 - unittest/unittest_bc3_folder.rb
 - unittest/unittest_bc3_snapshot.rb
 - unittest/unittest_bc3_merge.rb
+- unittest/unittest_bc3_search.rb
 - examples/test_combine.rb
 - examples/test_filesystem.rb
 - examples/test_hardcoded.rb
@@ -70,7 +74,7 @@ files:
 - examples/folder1_2011-01-21.bcss
 - examples/folder2_2011-01-21.bcss
 has_rdoc: true
-homepage: http://www.scootersoftware.com/vbulletin/showthread.php?t=7210
+homepage: http://gems.rubypla.net/bc3
 licenses: []
 
 post_install_message: 
@@ -110,6 +114,7 @@ test_files:
 - unittest/unittest_bc3_folder.rb
 - unittest/unittest_bc3_snapshot.rb
 - unittest/unittest_bc3_merge.rb
+- unittest/unittest_bc3_search.rb
 - examples/test_combine.rb
 - examples/test_filesystem.rb
 - examples/test_hardcoded.rb