filecluster 0.2.8 → 0.2.9

data/lib/fc/storage.rb

@@ -42,13 +42,13 @@ 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 -oBatchMode=yes -oStrictHostKeyChecking=no #{self.host} \"#{cmd}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
       
       cmd = self.class.curr_host == host ? 
         "cp -r #{local_path.shellescape} #{dst_path.shellescape}" : 
-        "scp -rB #{local_path.shellescape} #{self.host}:#{dst_path.shellescape}"
+        "scp -rB #{local_path.shellescape} #{self.host}:\"#{dst_path.shellescape}\""
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -62,7 +62,7 @@ module FC
       
       cmd = self.class.curr_host == host ? 
         "cp -r #{src_path.shellescape} #{local_path.shellescape}" : 
-        "scp -rB #{self.host}:#{src_path.shellescape} #{local_path.shellescape}"
+        "scp -rB #{self.host}:\"#{src_path.shellescape}\" #{local_path.shellescape}"
       r = `#{cmd} 2>&1`
       raise r if $?.exitstatus != 0
     end
@@ -72,13 +72,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 -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 -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
@@ -89,7 +89,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 -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

data/lib/fc/version.rb

@@ -1,3 +1,3 @@
 module FC
-  VERSION = "0.2.8"
+  VERSION = "0.2.9"
 end

data/lib/manage/storages.rb

@@ -236,4 +236,22 @@ def make_storages_sync(storage, make_delete, silent = false)
   count = `find #{storage.path.shellescape} -empty -type d`.split("\n").count
   `find #{storage.path.shellescape} -empty -type d -delete` if make_delete
   puts "Deleted #{count} empty folders" unless silent
+  
+  if (ARGV[3])
+    File.open(ARGV[3], 'w') do |file|
+      delete_files.each do |f|
+        file.puts storage.path+f
+      end
+    end
+    puts "Save deleted files to #{ARGV[3]}" unless silent
+  end
+  
+  if (ARGV[4])
+    File.open(ARGV[4], 'w') do |file|
+      db_items.values.each do |item|
+        file.puts item[1] if !item[0] && item[1]
+      end
+    end
+    puts "Save deleted items_storages to #{ARGV[4]}" unless silent
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecluster
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rb-readline
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2335959869069383909
+      hash: -3823121111064236338
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2335959869069383909
+      hash: -3823121111064236338
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24