s3cp 0.1.10 → 0.1.11

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.1.11 / (Pending)
+=== 0.1.12 / (Pending)
+
+=== 0.1.11 / (2012-02-03)
+
+* Added:  s3cp --no-overwrite option to prevent overwriting existing files.
 
 === 0.1.10 / (2012-01-24)
 

data/lib/s3cp/s3cp.rb

@@ -12,6 +12,7 @@ require 's3cp/utils'
 options = {}
 options[:verbose] = $stdout.isatty ? true : false
 options[:headers] = []
+options[:overwrite] = true
 
 op = OptionParser.new do |opts|
   opts.banner = <<-BANNER
@@ -40,6 +41,10 @@ op = OptionParser.new do |opts|
     options[:recursive] = true
   end
 
+  opts.on("--no-overwrite", "Does not overwrite existing files") do
+    options[:overwrite] = false
+  end
+
   opts.separator ""
 
   opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
@@ -170,6 +175,12 @@ def s3_to_local(bucket_from, key_from, dest)
   end
 end
 
+def s3_exist?(bucket, key)
+  metadata = @s3.interface.head(bucket, key)
+  puts "exist? #{bucket} #{key} => #{metadata != nil}"
+  (metadata != nil)
+end
+
 def copy(from, to, options)
   bucket_from, key_from = S3CP.bucket_and_key(from)
   bucket_to, key_to = S3CP.bucket_and_key(to)
@@ -187,10 +198,10 @@ def copy(from, to, options)
       end
       keys.each do |key|
         dest = no_slash(key_to) + '/' + relative(key_from, key)
-        s3_to_s3(bucket_from, key, bucket_to, dest)
+        s3_to_s3(bucket_from, key, bucket_to, dest) unless !options[:overwrite] && s3_exist?(bucket_to, dest)
       end
     else
-      s3_to_s3(bucket_from, key_from, bucket_to, key_to)
+      s3_to_s3(bucket_from, key_from, bucket_to, key_to) unless !options[:overwrite] && s3_exist?(bucket_to, key_to)
     end
   when :local_to_s3
     if options[:recursive]
@@ -198,10 +209,10 @@ def copy(from, to, options)
       files.each do |f|
         f = File.expand_path(f)
         key = no_slash(key_to) + '/' + relative(from, f)
-        local_to_s3(bucket_to, key, f)
+        local_to_s3(bucket_to, key, f) unless !options[:overwrite] && s3_exist?(bucket_to, key)
       end
     else
-      local_to_s3(bucket_to, key_to, File.expand_path(from))
+      local_to_s3(bucket_to, key_to, File.expand_path(from)) unless !options[:overwrite] && s3_exist?(bucket_to, key_to)
     end
   when :s3_to_local
     if options[:recursive]
@@ -215,12 +226,12 @@ def copy(from, to, options)
         dir = File.dirname(dest)
         FileUtils.mkdir_p dir unless File.exist? dir
         fail "Destination path is not a directory: #{dir}" unless File.directory?(dir)
-        s3_to_local(bucket_from, key, dest)
+        s3_to_local(bucket_from, key, dest) unless !options[:overwrite] && File.exist?(dest)
       end
     else
       dest = File.expand_path(to)
       dest = File.join(dest, File.basename(key_from)) if File.directory?(dest)
-      s3_to_local(bucket_from, key_from, dest)
+      s3_to_local(bucket_from, key_from, dest) unless !options[:overwrite] && File.exist?(dest)
     end
   when :local_to_local
     if options[:recursive]

data/lib/s3cp/version.rb

@@ -1,4 +1,4 @@
 
 module S3CP
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-24 00:00:00 Z
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false