cliaws 1.5.1 → 1.7.0

data/README.txt

@@ -29,6 +29,9 @@ Usage from the command line:
     # Returns a YAML representation of response and metadata headers
   $ clis3 rm my_awesome_bucket/a_key_name
 
+	$ cliec2 launch AMI --keypair KEYPAIR
+	$ cliec2 list
+
 Cliaws may also be used from Ruby:
 
   Cliaws.s3.list("my_awesome_bucket/a_glob") # Returns an array of names
@@ -39,10 +42,12 @@ Cliaws may also be used from Ruby:
   Cliaws.s3.head("my_awesome_bucket/a_key_name")
   Cliaws.s3.rm("my_awesome_bucket/a_key_name")
 
+	Cliaws.ec2.run("AMI", :keypair => "KEYPAIR")
+	Cliaws.ec2.list
+
 == REQUIREMENTS:
 
-* main
-* right_aws
+* thor
 
 == INSTALL:
 
@@ -52,7 +57,7 @@ Cliaws may also be used from Ruby:
 
 (The MIT License)
 
-Copyright (c) 2008 François Beausoleil (francois@teksol.info)
+Copyright (c) 2008-2009 François Beausoleil (francois@teksol.info)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/VERSION

@@ -1 +1 @@
-1.5.1
+1.7.0

data/cliaws.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cliaws}
-  s.version = "1.5.1"
+  s.version = "1.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Fran\303\247ois Beausoleil"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-07-20}
   s.description = %q{A command-line suite of tools to access Amazon Web Services, using the RightAws gems.}
   s.email = %q{francois@teksol.info}
   s.executables = ["clis3", "clisqs", "cliec2"]

data/lib/cliaws/cli/s3.rb

@@ -6,6 +6,32 @@ module Cliaws
 		class S3 < Thor
 			map ["-h", "--help"] => :help
 
+      desc "buckets", <<EOD
+Returns a list of bucket names.
+EOD
+      def buckets
+        puts Cliaws.s3.buckets.map {|bucket| bucket.name}
+      end
+
+      desc "create BUCKET", <<EOD
+Creates a new bucket.  If the bucket already exists, this command returns 1.
+EOD
+      def create(name)
+        Cliaws.s3.bucket(name, true)
+      end
+
+      desc "delete BUCKET", <<EOD
+Deletes the named bucket.  Will only delete the bucket if it is empty, unless --force.
+Returns 1 if the bucket did not exist.
+Returns 0 if the bucket existed and was deleted.
+EOD
+      method_options :force => false
+      def delete(name)
+        bucket = Cliaws.s3.bucket(name, false)
+        exit 1 if bucket.nil?
+        bucket.delete(options[:force])
+      end
+
 			desc "url S3_OBJECT_PATH", <<EOD
 Returns a signed, private, URL to the given S3 object that is valid for 24 hours.
 EOD
@@ -167,6 +193,62 @@ EOD
 			rescue Cliaws::S3::UnknownBucket
 				abort "Could not find bucket named #{$!.bucket_name}"
 			end
