s3cp 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.2 / 2012-03-9
+
+* Added:  `s3up` now outputs uploaded file size to STDERR, e.g.,
+
+          % ls | s3up s3://bucket/path/to/file
+          s3://bucket/path/to/file => 214B
+
 === 1.0.1 / 2012-03-9
 
 * Added:  New command `s3up` to upload STDIN to S3

data/lib/s3cp/s3cp.rb

@@ -207,19 +207,7 @@ def log(msg)
   puts msg if @verbose
 end
 
-def headers_array_to_hash(header_array)
-  headers = {}
-  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 :(
-    else
-      log("Header ignored because of error splitting [#{header}].  Expected colon delimiter; e.g. Header: Value")
-    end
-  end
-  headers
-end
-@headers = headers_array_to_hash(options[:headers])
+@headers = S3CP.headers_array_to_hash(options[:headers])
 
 def with_headers(msg)
   unless @headers.empty?

data/lib/s3cp/s3up.rb

@@ -54,19 +54,7 @@ unless ARGV.size > 0
   exit
 end
 
-def headers_array_to_hash(header_array)
-  headers = {}
-  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 :(
-    else
-      log("Header ignored because of error splitting [#{header}].  Expected colon delimiter; e.g. Header: Value")
-    end
-  end
-  headers
-end
-@headers = headers_array_to_hash(options[:headers])
+@headers = S3CP.headers_array_to_hash(options[:headers])
 
 url = ARGV[0]
 
@@ -77,7 +65,6 @@ fail "Your URL looks funny, doesn't it?" unless bucket
 
 # copy all of STDIN to a temp file
 temp = Tempfile.new('s3cp')
-f = File.new("newfile2.zip",  "wb")
 while true
   begin
     data = STDIN.sysread(4 * 1024)
@@ -92,6 +79,7 @@ temp.open
 # upload temp file
 begin
   @s3.interface.put(bucket, key, temp, @headers)
+  STDERR.puts "s3://#{bucket}/#{key} => #{S3CP.format_filesize(temp.size)} "
 ensure
   # cleanup
   temp.close

data/lib/s3cp/utils.rb

@@ -45,6 +45,19 @@ module S3CP
     [bucket, key]
   end
 
+  def headers_array_to_hash(header_array)
+    headers = {}
+    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 :(
+      else
+        fail("Invalid header value; expected single colon delimiter; e.g. Header: Value")
+      end
+    end
+    headers
+  end
+
   # Round a number at some `decimals` level of precision.
   def round(n, decimals = 0)
     (n * (10.0 ** decimals)).round * (10.0 ** (-decimals))

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Alex Boisvert