s3cp 1.1.15 → 1.1.16

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.16 (2013-01-31)
+
+* Fixed:    s3ls paging (with > 1000 keys) was broken (bug introduced in s3cp 1.1.14)
+
 === 1.1.15 (2013-01-29)
 
 * Fixed:    s3ls would raise undefined method '[]' for nil:NilClass if given

data/lib/s3cp/s3ls.rb

@@ -114,6 +114,7 @@ begin
     rows += 1
     keys += 1
     response = ''
+
     if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
       begin
         print "Continue? (Y/n) "
@@ -131,12 +132,14 @@ begin
     Struct.new("S3Entry", :key, :last_modified, :content_length)
 
     s3_options = Hash.new
+    s3_options[:bucket_name] = @bucket
+    s3_options[:prefix] = @key
     s3_options[:limit] = options[:max_keys] if options[:max_keys]
 
     stop = false
 
     begin
-      response = @s3.client.list_objects(:bucket_name => @bucket, :prefix => @key)
+      response = @s3.client.list_objects(s3_options)
       response[:contents].each do |object|
         entry = Struct::S3Entry.new(object[:key], object[:last_modified], object[:size].to_i)
         stop = display.call(entry)

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 51
   prerelease: 
   segments: 
   - 1
   - 1
-  - 15
-  version: 1.1.15
+  - 16
+  version: 1.1.16
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-29 00:00:00 Z
+date: 2013-01-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement