cliaws 1.2.0 → 1.2.1

data/History.txt

@@ -1,3 +1,9 @@
+== 1.2.1 2008-05-30
+
+* clis3 put A bucket/ will put to bucket/A, while clis3 put A bucket/B will
+  really put to bucket/B.  Essentially, the final slash treats the s3_object
+  as a directory.
+
 == 1.2.0 2008-05-30
 
 * clis3 url returns the authenticated URL to an s3 object

data/bin/clis3

@@ -68,12 +68,14 @@ Main {
     end
 
     def run
+      source_name = nil
       if params["local_files"].given? && params["data"].given? then
         abort "Cannot give both the --data and local_files parameters at the same time"
       elsif !params["local_files"].given? && !params["data"].given? then
         source = STDIN
       elsif params["local_files"].given? && params["local_files"].values.length == 2 then
-        source = File.open(params["local_files"].values.shift, "rb")
+        source_name = params["local_files"].values.shift
+        source = File.open(source_name, "rb")
       elsif params["local_files"].given? then
         s3_object = params["local_files"].values.pop
         targets = params["local_files"].values.map {|filename| filename.to_s}
@@ -90,7 +92,13 @@ Main {
         source = params["data"].value
       end
 
-      Cliaws.s3.put(source, params["local_files"].values.pop)
+      s3_object = params["local_files"].values.pop
+      if s3_object =~ /\/$/ then
+        raise ArgumentError, "Target is a directory, but input is not a local file -- cannot proceed" if source_name.nil?
+        s3_object = File.join(s3_object, File.basename(source_name))
+      end
+
+      Cliaws.s3.put(source, s3_object)
 
     rescue Cliaws::S3::UnknownBucket
       abort "Could not find bucket named #{$!.bucket_name}"

data/lib/cliaws/version.rb

@@ -2,7 +2,7 @@ module Cliaws #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 2
-    TINY  = 0
+    TINY  = 1
 
     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.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"