s3cp 1.1.0.pre.2 → 1.1.0.pre.3

data/History.txt

@@ -1,4 +1,10 @@
-=== 1.1.0.pre.2 / (Pending)
+=== 1.1.0.pre.3 / (2012-08-22)
+
+* Fixed:    s3cp >5GB file uploads (Peter Tan)
+
+* Changed:  Updated aws-sdk dependency to ~> 1.6.3
+
+=== 1.1.0.pre.2 / (2012-08-08)
 
 * Added:    's3cp --version' now reports version information.
 

data/lib/s3cp/s3cp.rb

@@ -155,18 +155,25 @@ if options[:debug]
   puts "Options: \n#{options.inspect}"
 end
 
-class Proxy
+class ProxyIO
   instance_methods.each { |m| undef_method m unless m =~ /(^__|^send$|^object_id$)/ }
 
-  def initialize(target)
-    @target = target
+  def initialize(io, progress_bar)
+    @io = io
+    @progress_bar = progress_bar
+  end
+
+  def read(size)
+    result = @io.read(size)
+    @progress_bar.inc result.length if result
+    result
   end
 
   protected
 
   def method_missing(name, *args, &block)
-    #puts "method_missing! #{name} #{args.inspect}"
-    @target.send(name, *args, &block)
+    #puts "ProxyIO method_missing! #{name} #{args.inspect}"
+    @io.send(name, *args, &block)
   end
 end
 
@@ -288,10 +295,7 @@ def local_to_s3(bucket_to, key, file, options = {})
       end
 
       begin
-        s3_options = {
-          :bucket_name => bucket_to,
-          :key => key
-        }
+        s3_options = {}
         S3CP.set_header_options(s3_options, @headers)
         s3_options[:acl] = options[:acl]
         s3_options[:content_length] = File.size(file)
@@ -300,14 +304,9 @@ def local_to_s3(bucket_to, key, file, options = {})
           p.file_transfer_mode
         end
 
-        meta = @s3.client.put_object(s3_options) do |buffer|
-          File.open(file) do |io|
-            while !io.eof?
-              result = io.read(32 * 1024)
-              progress_bar.inc result.length if result
-              buffer.write(result)
-            end
-          end
+        File.open(file) do |io|
+          obj = @s3.buckets[bucket_to].objects[key]
+          obj.write(ProxyIO.new(io, progress_bar), s3_options)
         end
 
         progress_bar.finish if progress_bar

data/lib/s3cp/version.rb

@@ -16,5 +16,5 @@
 # the License.
 
 module S3CP
-  VERSION = "1.1.0.pre.2"
+  VERSION = "1.1.0.pre.3"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: -3585171968
+  hash: 3125656313
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - pre
-  - 2
-  version: 1.1.0.pre.2
+  - 3
+  version: 1.1.0.pre.3
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-09 00:00:00 Z
+date: 2012-08-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -58,12 +58,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 9
         segments: 
         - 1
-        - 5
-        - 7
-        version: 1.5.7
+        - 6
+        - 3
+        version: 1.6.3
   requirement: *id003
   type: :runtime
 - !ruby/object:Gem::Dependency