filecluster 0.4.1 → 0.4.2

data/lib/fc/item.rb

@@ -99,7 +99,13 @@ module FC
             item_storage.status = 'ready'
             item_storage.save
             reload
-            File.delete(src) if remove_local && !src.instance_of?(FC::Storage) && File.exists?(src)
+            if remove_local && !src.instance_of?(FC::Storage) && File.exists?(src)
+              if File.directory?
+                Dir.delete(src)
+              else
+                File.delete(src)
+              end
+            end
           end
         end
       end

data/lib/fc/storage.rb

@@ -67,14 +67,14 @@ module FC
       dst_path = "#{self.path}#{file_name}"
 
       cmd = "rm -rf #{dst_path.shellescape}; mkdir -p #{File.dirname(dst_path).shellescape}"
-      cmd = self.class.curr_host == host ? cmd : "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"#{cmd}\""
+      cmd = self.class.curr_host == host ? cmd : "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"#{cmd}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
       op = try_move && self.class.curr_host == host && File.stat(local_path).dev == File.stat(File.dirname(dst_path)).dev ? 'mv' : 'cp -r'
       cmd = self.class.curr_host == host ?
         "#{op} #{local_path.shellescape} #{dst_path.shellescape}" :
-        "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
+        "scp -r -q -oBatchMode=yes -oStrictHostKeyChecking=no #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -88,7 +88,7 @@ module FC
       
       cmd = self.class.curr_host == host ? 
         "cp -r #{src_path.shellescape} #{local_path.shellescape}" : 
-        "scp -r -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
+        "scp -r -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -98,13 +98,13 @@ module FC
       dst_path = "#{self.path}#{file_name}"
       cmd = self.class.curr_host == host ? 
         "rm -rf #{dst_path.shellescape}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"rm -rf #{dst_path.shellescape}\""
+        "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"rm -rf #{dst_path.shellescape}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
       cmd = self.class.curr_host == host ? 
         "ls -la #{dst_path.shellescape}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"ls -la #{dst_path.shellescape}\""
+        "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"ls -la #{dst_path.shellescape}\""
       r = `#{cmd} 2>/dev/null`
       raise "Path #{dst_path} not deleted" unless r.empty?
     end
@@ -115,7 +115,7 @@ module FC
       
       cmd = self.class.curr_host == host ? 
         "du -sb #{dst_path.shellescape}" : 
-        "ssh -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"du -sb #{dst_path.shellescape}\""
+        "ssh -q -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"du -sb #{dst_path.shellescape}\""
       r = ignore_errors ? `#{cmd} 2>/dev/null` : `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       r.to_i
@@ -126,7 +126,7 @@ module FC
       dst_path = "#{self.path}#{file_name}"
       cmd = self.class.curr_host == host ?
           "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\""
+          "ssh -q -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.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -181,7 +181,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 635343696830163722
+      hash: 94678285960030617
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 635343696830163722
+      hash: 94678285960030617
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24