s3backup 0.6.3 → 0.6.4

data/lib/s3backup/manager.rb

@@ -6,7 +6,19 @@ require 's3backup/tree_info'
 require 's3backup/crypt'
 module S3backup
   class Manager
-    DEFAULT_BUF_READ_SIZE=1024*1024*128
+    DEFAULT_BUF_READ_SIZE=1024*1024*64
+    def shell_name(str)
+      str.gsub!(/[!"$&'()*,:;<=>?\[\]^`{|}\s]/, '\\\\\&')
+      a=[]
+      str.each_byte{|i| 
+        if i < 0x80 
+          a.push(sprintf("%c",i)) 
+        else 
+          a.push("'"+sprintf("%c",i) + "'") 
+        end
+      }
+      return a.join;
+    end
     def initialize(target,config)
       @target = target
       set_config(config)
@@ -39,8 +51,9 @@ module S3backup
         sub_dir.push(file) if File.directory?(dir+"/"+file)
       end
       exclude = ""
-      exclude = exclude + " --exclude=" + sub_dir.map{|d| d.gsub(' ','\ ')}.join("  --exclude=") if sub_dir.length != 0
-      cmd = "(cd #{File.dirname(dir).gsub(' ','\ ')};tar -czvf #{path.gsub(' ','\ ')} #{exclude} #{File.basename(dir).gsub(' ','\ ')} > /dev/null 2>&1)"
+      exclude = exclude + " --exclude=" + sub_dir.map{|d| shell_name(d)}.join("  --exclude=") if sub_dir.length != 0
+      cmd = "(cd #{shell_name(File.dirname(dir))};tar -czvf #{shell_name(path)} #{exclude} #{shell_name(File.basename(dir))}" + 
+                                 " > /dev/null 2>&1)"
       S3log.debug(cmd)
       system(cmd) 
       unless $?.success?
@@ -48,7 +61,7 @@ module S3backup
       end
     end
     def from_tgz(path,dir)
-      cmd = "tar -xzvf #{path.gsub(' ','\ ')} -C #{dir.gsub(' ','\ ')} > /dev/null 2>&1"
+      cmd = "tar -xzvf #{shell_name(path)} -C #{shell_name(dir)} > /dev/null 2>&1"
       S3log.debug(cmd)
       system(cmd) 
       unless $?.success?

data/lib/s3backup/s3wrapper.rb

@@ -3,6 +3,7 @@ require 'aws/s3'
 module S3backup
   class S3Wrapper
     attr_reader :bucket
+    MAX_TRY_COUNT = 5
     def initialize(config,create_flg)
       @bucket= nil
       @s3objects =nil
@@ -54,7 +55,19 @@ module S3backup
     def post(key,val)
       key_name = CGI.escape(key)
       S3log.info("S3Object.store(#{key_name})")
-      AWS::S3::S3Object.store(key_name,val,@bucket_name)
+      count = 0;
+      while count < MAX_TRY_COUNT do
+        begin
+          AWS::S3::S3Object.store(key_name,val,@bucket_name)
+          break;
+        rescue => ex
+          count+=1;
+          AWS::S3::Base.establish_connection!(args)
+        end
+      end
+      if count >= MAX_TRY_COUNT
+        raise "post error occurd path #{key_name} \n"
+      end
     end
     def set_config(config)
       err_msg = "" 

data/lib/s3backup.rb

@@ -2,5 +2,5 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module S3backup
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: s3backup
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Takeshi Morita
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-15 00:00:00 +09:00
+date: 2010-01-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.6.2
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -30,7 +50,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.5.0
     version: 
 description: S3Backup is a backup tool to local directory to Amazon S3.
 email: