cliaws 1.1.2 → 1.2.0

data/History.txt

@@ -1,7 +1,10 @@
-== 1.1.2 2008-04-30
+== 1.2.0 2008-05-30
 
-* New clisqs info.
-* New internal method for fetching multiple messages in one swoop in Cliaws::Sqs.
+* clis3 url returns the authenticated URL to an s3 object
+* clisqs info subcommand
+* Cliaws::Sqs#fetch returns a number of messages in one call
+* clis3 put handles multiple arguments (put A B C bucket/dir)
+* clis3 handles unknown bucket names gracefully
 
 == 1.1.1 2008-04-17
 

data/bin/clis3

@@ -10,36 +10,56 @@ rescue LoadError
 end
 
 require "main"
+
+$:.unshift File.dirname(__FILE__) + "/../lib"
 require "cliaws"
 
 Main {
-  argument("s3_object") do
-    required
-    argument_required
+  mixin :s3_object do
+    argument("s3_object") do
+      required
+      argument_required
+    end
   end
 
   mode("url") do
+    mixin :s3_object
+
     def run
       puts Cliaws.s3.url(params["s3_object"].value)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("list") do
+    mixin :s3_object
+
     def run
       puts Cliaws.s3.list(params["s3_object"].value)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("touch") do
+    mixin :s3_object
+
     def run
       Cliaws.s3.put("", params["s3_object"].value)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("put") do
-    argument("local_file") do
+    argument("local_files") do
       optional
       argument_required
+      arity -2
     end
 
     option("data") do
@@ -48,34 +68,61 @@ Main {
     end
 
     def run
-      if params["local_file"].given? && params["data"].given? then
-        abort "Cannot give both the --data and local_file parameters at the same time"
-      elsif !params["local_file"].given? && !params["data"].given? then
+      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_file"].given? then
-        source = File.open(params["local_file"].value, "rb")
+      elsif params["local_files"].given? && params["local_files"].values.length == 2 then
+        source = File.open(params["local_files"].values.shift, "rb")
+      elsif params["local_files"].given? then
+        s3_object = params["local_files"].values.pop
+        targets = params["local_files"].values.map {|filename| filename.to_s}
+        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
       else
         source = params["data"].value
       end
 
-      Cliaws.s3.put(source, params["s3_object"].value)
+      Cliaws.s3.put(source, params["local_files"].values.pop)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("rm") do
+    mixin :s3_object
+
     def run
       Cliaws.s3.rm(params["s3_object"].value)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("cat") do
+    mixin :s3_object
+
     def run
       Cliaws.s3.get(params["s3_object"].value, STDOUT)
       puts
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("get") do
+    mixin :s3_object
+
     argument("local_file") do
       argument_required
       optional
@@ -89,12 +136,20 @@ Main {
       end
 
       Cliaws.s3.get(params["s3_object"].value, dest)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 
   mode("head") do
+    mixin :s3_object
+
     def run
       Cliaws.s3.head(params["s3_object"].value)
+
+    rescue Cliaws::S3::UnknownBucket
+      abort "Could not find bucket named #{$!.bucket_name}"
     end
   end
 

data/lib/cliaws/s3.rb

@@ -53,6 +53,7 @@ module Cliaws
     def bucket_and_key_name(full_name)
       bucket_name, path = full_name.split("/", 2)
       bucket = s3.bucket(bucket_name, false)
+      raise UnknownBucket.new(bucket_name) unless bucket
       [bucket, path]
     end
 
@@ -63,5 +64,14 @@ module Cliaws
     def s3g
       @s3i ||= RightAws::S3Generator.new(access_key_id, secret_access_key, :logger => Logger.new("/dev/null"))
     end
+
+    class UnknownBucket < ArgumentError
+      attr_reader :bucket_name
+
+      def initialize(bucket_name)
+        super("Bucket #{bucket_name.inspect} could not be found")
+        @bucket_name = bucket_name
+      end
+    end
   end
 end

data/lib/cliaws/version.rb

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

metadata

@@ -1,36 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMREwDwYDVQQDDAhmcmFu
-  Y29pczEWMBQGCgmSJomT8ixkARkWBnRla3NvbDEUMBIGCgmSJomT8ixkARkWBGlu
-  Zm8wHhcNMDcxMDExMDM1MzE3WhcNMDgxMDEwMDM1MzE3WjBBMREwDwYDVQQDDAhm
-  cmFuY29pczEWMBQGCgmSJomT8ixkARkWBnRla3NvbDEUMBIGCgmSJomT8ixkARkW
-  BGluZm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2BxCY5a+ER1ep
-  eO1UOeiW6L5fFOF618YL125/KQStsro+YbVkLFwOkNSvboAdVxNMauWw839s4Jma
-  LU8pW+hx56J6YPFjp9af7Clli3oAGa0QaZWN8fA8iALWoFn2WTPQ6uVvKeva5qzF
-  iiMiDVc+hiaQQpIRV6SEJPxrd8a2esYUX5CkPs27PRa/i9MuwRbHgp4MQPTm2PiU
-  F+U9UafOXeRka3OWdD3CbzKbRwjorO0iZuLbe5hapvY2TC8I/3GWPFg5D5BaYE0p
-  nQSsKmr0PvcUQOr0GnX9Na7llUBedef06htxTIXpbIpl2K9MNiEJrK6L7sVsez8l
-  nEwp/m4DAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBSUERBKzt5bhCREUh67iY3HT12I5TANBgkqhkiG9w0BAQUFAAOCAQEAJh3YJh+d
-  ufqAV9sMWCSmiL0ZylZSE4qlRRCjxwPd1izYFM5lfUr43LkkR8Xrs69iyxg+wC7J
-  Hvz4s027X71NZ4kVeGpZn7QN50ChgxENPYztQrHrgP1yjMi0yx2yktMZEgHp3MXZ
-  xojT8ss6fSF44S04flHOCw4Se83rXTut56DgBXmGz3RXNKlVgi3petxlAijP8fR9
-  9AermHuLVXQxKdq2rDQZn87UhyXoqrK66NW98P5yCVR0aAw965aBSQQuZPLPzZJN
-  5j4veg4yDT2dMtIAb5+9YOKcpxFiO4Uckn9UKXGpOJ4LONp45thttZCP2gFgZpan
-  DdYn10CtfIKBFg==
-  -----END CERTIFICATE-----
+cert_chain: []
 
-date: 2008-04-30 00:00:00 -04:00
+date: 2008-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -128,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cliaws
-rubygems_version: 1.1.0
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: A command-line suite of tools to access Amazon Web Services, using the RightAws gems.

data.tar.gz.sig

@@ -1,4 +0,0 @@
-h��ܕ�
-�mgKVػ�V�3�8��a����$�����&*3s~Ok�
-��K�#%����{t/Vqٷ,���j	rr��%���@4��D�/��UH1����BvU���d�PM!U�6>�����נ��53�'{NH^�U1�%�ʐ��DO{�Q�ˊ}El���
-7|%�~k��b�����a{KG�!���Mu{�'�u��P|��/R{&M��
�PK٨���]�8 ��N�Rc�

metadata.gz.sig

@@ -1,2 +0,0 @@
-���]��r!FWt�*N�DN۶�a�j(�ݓ�tUk�匷�qrsﳳ�Y�>�_Z&�}��`
-O}3n�eǃ�6Qr�VZ��D���y?��yc����8��E