filecluster 0.3.5 → 0.3.6

data/.gitignore

@@ -1,6 +1,7 @@
 *.gem
 *.rbc
 .bundle
+.idea
 .config
 .yardoc
 Gemfile.lock

data/lib/fc/storage.rb

@@ -112,8 +112,8 @@ module FC
     def md5_sum(file_name)
       dst_path = "#{self.path}#{file_name}"
       cmd = self.class.curr_host == host ?
-          "find #{dst_path} -type f -exec md5sum {} \\; | awk '{print $1}' | sort | md5sum" :
-          "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"find #{dst_path} -type f -exec md5sum {} \\; | awk '{print \\$1}' | sort | md5sum\""
+          "find #{dst_path.shellescape} -type f -exec md5sum {} \\; | awk '{print $1}' | sort | md5sum" :
+          "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"find #{dst_path.shellescape} -type f -exec md5sum {} \\; | awk '{print \\$1}' | sort | md5sum\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       r.to_s[0..31]

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/test/functional_test.rb

@@ -6,16 +6,14 @@ class FunctionalTest < Test::Unit::TestCase
       # tmp fake storages dirs
       `rm -rf /tmp/host*-sd*`
       `mkdir -p /tmp/host1-sda/ /tmp/host2-sda/`
-      `rm -rf /tmp/fc_test_dir`
-      `mkdir -p /tmp/fc_test_dir`
       
       # test file to copy
-      @@test_file_path = '/tmp/fc_test_file'
-      `dd if=/dev/urandom of=#{@@test_file_path} bs=100K count=1 2>&1`
-      @@test_dir_path = '/tmp/fc_test_dir'
-      `mkdir -p #{@@test_dir_path}/aaa #{@@test_dir_path}/bbb`
-      `cp #{@@test_file_path} #{@@test_dir_path}/aaa/test1`
-      `cp #{@@test_file_path} #{@@test_dir_path}/bbb/test2`
+      @@test_file_path = '/tmp/fc test_file "~!@#$%^&*()_+|\';'
+      `dd if=/dev/urandom of=#{@@test_file_path.shellescape} bs=100K count=1 2>&1`
+      @@test_dir_path = '/tmp/fc test_dir'
+      `mkdir -p #{@@test_dir_path.shellescape}/aaa #{@@test_dir_path.shellescape}/bbb`
+      `cp #{@@test_file_path.shellescape} #{@@test_dir_path.shellescape}/aaa/test1`
+      `cp #{@@test_file_path.shellescape} #{@@test_dir_path.shellescape}/bbb/test2`
       
       @@storages = []
       @@storages << FC::Storage.new(:name => 'host1-sda', :host => 'host1', :path => '/tmp/host1-sda/', :size_limit => 1000000, :check_time => Time.new.to_i)
@@ -37,9 +35,9 @@ class FunctionalTest < Test::Unit::TestCase
       FC::DB.query("DELETE FROM items")
       FC::DB.query("DELETE FROM policies")
       FC::DB.query("DELETE FROM storages")
-      `rm -rf /tmp/host*-sd*`
-      `rm -rf #{@@test_file_path}`
-      `rm -rf #{@@test_dir_path}`
+      #`rm -rf /tmp/host*-sd*`
+      #`rm -rf #{@@test_file_path.shellescape}`
+      #`rm -rf #{@@test_dir_path.shellescape}`
     end
   end
   
@@ -51,7 +49,7 @@ class FunctionalTest < Test::Unit::TestCase
   should "item create_from_local successful" do
     assert_nothing_raised { @item = FC::Item.create_from_local(@@test_file_path, '/bla/bla/test1', @@policies[0], {:tag => 'test'}) }
     assert_kind_of FC::Item, @item
-    assert_equal `du -sb /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, `du -sb #{@@test_file_path} 2>&1`.to_i
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, `du -sb #{@@test_file_path.shellescape} 2>&1`.to_i
     assert_equal `du -sb /tmp/host1-sda/bla/bla/test1 2>&1`.to_i, @item.size
     assert_equal 'ready', @item.status
     item_storages = @item.get_item_storages
@@ -65,7 +63,7 @@ class FunctionalTest < Test::Unit::TestCase
     assert_nothing_raised { @item = FC::Item.create_from_local(@@test_dir_path, '/bla/bla/test_dir', @@policies[0], {:tag => 'test_dir'}) }
     assert_kind_of FC::Item, @item
     assert_equal true, @item.dir?
-    assert_equal `du -sb /tmp/host1-sda/bla/bla/test_dir 2>&1`.to_i, `du -sb #{@@test_dir_path} 2>&1`.to_i
+    assert_equal `du -sb /tmp/host1-sda/bla/bla/test_dir 2>&1`.to_i, `du -sb #{@@test_dir_path.shellescape} 2>&1`.to_i
     assert_equal `du -sb /tmp/host1-sda/bla/bla/test_dir 2>&1`.to_i, @item.size
     assert_equal 'ready', @item.status
     item_storages = @item.get_item_storages
@@ -108,14 +106,13 @@ class FunctionalTest < Test::Unit::TestCase
     @item = FC::Item.create_from_local(@@test_file_path, 'test5', @@policies[0], {:tag => 'test'})
     item_storage = @item.make_item_storage(@@storages[0], status = 'copy')
     `dd if=/dev/urandom of=#{@@storages[0].path}#{@item.name} bs=100K count=1 2>&1`
-    #`dd if=/dev/urandom of=#{@@storages[0].path}#{@item.name} bs=100K count=1 2>&1`
     assert_raise(RuntimeError) { @item.copy_item_storage(@@storages[0], @@storages[1], item_storage) }
     assert_equal errors_count+1, FC::Error.where.count, "Error not saved after check md5"
   end
   
   should "item create_from_local inplace" do
-    tmp_file_path = "/tmp/host2-sda/inplace_test"
-    `cp #{@@test_file_path} #{tmp_file_path}`
-    assert_nothing_raised { @item = FC::Item.create_from_local(tmp_file_path, 'inplace_test', @@policies[0]) }
+    tmp_file_path = "/tmp/host2-sda/inplace test"
+    `cp #{@@test_file_path.shellescape} #{tmp_file_path.shellescape}`
+    assert_nothing_raised { @item = FC::Item.create_from_local(tmp_file_path, 'inplace test', @@policies[0]) }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -134,6 +134,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .idea/dataSources.xml
 - Gemfile
 - LICENSE
 - README.md
@@ -193,7 +194,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3774757635760642720
+      hash: 1955679762041563204
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +203,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3774757635760642720
+      hash: 1955679762041563204
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24