s3cp 1.1.19 → 1.1.20

data/History.txt

@@ -1,3 +1,21 @@
+=== 1.1.20 (2013-02-26)
+
+* Added:  "--header" command-line option to s3cp, s3up, s3mod.
+
+          This option allows passing individual headers including ones with
+          a comma in the value, e.g.:
+
+            s3cp --header 'Cache-Control: max-age=604800,must-revalidate'
+
+          That otherwise would have been interpreted as two headers by the
+          "--headers" option.   You may use several "--header" arguments
+          if needed.
+
+          (Be warned that at the time of this writing, the 's3stat' command
+          does not display all headers/metadata on the S3 object.  This is
+          a bug in the aws-sdk gem.   You may use the AWS console to get an
+          accurate list of all object headers and metadata.)
+
 === 1.1.19 (2013-02-06)
 
 * Fixed:    Error in `s3lifecycle` if rule prefix is nil.

data/lib/s3cp/s3cp.rb

@@ -91,7 +91,11 @@ op = OptionParser.new do |opts|
   opts.separator ""
 
   opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
-    options[:headers] = h
+    options[:headers] += h
+  end
+
+  opts.on('--header \'Header: Value\'', "Header to set on the item in S3." ) do |h|
+    options[:headers] += [h]
   end
 
   opts.on("--acl PERMISSION", "One of 'private', 'authenticated-read', 'public-read', 'public-read-write'") do |permission|

data/lib/s3cp/s3mod.rb

@@ -56,7 +56,11 @@ op = OptionParser.new do |opts|
   end
 
   opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
-    options[:headers] = h
+    options[:headers] += h
+  end
+
+  opts.on('--header \'Header: Value\'', "Header to set on the item in S3." ) do |h|
+    options[:headers] += [h]
   end
 
   opts.on("--acl PERMISSION", "One of 'private', 'authenticated-read', 'public-read', 'public-read-write'") do |permission|

data/lib/s3cp/s3stat.rb

@@ -52,7 +52,7 @@ S3CP.load_config()
 obj = @s3.objects[@key]
 
 metadata = obj.head
-metadata.keys.sort { |k1, k2| k1.to_s <=> k2.to_s}.each do |k|
+metadata.to_h.keys.sort { |k1, k2| k1.to_s <=> k2.to_s}.each do |k|
   puts "#{"%30s" % k} #{metadata[k].is_a?(Hash) ? metadata[k].inspect : metadata[k].to_s}"
 end
 

data/lib/s3cp/s3up.rb

@@ -30,7 +30,11 @@ op = OptionParser.new do |opts|
   opts.separator 'Uploads data from STDIN to S3.'
 
   opts.on('--headers \'Header1: Header1Value\',\'Header2: Header2Value\'', Array, "Headers to set on the item in S3." ) do |h|
-    options[:headers] = h
+    options[:headers] += h
+  end
+
+  opts.on('--header \'Header: Value\'', "Header to set on the item in S3." ) do |h|
+    options[:headers] += [h]
   end
 
   opts.on("--acl PERMISSION", "One of 'private', 'authenticated-read', 'public-read', 'public-read-write'") do |permission|

data/lib/s3cp/utils.rb

@@ -83,7 +83,7 @@ module S3CP
     header_array.each do |header|
       header_parts = header.split(": ", 2)
       if header_parts.size == 2
-        headers[header_parts[0].downcase] = header_parts[1]  # RightAWS gem expect lowercase header names :(
+        headers[header_parts[0]] = header_parts[1]
       else
         fail("Invalid header value; expected single colon delimiter; e.g. Header: Value")
       end
@@ -193,9 +193,11 @@ module S3CP
       end
     end
 
+    metadata = {}
     remaining.each do |k,v|
-      options[k] = v
+      metadata[k] = v
     end
+    options[:metadata] = metadata if metadata
 
     options
   end

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 59
   prerelease: 
   segments: 
   - 1
   - 1
-  - 19
-  version: 1.1.19
+  - 20
+  version: 1.1.20
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-06 00:00:00 Z
+date: 2013-02-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -54,12 +54,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 49
         segments: 
         - 1
         - 8
-        - 1
-        version: 1.8.1
+        - 3
+        version: 1.8.3
   requirement: *id003
   type: :runtime
   prerelease: false