s3cp 1.1.30 → 1.1.31

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.31 (2013-05-16)
+
+* Fixed:  Passing ACLs to s3cp using --header 'x-amz-acl: public-read' was broken
+          since 1.1.24.
+
 === 1.1.30 (2013-05-15)
 
 * Changed:  Improved error handling -- all commands now exit with non-zero exit

data/lib/s3cp/s3cp.rb

@@ -261,7 +261,7 @@ def s3_to_s3(bucket_from, key, bucket_to, dest, options = {})
   s3_dest = @s3.buckets[bucket_to].objects[dest]
   s3_options = {}
   S3CP.set_header_options(s3_options, @headers)
-  s3_options[:acl] = options[:acl]
+  s3_options[:acl] = options[:acl] if options[:acl]
   unless options[:move]
     s3_source.copy_to(s3_dest, s3_options)
   else
@@ -306,7 +306,7 @@ def local_to_s3(bucket_to, key, file, options = {})
 
         s3_options = {}
         S3CP.set_header_options(s3_options, @headers)
-        s3_options[:acl] = options[:acl]
+        s3_options[:acl] = options[:acl] if options[:acl]
         s3_options[:content_length] = File.size(file)
 
         multipart_threshold = options[:multipart].is_a?(Fixnum) ?  options[:multipart] : AWS.config.s3_multipart_threshold

data/lib/s3cp/s3stat.rb

@@ -45,7 +45,7 @@ permission = ARGV.last
 @bucket, @key = S3CP.bucket_and_key(source)
 fail "Your URL looks funny, doesn't it?" unless @bucket
 
-S3CP.standard_exception_handling(options) do
+S3CP.standard_exception_handling(@options) do
   S3CP.load_config()
 
   @s3 = S3CP.connect().buckets[@bucket]

data/lib/s3cp/s3up.rb

@@ -90,7 +90,7 @@ S3CP.standard_exception_handling(options) do
   begin
     s3_options = {}
     S3CP.set_header_options(s3_options, @headers)
-    s3_options[:acl] = options[:acl]
+    s3_options[:acl] = options[:acl] if options[:acl]
     @s3.buckets[bucket].objects[key].write(temp, s3_options)
     $stderr.puts "s3://#{bucket}/#{key} => #{S3CP.format_filesize(temp.size)} "
   ensure

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 1
   - 1
-  - 30
-  version: 1.1.30
+  - 31
+  version: 1.1.31
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-15 00:00:00 Z
+date: 2013-05-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement