s3cp 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.0.1 / 2012-03-9
+
+* Added:  New command `s3up` to upload STDIN to S3
+          e.g. some_cmd | s3up s3://bucket/path/to/destination
+
+  Note: `s3up` does not yet directly stream data to S3 since right_aws gem
+        requires the upload size to be known in advance. `s3up` currently
+        persists STDIN into a temp file although this may change in the
+        future.
+
 === 1.0.0 / 2012-03-9
 
 Pop the champagne!  It's time we called this a one-oh!! :)

data/bin/s3up

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 's3cp/s3up'
+

data/lib/s3cp/s3up.rb

@@ -0,0 +1,100 @@
+# Copyright (C) 2010-2012 Alex Boisvert and Bizo Inc. / All rights reserved.
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements.  See the NOTICE file  distributed with this work for
+# additional information regarding copyright ownership.  The ASF licenses this
+# file to you under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy of
+# the License at
+#
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+require 'rubygems'
+require 'extensions/kernel' if RUBY_VERSION =~ /1.8/
+require 'right_aws'
+require 'optparse'
+require 'tempfile'
+
+require 's3cp/utils'
+
+# Parse arguments
+options = {}
+options[:tty] = $stdout.isatty
+options[:headers] = []
+
+op = OptionParser.new do |opts|
+  opts.banner = "s3up [s3_path]"
+  opts.separator ''
+  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
+  end
+
+  opts.separator "        e.g.,"
+  opts.separator "              HTTP headers: \'Content-Type: image/jpg\'"
+  opts.separator "               AMZ headers: \'x-amz-acl: public-read\'"
+  opts.separator ""
+
+  opts.on_tail("-h", "--help", "Show this message") do
+    puts op
+    exit
+  end
+end
+op.parse!(ARGV)
+
+unless ARGV.size > 0
+  puts op
+  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])
+
+url = ARGV[0]
+
+bucket, key = S3CP.bucket_and_key(url)
+fail "Your URL looks funny, doesn't it?" unless bucket
+
+@s3 = S3CP.connect()
+
+# 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)
+    temp.syswrite(data)
+  rescue EOFError => e
+    break
+  end
+end
+temp.close
+temp.open
+
+# upload temp file
+begin
+  @s3.interface.put(bucket, key, temp, @headers)
+ensure
+  # cleanup
+  temp.close
+  temp.delete
+end
+

data/lib/s3cp/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: s3cp
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Alex Boisvert
@@ -141,6 +141,7 @@ executables:
 - s3mod
 - s3rm
 - s3stat
+- s3up
 extensions: []
 
 extra_rdoc_files: 
@@ -154,6 +155,7 @@ files:
 - lib/s3cp/s3stat.rb
 - lib/s3cp/s3cp.rb
 - lib/s3cp/utils.rb
+- lib/s3cp/s3up.rb
 - lib/s3cp/s3mod.rb
 - lib/s3cp/s3cat.rb
 - lib/s3cp/completion.rb
@@ -161,6 +163,7 @@ files:
 - README.md
 - bin/s3mod
 - bin/s3ls
+- bin/s3up
 - bin/s3cp
 - bin/s3cp_complete
 - bin/s3stat