s3cp 0.1.9 → 0.1.10

data/History.txt

@@ -1,4 +1,10 @@
-=== 0.2.0 / (Pending)
+=== 0.1.11 / (Pending)
+
+=== 0.1.10 / (2012-01-24)
+
+* Fixed: --max-keys now works correctly with --delimiter
+* Fixed: do not display any keys if there are no common-prefix
+         delimiter-matching keys
 
 === 0.1.9 / (2012-01-23)
 

data/lib/s3cp/s3ls.rb

@@ -69,18 +69,19 @@ end
 
 @s3 = S3CP.connect()
 
+keys = 0
 rows = 0
 
 s3_options = Hash.new
 s3_options[:prefix] = @key
-s3_options["max-keys"] = options[:max_keys] if options[:max_keys]
+s3_options["max-keys"] = options[:max_keys] if options[:max_keys] && !options[:delimiter]
 s3_options[:delimiter] = options[:delimiter] if options[:delimiter]
 
 @s3.interface.incrementally_list_bucket(@bucket, s3_options) do |page|
   entries = page[:contents]
   if options[:delimiter]
     entries = page[:common_prefixes]
-    entries << page[:contents][0][:key] if page[:contents].length > 0
+    entries << page[:contents][0][:key] if page[:contents].length > 0 && entries.length > 0
   end
   entries.each do |entry|
     key = "s3://#{@bucket}/#{options[:delimiter] ? entry : entry[:key]}"
@@ -91,6 +92,10 @@ s3_options[:delimiter] = options[:delimiter] if options[:delimiter]
       puts key
     end
     rows += 1
+    keys += 1
+    if options[:max_keys] && keys >= options[:max_keys]
+      exit
+    end
     if options[:rows_per_page] && (rows % options[:rows_per_page] == 0)
       begin
         print "Continue? (Y/n) "

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 1
-  - 9
-  version: 0.1.9
+  - 10
+  version: 0.1.10
 platform: ruby
 authors: 
 - Alex Boisvert