s3cp 1.1.13 → 1.1.14

data/History.txt

@@ -1,3 +1,16 @@
+=== 1.1.14 (2013-01-27)
+
+* Changed: s3cp now adds source file basename to destination path if destination
+           path ends with '/'.
+
+           e.g.  s3cp s3://bucket/path/to/file.ext s3://bucket/some/other/path/
+                 will copy the file to s3://bucket/some/other/path/file.ext
+
+* Changed: Speed-up s3ls -l (long-listing format with date + size). Performance
+           has regressed since migrating to AWS SDK (from right-aws) since
+           high-level AWS SDK API doesn't support memoization of S3 objects --
+           back to using low-level API.
+
 === 1.1.13 (2013-01-27)
 
 * Added:   s3stat --acl option to display associated access-control list XML document.

data/lib/s3cp/s3cp.rb

@@ -462,6 +462,7 @@ def copy(from, to, options)
         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)
     end
   when :local_to_s3
@@ -477,6 +478,7 @@ def copy(from, to, options)
         end
       end
     else
+      key_to += File.basename(key_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)
     end
   when :s3_to_local

data/lib/s3cp/s3ls.rb

@@ -88,7 +88,7 @@ end
 
 S3CP.load_config()
 
-@s3 = S3CP.connect().buckets[@bucket]
+@s3 = S3CP.connect()
 
 keys = 0
 rows = 0
@@ -124,15 +124,27 @@ begin
   end
 
   if options[:delimiter]
-    @s3.objects.with_prefix(@key).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
+    @s3.buckets[@bucket].objects.with_prefix(@key).as_tree(:delimier => options[:delimiter], :append => false).children.each do |entry|
       break if display.call(entry)
     end
   else
+    Struct.new("S3Entry", :key, :last_modified, :content_length)
+
     s3_options = Hash.new
     s3_options[:limit] = options[:max_keys] if options[:max_keys]
-    @s3.objects.with_prefix(@key).each(s3_options) do |entry|
-      break if display.call(entry)
-    end
+
+    stop = false
+
+    begin
+      response = @s3.client.list_objects(:bucket_name => @bucket, :prefix => @key)
+      response[:contents].each do |object|
+        entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i)
+        stop = display.call(entry)
+        break if stop
+      end
+      break if stop
+      s3_options.merge!(:marker => response[:contents].last[:key])
+    end while response[:truncated]
   end
 rescue Errno::EPIPE
   # ignore

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 1
-  - 13
-  version: 1.1.13
+  - 14
+  version: 1.1.14
 platform: ruby
 authors: 
 - Alex Boisvert