cliaws 1.2.5 → 1.3.0

data/History.txt

@@ -1,3 +1,9 @@
+== 1.3.0 2008-10-01
+
+* Rewrote the algorithm for "clis3 put".  The new algorithm is saner, and prevents writing
+  0 byte files when the input's size is unknown and cannot be determined.
+* Return an exit status of 0 on normal exit on clis3 put.
+
 == 1.2.5 2008-09-15
 
 * More testing for "clis3 put - S3_OBJECT" and "cat x | clis3 put S3_OBJECT" highlighted

data/bin/clis3

@@ -71,36 +71,53 @@ Main {
       paths = params["files_or_s3_path"].values
       s3_object = paths.pop
 
+      single_put_mapper = lambda do |source, s3_path|
+        raise ArgumentError, "Writing directly from STDIN is forbidden when STDIN's size is unknown.  The RightAws library will write a zero-byte file to Amazon's servers." unless source.respond_to?(:lstat) || source.respond_to?(:size)
+        s3_path
+      end
+
+      multi_put_mapper  = lambda do |source, s3_path|
+        if source.respond_to?(:path) then
+          File.join(s3_path, File.basename(source.path))
+        else
+          raise ArgumentError, "Cannot write to a directory when one or more sources are not files: #{source.inspect}"
+        end
+      end
+
       if params["data"].given? && !paths.empty? then
         raise ArgumentError, "Cannot specify both --data and filename(s) to send."
       elsif params["data"].given? then
-        source = params["data"].value
+        sources = [StringIO.new(params["data"].value)]
+        mapper  = single_put_mapper
       elsif paths == ["-"] then
-        source = STDIN
+        sources = [STDIN]
+        mapper  = single_put_mapper
       else
         targets = paths.map {|filename| filename.to_s}
         case targets.length
         when 0
-          source = STDIN
+          sources = [STDIN]
+          mapper  = single_put_mapper
         when 1
-          File.open(targets.first, "rb") do |source|
-            Cliaws.s3.put(source, s3_object)
-          end
-          exit 0
+          sources = targets.map {|target| File.open(target, "rb")}
+          mapper  = single_put_mapper
         else
-          targets.each do |local_file|
-            File.open(local_file, "rb") do |source|
-              remote_file = File.join(s3_object, File.basename(local_file))
-              puts "%-30s => %s" % [local_file, remote_file]
-              Cliaws.s3.put(source, remote_file)
-            end
-          end
-          exit 0
+          sources = targets.map {|target| File.open(target, "rb")}
+          mapper  = multi_put_mapper
         end
       end
 
-      raise ArgumentError, "Target is a directory, but input is not a local file -- cannot proceed" if s3_object =~ /\/$/
-      Cliaws.s3.put(source, s3_object)
+      sources.each do |source|
+        target = mapper.call(source, s3_object)
+        if source.respond_to?(:path) then
+          puts "#{source.path} => #{target}"
+        else
+          puts "STDIN => #{target}"
+        end
+
+        Cliaws.s3.put(source, target)
+      end
+      exit_success!
 
     rescue Cliaws::S3::UnknownBucket
       abort "Could not find bucket named #{$!.bucket_name}"

data/lib/cliaws/s3.rb

@@ -45,8 +45,8 @@ module Cliaws
       puts headers.merge(key.meta_headers).to_yaml
     end
 
-    def put(source, s3_object)
-      bucket, keyname = bucket_and_key_name(s3_object)
+    def put(source, s3_object, create=true)
+      bucket, keyname = bucket_and_key_name(s3_object, create)
       bucket.put(keyname, source)
     end
 
@@ -56,9 +56,9 @@ module Cliaws
     end
 
     protected
-    def bucket_and_key_name(full_name)
+    def bucket_and_key_name(full_name, create=true)
       bucket_name, path = full_name.split("/", 2)
-      bucket = s3.bucket(bucket_name, false)
+      bucket = s3.bucket(bucket_name, create)
       raise UnknownBucket.new(bucket_name) unless bucket
       [bucket, path]
     end

data/lib/cliaws/version.rb

@@ -1,8 +1,8 @@
 module Cliaws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 2
-    TINY  = 5
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.2.5
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-15 00:00:00 -04:00
+date: 2008-10-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency