s3cp 1.1.40 → 1.1.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0290c1eaaabbc90626e8a996868953051a421e66
-  data.tar.gz: c122054dbd6b8dcaa3ae610027c84667d57c06b3
+  metadata.gz: 547c783a85db260be45e507a599714debb2076d1
+  data.tar.gz: 1e1b8831f9d793eb7a456501bea6a67a1f786281
 SHA512:
-  metadata.gz: fe1d294a160d801372d7fa81590a037627033aaa2264644436598c258dd030e7abab6f2beca427e44f6588fa6288353a75b02071220e83af8aa3ac88951838b4
-  data.tar.gz: 4b98037c37e4d3a4e6fb4357204d20918cea037aac329c8dbcb3057c270c3618a17b94397e5d8f34589bf12e0f51a55f75b58c8a1b95b782f342f94b0d365ffb
+  metadata.gz: 268f7df890f20eaef4c8dccecf66b3615179d97261f3c1a7c3031ec64e9bdac3e49a14d4b21b69993c28f9bfb85f71d555116a5421aa059663b0fa929535d7b6
+  data.tar.gz: 403dd0e3399e0fd06676fe1130ffd3d1f4e91b51b00381ed664dcc066ff03334fd0c445242bdcb921eaacf99e2be62ac3b517cc1bfe0e8f3f8903011465bea23

data/History.txt

@@ -1,3 +1,6 @@
+=== 1.1.41 (2017-11-30)
+
+* Fixed:  s3rm now incrementally deletes objects (per new --batch size parameter; defaults to 10,000)
 
 === 1.1.40 (2015-12-21)
 

data/lib/s3cp/s3rm.rb

@@ -25,6 +25,7 @@ options[:exclude_regex] = nil
 options[:test]   = false
 options[:silent] = false
 options[:fail_if_not_exist] = false
+options[:batch_size] = 10000
 
 op = OptionParser.new do |opts|
   opts.banner = "s3rm [path]"
@@ -54,6 +55,10 @@ op = OptionParser.new do |opts|
     options[:silent] = true
   end
 
+  opts.on("--batch", "Delete batch size.") do |batch|
+    options[:batch_size] = batch.to_i
+  end
+
   opts.on("--verbose", "Verbose mode") do
     options[:verbose] = true
   end
@@ -123,6 +128,14 @@ S3CP.standard_exception_handling(options) do
         matching_keys << entry.key
         puts key unless options[:silent] || options[:verbose]
       end
+
+      if matching_keys.size > options[:batch_size]
+        if options[:verbose]
+          puts "Deleting batch..."
+        end
+        @s3.buckets[@bucket].objects.delete(matching_keys) unless options[:test]
+        matching_keys = []
+      end
     end
 
     if options[:fail_if_not_exist] && matching_keys.length == 0

data/lib/s3cp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3cp
 version: !ruby/object:Gem::Version
-  version: 1.1.40
+  version: 1.1.41
 platform: ruby
 authors:
 - Alex Boisvert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-21 00:00:00.000000000 Z
+date: 2017-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: extensions
@@ -191,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Amazon S3 tools to, e.g., list, copy, delete S3 files