s3cp 1.1.26 → 1.1.27

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.27 (2013-04-04)
+
+* Fixed:  Fixed [NoMethodError] undefined method 'exist?' in s3cp when using
+          --no-overwrite option (residual bug from RightAWS -> AWS SDK migration).
+          s3cp now prints message on STDERR when skipping files that already exists.
+
 === 1.1.26 (2013-03-21)
 
 * Fixed:  Prevent crash if $terminal.output_rows can't be determined in s3ls/s3tree.

data/lib/s3cp/s3cp.rb

@@ -438,7 +438,7 @@ def s3_to_local(bucket_from, key_from, dest, options = {})
 end
 
 def s3_exist?(bucket, key)
-  @s3.buckets[bucket].objects[key].exist?
+  @s3.buckets[bucket].objects[key].exists?
 end
 
 def s3_checksum(bucket, key)
@@ -486,12 +486,20 @@ def copy(from, to, options)
       keys.each do |key|
         if match(key)
           dest = key_path key_to, relative(key_from, key)
-          s3_to_s3(bucket_from, key, bucket_to, dest, options) unless !options[:overwrite] && s3_exist?(bucket_to, dest)
+          if !options[:overwrite] && s3_exist?(bucket_to, dest)
+            STDERR.puts "Skipping s3://#{bucket_to}/#{dest} - already exists."
+          else
+            s3_to_s3(bucket_from, key, bucket_to, dest, options)
+          end
         end
       end
     else
       key_to += File.basename(key_from) if key_to[-1..-1] == "/"
-      s3_to_s3(bucket_from, key_from, bucket_to, key_to, options) unless !options[:overwrite] && s3_exist?(bucket_to, key_to)
+      if !options[:overwrite] && s3_exist?(bucket_to, key_to)
+        STDERR.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
+      else
+        s3_to_s3(bucket_from, key_from, bucket_to, key_to, options)
+      end
     end
   when :local_to_s3
     if options[:recursive]
@@ -502,12 +510,20 @@ def copy(from, to, options)
           #puts "no_slash(key_to) #{no_slash(key_to)}"
           #puts "relative(from, f) #{relative(from, f)}"
           key = key_path key_to, relative(from, f)
-          local_to_s3(bucket_to, key, File.expand_path(f), options) unless !options[:overwrite] && s3_exist?(bucket_to, key)
+          if !options[:overwrite] && s3_exist?(bucket_to, key)
+            STDERR.puts "Skipping s3://#{bucket_to}/#{key} - already exists."
+          else
+            local_to_s3(bucket_to, key, File.expand_path(f), options)
+          end
         end
       end
     else
       key_to += File.basename(from) if key_to[-1..-1] == "/"
-      local_to_s3(bucket_to, key_to, File.expand_path(from), options) unless !options[:overwrite] && s3_exist?(bucket_to, key_to)
+      if !options[:overwrite] && s3_exist?(bucket_to, key_to)
+        STDERR.puts "Skipping s3://#{bucket_to}/#{key_to} - already exists."
+      else
+        local_to_s3(bucket_to, key_to, File.expand_path(from), options)
+      end
     end
   when :s3_to_local
     if options[:recursive]
@@ -522,13 +538,21 @@ 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, options) unless !options[:overwrite] && File.exist?(dest)
+          if !options[:overwrite] && File.exist?(dest)
+            STDERR.puts "Skipping #{dest} - already exists."
+          else
+            s3_to_local(bucket_from, key, dest, options)
+          end
         end
       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, options) unless !options[:overwrite] && File.exist?(dest)
+      if !options[:overwrite] && File.exist?(dest)
+        STDERR.puts "Skipping #{dest} - already exists."
+      else
+        s3_to_local(bucket_from, key_from, dest, options)
+      end
     end
   when :local_to_local
     if options[:include_regex].any? || options[:exclude_regex].any?

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.26"
+  VERSION = "1.1.27"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 1
   - 1
-  - 26
-  version: 1.1.26
+  - 27
+  version: 1.1.27
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-21 00:00:00 Z
+date: 2013-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement