filecluster 0.3.4 → 0.3.5

data/lib/fc/item.rb

@@ -90,7 +90,7 @@ module FC
         rescue Exception => e
           FC::Error.raise "After copy error: #{e.message}", :item_id => id, :item_storage_id => item_storage.id
         else
-          if md5_on_storage != md5
+          if md5 && md5_on_storage != md5
             item_storage.status = 'error'
             item_storage.save
             FC::Error.raise "Check md5 after copy error", :item_id => id, :item_storage_id => item_storage.id

data/lib/fc/storage.rb

@@ -111,8 +111,9 @@ module FC
     # return object md5_sum on storage
     def md5_sum(file_name)
       dst_path = "#{self.path}#{file_name}"
-      cmd = "find #{dst_path} -type f -exec md5sum {} \\; | awk '{print $1}' | sort | md5sum"
-      cmd = "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"#{cmd}\"" if self.class.curr_host != host
+      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\""
       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.4"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-25 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -193,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1977585421026350925
+      hash: 3774757635760642720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1977585421026350925
+      hash: 3774757635760642720
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24