s3cp 0.1.8 → 0.1.9

data/History.txt

@@ -1,4 +1,8 @@
-=== 0.1.9 / (Pending)
+=== 0.2.0 / (Pending)
+
+=== 0.1.9 / (2012-01-23)
+
+* Added:  s3ls now accepts --max-keys and --delimiter parameters.
 
 === 0.1.8 / (2011-12-29)
 

data/lib/s3cp/s3ls.rb

@@ -32,6 +32,14 @@ op = OptionParser.new do |opts|
     options[:rows_per_page] = rows.to_i
   end
 
+  opts.on("--max-keys KEYS", "Maximum number of keys to display") do |keys|
+    options[:max_keys] = keys.to_i
+  end
+
+  opts.on("--delimiter CHAR", "Display keys starting with given path prefix and up to delimiter character") do |delimiter|
+    options[:delimiter] = delimiter
+  end
+
   opts.on_tail("-h", "--help", "Show this message") do
     puts op
     exit
@@ -62,11 +70,22 @@ end
 @s3 = S3CP.connect()
 
 rows = 0
-@s3.interface.incrementally_list_bucket(@bucket, :prefix => @key) do |page|
-  page[:contents].each do |entry|
-    key = "s3://#{@bucket}/#{entry[:key]}"
-    last_modified = DateTime.parse(entry[:last_modified])
+
+s3_options = Hash.new
+s3_options[:prefix] = @key
+s3_options["max-keys"] = options[:max_keys] if options[:max_keys]
+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
+  end
+  entries.each do |entry|
+    key = "s3://#{@bucket}/#{options[:delimiter] ? entry : entry[:key]}"
     if options[:long_format]
+      last_modified = DateTime.parse(entry[:last_modified])
       puts "#{last_modified.strftime(options[:date_format])} #{key}"
     else
       puts key

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 1
-  - 8
-  version: 0.1.8
+  - 9
+  version: 0.1.9
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-29 00:00:00 Z
+date: 2012-01-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +31,10 @@ dependencies:
         - 6
         version: "0.6"
   version_requirements: *id001
-  prerelease: false
   name: extensions
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -45,10 +47,10 @@ dependencies:
         - 1
         version: 1.5.1
   version_requirements: *id002
-  prerelease: false
   name: highline
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,10 +63,10 @@ dependencies:
         - 0
         version: 3.0.0
   version_requirements: *id003
-  prerelease: false
   name: aboisvert_aws
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -77,10 +79,10 @@ dependencies:
         - 0
         version: 1.3.0
   version_requirements: *id004
-  prerelease: false
   name: right_http_connection
-  type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -93,10 +95,10 @@ dependencies:
         - 0
         version: 2.5.0
   version_requirements: *id005
-  prerelease: false
   name: rspec
-  type: :development
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -109,9 +111,7 @@ dependencies:
         - 7
         version: 0.8.7
   version_requirements: *id006
-  prerelease: false
   name: rake
-  type: :development
 description: 
 email: 
 - alex.boisvert@gmail.com
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Amazon S3 tools to, e.g., list, copy, delete S3 files