+
+      desc "grants BUCKET|KEY", <<EOD
+Returns a YAML representation of grants assigned to a bucket or key.
+EOD
+      def grants(thing)
+        result = Cliaws.s3.grants(thing).inject(Hash.new) do |memo, grant|
+          memo[grant.to_s] = grant.perms
+          memo
+        end
+
+        result = {thing => result}.to_yaml
+        puts result
+      end
+
+      desc "grant BUCKET|KEY (ID|EMAIL|AllUsers|AuthenticatedUsers) PERMISSION [PERMISSION...]", <<EOD
+Grants one or more permissions to a user or group.  Returns the new permissions on the bucket or key as YAML.
+
+Examples
+cliec2 grant my_awesome_bucket/some/key AllUsers READ
+cliec2 grant my_private_bucket friend@somewhere.com full-control
+cliec2 grant movies a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9 read WRITE
+EOD
+      def grant(thing, who, *permissions)
+        who = case who
+              when /^AllUsers$/i
+                "http://acs.amazonaws.com/groups/global/AllUsers"
+              when /^AuthenticatedUsers$/i
+                "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"
+              else
+                who
+              end
+        Cliaws.s3.grant(thing, who => permissions.map {|perm| perm.gsub('-', '_')})
+        grants(thing)
+      end
+
+      desc "revoke BUCKET|KEY (ID|EMAIL|AllUsers|AuthenticatedUsers) [PERMISSION [PERMISSION...]]", <<EOD
+Revokes one or more permissions to a user or group.  If no permissions are given, all grants are dropped.  Returns the new permissions on the bucket or key as YAML.
+
+Examples
+cliec2 revoke my_awesome_bucket/some/key AllUsers
+cliec2 revoke my_awesome_bucket/some/key AllUsers READ
+cliec2 revoke my_private_bucket friend@somewhere.com full-control
+cliec2 revoke movies a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9 read WRITE
+EOD
+      def revoke(thing, who, *permissions)
+        who = case who
+              when /^AllUsers$/i
+                "http://acs.amazonaws.com/groups/global/AllUsers"
+              when /^AuthenticatedUsers$/i
+                "http://acs.amazonaws.com/groups/global/AuthenticatedUsers"
+              else
+                who
+              end
+        Cliaws.s3.grant(thing, who => permissions.map {|perm| perm.gsub('_', '-')})
+        grants(thing)
+      end
 		end
 	end
 end

data/lib/cliaws/s3.rb

@@ -48,16 +48,65 @@ module Cliaws
       bucket.key(keyname).delete
     end
 
+    def bucket(name, create=false)
+      s3.bucket(name, create)
+    end
+
+    def buckets
+      s3.buckets
+    end
+
+    # +permissions+ is a Hash of ID|EMAIL|URL to permissions.
+    # Cliaws.s3.revoke("my_awesome_bucket/some/key", "francois@teksol.info" => %w(read write))
+    # Cliaws.s3.revoke("my_awesome_bucket/some/key", "francois@teksol.info" => %w()) # Drops all grants for the user
+    def revoke(name, permissions)
+      bucket, thing = bucket_and_thing(name)
+      permissions.each do |subject, perms|
+        grantee = RightAws::S3::Grantee.new(thing, subject, perms.map {|perm| perm.upcase}, :refresh)
+        if perms.empty? then
+          grantee.drop
+        else
+          grantee.revoke(*permissions)
+          grantee.apply
+        end
+      end
+    end
+
+    # +permissions+ is a Hash of ID|EMAIL|URL to permissions.
+    # Cliaws.s3.grant("my_awesome_bucket/some/key", "francois@teksol.info" => %w(read write))
+    def grant(name, permissions)
+      bucket, thing = bucket_and_thing(name)
+      permissions.each do |subject, perms|
+        RightAws::S3::Grantee.new(thing, subject, perms.map {|perm| perm.upcase}, :apply)
+      end
+    end
+
+    def grants(name)
+      bucket, thing = bucket_and_thing(name)
+      _, grantees = RightAws::S3::Grantee.owner_and_grantees(thing)
+      grantees
+    end
+
     protected
     def bucket_and_key_name(full_name, create=true)
       bucket_name, path = full_name.split("/", 2)
-      bucket = s3.bucket(bucket_name, create)
+      bucket = bucket(bucket_name, create)
       raise UnknownBucket.new(bucket_name) unless bucket
       [bucket, path]
     end
 
+    def bucket_and_thing(name)
+      bucket, keyname = bucket_and_key_name(name, false)
+      thing = keyname.nil? ? bucket : bucket.key(keyname)
+      [bucket, thing]
+    end
+
     def s3
-      @s3 ||= RightAws::S3.new(access_key_id, secret_access_key, :logger => Logger.new("/dev/null"))
+      @s3 ||= begin
+                logger = Logger.new(STDOUT)
+                logger.level = Logger::DEBUG
+                RightAws::S3.new(access_key_id, secret_access_key, :logger => logger)
+              end
     end
 
     def s3g

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cliaws
 version: !ruby/object:Gem::Version 
-  version: 1.5.1
+  version: 1.7.0
 platform: ruby
 authors: 
 - "Fran\xC3\xA7ois Beausoleil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-07 00:00:00 -04:00
+date: 2009-07-20 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency