s3cp 0.1.5 → 0.1.6

data/History.txt

@@ -1,4 +1,10 @@
-=== 0.1.6 / (Pending)
+=== 0.1.7 / (Pending)
+
+=== 0.1.6 / (2011-12-16)
+
+* Changed: s3rm now uses multi-object delete operation for faster deletes
+* Changed: dependency on 'aboisvert-aws' instead of 'right-aws' until
+           it supports multi-object delete.
 
 === 0.1.5 / 2011-10-17
 

data/README.md

@@ -3,10 +3,22 @@ S3CP: Commands-line tools for Amazon S3 file manipulation
 
 Just a few simple command-line utilities to list, copy, view S3 files, e.g.,  `s3cp`, `s3ls`, `s3cat`.
 
+### Installing ###
+
+Make sure you have Rubygems installed on your system then run:
+
+    # gem install s3cp
+
 ### Building ###
 
-    # rake gem
-    # gem install s3cp-0.1.0.gem
+If you want to hack on s3cp and build the gem yourself, you will need Bundler (http://gembundler.com/) installed.  Here is a typical development setup:
+
+    # git clone git@github.com:aboisvert/s3cp.git
+    # cd s3cp
+    (... hack on s3cp ...)
+    # bundle install
+    # bundle exec rake gem
+    # gem install s3cp-*.gem
 
 ### Examples ###
 
@@ -58,7 +70,7 @@ Commands are also TTY-aware;  when run in an interactive shell, their behavior w
         --debug                      Debug mode
     -h, --help                       Show this message
 
-.
+---
 
     $ s3ls
     s3ls [path]
@@ -69,7 +81,7 @@ Commands are also TTY-aware;  when run in an interactive shell, their behavior w
         --rows ROWS                  Rows per page
     -h, --help                       Show this message
 
-.
+---
 
     $ s3cat
     s3cat [path]
@@ -78,7 +90,7 @@ Commands are also TTY-aware;  when run in an interactive shell, their behavior w
         --tty                        TTY mode
     -h, --help                       Show this message
 
-.
+---
 
     $ s3mod
     s3mod [path] [permission]
@@ -92,9 +104,9 @@ Commands are also TTY-aware;  when run in an interactive shell, their behavior w
 
     -h, --help                       Show this message
 
-.
+---
 
-    $ ./_s3rm
+    $ s3rm
     s3rm [path]
 
     -r, --recursive                  Delete S3 keys matching provided prefix.

data/lib/s3cp/s3rm.rb

@@ -91,7 +91,7 @@ exclude_regex = options[:exclude_regex] ? Regexp.new(options[:exclude_regex]) :
 @s3 = S3CP.connect()
 
 if options[:recursive]
-  total_matching = 0
+  matching_keys = []
 
   @s3.interface.incrementally_list_bucket(@bucket, :prefix => @key) do |page|
     page[:contents].each do |entry|
@@ -104,17 +104,27 @@ if options[:recursive]
       puts "#{key} => #{matching}" if options[:verbose]
 
       if matching
-        total_matching += 1
+        matching_keys << entry[:key]
         puts key unless options[:silent] || options[:verbose]
-        @s3.interface.delete(@bucket, entry[:key]) unless options[:test]
       end
     end
   end
 
-  if options[:fail_if_not_exist] && total_matching == 0
+  if options[:fail_if_not_exist] && matching_keys.length == 0
     puts "No matching keys."
     exit(1)
   end
+
+  errors = []
+  errors = @s3.interface.delete_multiple(@bucket, matching_keys) unless options[:test]
+
+  if errors.length > 0
+    puts "Errors during deletion:"
+    errors.each do |error|
+      puts "#{error[:key]} #{error[:code]} #{error[:message]}"
+    end
+    exit(1)
+  end
 else
   # delete a single file; check if it exists
   if options[:fail_if_not_exist] && @s3.interface.head(@bucket, @key) == nil

data/lib/s3cp/version.rb

@@ -1,4 +1,4 @@
 
 module S3CP
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 Z
+date: 2011-12-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -28,12 +28,12 @@ dependencies:
         - 0
         - 6
         version: "0.6"
-  requirement: *id001
-  type: :runtime
-  name: extensions
+  version_requirements: *id001
   prerelease: false
+  name: extensions
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,28 +44,28 @@ dependencies:
         - 5
         - 1
         version: 1.5.1
-  requirement: *id002
-  type: :runtime
-  name: highline
+  version_requirements: *id002
   prerelease: false
+  name: highline
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 7
         segments: 
-        - 2
-        - 1
+        - 3
         - 0
-        version: 2.1.0
-  requirement: *id003
-  type: :runtime
-  name: right_aws
+        - 0
+        version: 3.0.0
+  version_requirements: *id003
   prerelease: false
+  name: aboisvert_aws
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,12 +76,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id004
-  type: :runtime
-  name: right_http_connection
+  version_requirements: *id004
   prerelease: false
+  name: right_http_connection
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,12 +92,12 @@ dependencies:
         - 5
         - 0
         version: 2.5.0
-  requirement: *id005
-  type: :development
-  name: rspec
+  version_requirements: *id005
   prerelease: false
+  name: rspec
+  type: :development
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -108,10 +108,10 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  requirement: *id006
-  type: :development
-  name: rake
+  version_requirements: *id006
   prerelease: false
+  name: rake
+  type: :development
 description: 
 email: 
 - alex.boisvert@gmail.com
@@ -127,19 +127,19 @@ extra_rdoc_files:
 - README.md
 - History.txt
 files: 
+- lib/s3cp/s3rm.rb
 - lib/s3cp/s3ls.rb
-- lib/s3cp/s3mod.rb
-- lib/s3cp/s3cp.rb
 - lib/s3cp/version.rb
+- lib/s3cp/s3cp.rb
 - lib/s3cp/utils.rb
-- lib/s3cp/s3rm.rb
+- lib/s3cp/s3mod.rb
 - lib/s3cp/s3cat.rb
 - History.txt
 - README.md
+- bin/s3mod
+- bin/s3ls
 - bin/s3cp
 - bin/s3cat
-- bin/s3ls
-- bin/s3mod
 - bin/s3rm
 homepage: 
 licenses: []
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Amazon S3 tools to, e.g., list, copy, delete S3 files