s3_uploader 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTlmOTgzMTU3ODA0OGZiYTRhYmUxNGVkZjkwZDNjOGU3YzRiMGYxMg==
+    MDFkOWViMjI4OWI3YjMyOTIwMzc2Y2E4ZTNiNzgyNjJiMTc2NWE5NA==
   data.tar.gz: !binary |-
-    NDdiYzkwNTVkOGNkOTNmNTcyYmU1NjA5NGMwYzYzNDEyNTViYzlkNw==
+    ZjAwZjNiOTZhYmE3ZDllYTI1Mjk5OGY2ODg3MjQzNjlhOGJhY2M0OQ==
 SHA512:
   metadata.gz: !binary |-
-    MWRhYTY2ZmZkZjg0OTA0ZjIzYjcyMjVhMzk2ZjRlMWMyY2NjNWQ3MWExYTQz
-    M2ZmYjliYWI0YTQ2OThjMzU5YmZmYjk4NmQ2NDU4ZDU4MTk3MTg0MjQ1YzIz
-    YjgxMWQ4NmNkZmZiMWQ2ZTIxOTQyYmI1ZDU5OGNjZDM4NDExNTI=
+    NGVkNmRjNWNjYzc3NzY2OGY5YjQwYWYwZThjYmQ4ZjMzOGNmZmU5OGI2ODcx
+    MmJmN2NkMTIwNWY2NTU3M2VhN2JmNWYzOTVhNDQ1MTUxZjI5NTE3MGU3ZmE1
+    NTY0MjA5NzI1MjRjZDJkM2NjN2Q2MGMzMTcwODE5NDU3YWIzYTU=
   data.tar.gz: !binary |-
-    ZGU5ZDY0NWJjNzdhZGMxZjBlODJhODEzMTViYTExYTg5NjYxNWI1ZmY5YjJi
-    NmE2N2Y4YmZiNTZkZDRhNGQ1NThmMDI0YjcwMmViZTdkZTg3OTFhNzNkNDI3
-    MDRmZTIzYTc4OWQ2YzFlMGVhNTliMzVhOTVhMzM3ZGE5MTU3NTk=
+    NTE1MjQyYjFhZGRlNDcwYjRlNDYyZDBiYWU0MGUwYjUzNGQ4M2M4NWFhZTdl
+    N2EwODBkNTliZTllZGZjZTk5YjNiODlkZjA0N2E3N2VmYTkxODI2MGNhZTE1
+    ODVlNDMwYzBiZDQ0OGQ1ZTI5ODE3Y2EyZjhjNDY0NmE2MjI2MDc=

data/README.md

@@ -32,19 +32,24 @@ Or install it yourself as:
 			:s3_secret => YOUR_SECRET_KEY,
 			:destination_dir => 'test/',
 			:region => 'eu-west-1',
-			:threads => 4 })
+			:threads => 4,
+      		:metadata => { 'Cache-Control' => 'max-age=315576000' } 
+		})
 
 If no keys are provided, it uses S3_KEY and S3_SECRET environment variables. us-east-1 is the default region.
 
 	S3Uploader.upload_directory('/tmp/test', 'mybucket', { :destination_dir => 'test/', :threads => 4 })
-	
+
 Or as a command line binary
-	
+
 	s3uploader -r eu-west-1 -k YOUR_KEY -s YOUR_SECRET_KEY -d test/ -t 4 /tmp/test mybucket
-	
+
 Again, it uses S3_KEY and S3_SECRET environment variables if non provided in parameters.
-	
+
 	s3uploader -d test/ -t 4 /tmp/test mybucket
+	
+	
+Metadata headers are documented [here](http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPUT.html)
 
 ## TODO
 
@@ -62,6 +67,7 @@ Again, it uses S3_KEY and S3_SECRET environment variables if non provided in par
 ## Contributors
 
 * [Mark Wagner](https://github.com/theSociableme)
+* [Brandon Hilkert](https://github.com/brandonhilkert)
 
 ## License
 

data/lib/s3_uploader/s3_uploader.rb

@@ -7,18 +7,19 @@ module S3Uploader
       :s3_key => ENV['S3_KEY'],
       :s3_secret => ENV['S3_SECRET'],
       :public => false,
-      :region => 'us-east-1'
+      :region => 'us-east-1',
+      :metadata => {}
     }.merge(options)
-    
+
     log = options[:logger] || Logger.new(STDOUT)
-    
+
     raise 'Source must be a directory' unless File.directory?(source)
-    
+
     if options[:connection]
       connection = options[:connection]
     else
       raise "Missing access keys" if options[:s3_key].nil? or options[:s3_secret].nil?
-      
+
       connection = Fog::Storage.new({
           :provider => 'AWS',
           :aws_access_key_id => options[:s3_key],
@@ -26,7 +27,7 @@ module S3Uploader
           :region => options[:region]
       })
     end
-    
+
     source = source.chop if source.end_with?('/')
     if options[:destination_dir] != '' and !options[:destination_dir].end_with?('/')
       options[:destination_dir] = "#{options[:destination_dir]}/"
@@ -36,20 +37,20 @@ module S3Uploader
     Dir.glob("#{source}/**/*").select{ |f| !File.directory?(f) }.each do |f|
       files << f
       total_size += File.size(f)
-      
+
     end
-    
+
     directory = connection.directories.new(:key => bucket)
-    
+
     start = Time.now
     total_files = files.size
     file_number = 0
     @mutex = Mutex.new
-    
+
     threads = []
     options[:threads].times do |i|
       threads[i] = Thread.new {
-        
+
         until files.empty?
           @mutex.synchronize do
             file_number += 1
@@ -60,22 +61,23 @@ module S3Uploader
             key = file.gsub(source, '')[1..-1]
             dest = "#{options[:destination_dir]}#{key}"
             log.info("[#{Thread.current["file_number"]}/#{total_files}] Uploading #{key} to s3://#{bucket}/#{dest}")
-          
+
             directory.files.create(
               :key    => dest,
               :body   => File.open(file),
-              :public => options[:public]
+              :public => options[:public],
+              :metadata => options[:metadata]
             )
           end
-        end 
+        end
       }
     end
     threads.each { |t| t.join }
-    
+
     finish = Time.now
     elapsed = finish.to_f - start.to_f
     mins, secs = elapsed.divmod 60.0
     log.info("Uploaded %d (%.#{0}f KB) in %d:%04.2f" % [total_files, total_size / KILO_SIZE, mins.to_i, secs])
-    
+
   end
 end

data/lib/s3_uploader/version.rb

@@ -1,3 +1,3 @@
 module S3Uploader
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: s3_uploader
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Christian Hein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog