s3cp 1.1.18 → 1.1.19

data/History.txt

@@ -1,6 +1,10 @@
+=== 1.1.19 (2013-02-06)
+
+* Fixed:    Error in `s3lifecycle` if rule prefix is nil.
+
 === 1.1.18 (2013-02-05)
 
-* Fixed:    Add new `s3lifecycle` command to manage object transtion rules.
+* Added:    Add new `s3lifecycle` command to manage object transtion rules.
 
     A few examples:
 

data/lib/s3cp/s3lifecycle.rb

@@ -84,11 +84,11 @@ end
 
 def rule_to_str(r)
   if r.expiration_time
-    [ r.prefix, r.id, r.status, time_or_date_str("Expire", r.expiration_time)]
+    [ r.prefix || "[root]", r.id, r.status, time_or_date_str("Expire", r.expiration_time)]
   elsif r.glacier_transition_time
-    [ r.prefix, r.id, r.status, time_or_date_str("Glacier", r.glacier_transition_time)]
+    [ r.prefix || "[root]", r.id, r.status, time_or_date_str("Glacier", r.glacier_transition_time)]
   else
-    [ r.prefix, r.id, r.status, "???"]
+    [ r.prefix || "[root]", r.id, r.status, "???"]
   end
 end
 
@@ -157,12 +157,17 @@ paths.each do |path|
       fail "Rule or prefix not found" unless success
 
     else
-      puts "Lifecycle rules:"
       rules = @s3.buckets[bucket].lifecycle_configuration.rules.to_a
       if rules.empty?
-        puts "No lifecycle rules"
+        puts "#{bucket} - no lifecycle rules"
       else
-        puts S3CP.tableify(rules.map { |r| rule_to_str(r) })
+        puts "#{bucket} - lifecycle rules:"
+        begin
+          puts S3CP.tableify(rules.map { |r| rule_to_str(r) })
+        rescue => e
+          puts rules.inspect
+          raise e
+        end
       end
   end
 end

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 1
   - 1
-  - 18
-  version: 1.1.18
+  - 19
+  version: 1.1.19
 platform: ruby
 authors: 
 - Alex Boisvert