hpcloud 2.0.0

data/lib/hpcloud/commands/account/edit.rb

@@ -0,0 +1,204 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map %w(account:add account:setup account:update) => 'account:edit'
+
+      desc 'account:edit <account_name> [name_value_pair ...]', "Create or edit your account credentials."
+      long_desc <<-DESC
+  Create or edit your account credentials. If you do not specify an account name on the command line, the default account is updated.  If you do not specify name value pairs, you are prompted to input the account values.
+
+  You  need your Access Key Id, Secret Key and Project (aka Tenant) Id from the HP Cloud web site to set up your account. Optionally, you can specify your own endpoint to authorize your identity, but in most cases we recommend you use the default.
+  
+  Availability zones typically have the format 'az-1.region-a.geo-1' or 'region-a.geo-1', depending on the service.  See your account API keys page to see your list of activated availability zones: https://console.hpcloud.com/account/api_keys or use the `account:catalog` command to print out your service catalog.
+  
+  You can re-run this command at any time to modify your settings.
+
+  The interactive mode prompts you for the following values:
+  
+  * Access Key Id
+  * Secret Key 
+  * Project (aka Tenant) Id
+  * Identify (Auth) Uri
+  * Various zones and regions you have activated
+
+  The command line mode allows you to set the following values:
+#{Accounts.get_known}
+  
+Examples:
+  hpcloud account:setup # Create or edit the default account interactively
+  hpcloud account:edit  # Edit the default account settings interactively
+  hpcloud account:edit pro auth_uri='https://127.0.0.1/' block_availability_zone='az-2.region-a.geo-1' # Set the account credential authorization URI to `https://127.0.0.1\` and the block availability zone to `az-2.region-a.geo-1`
+  hpcloud account:setup rackspace -p rackspace # Create a Rackspace account for migration
+
+Aliases: account:add, account:setup, account:update
+      DESC
+      method_option 'userpass', :type => :boolean,
+                    :desc => "Use username/password authentication instead of authentication keys"
+      method_option 'no-validate', :type => :boolean, :aliases => '-n',
+                    :default => false,
+                    :desc => "Don't verify account settings during edit"
+      method_option 'provider', :type => :string, :aliases => '-p',
+                    :desc => "Cloud provider for migration: AWS, Rackspace, or Google"
+      define_method "account:edit" do |*args|
+        cli_command(options) {
+          if args.empty?
+            config = Config.new(true)
+            name = config.get(:default_account)
+          else
+            name = args.shift
+          end
+          accounts = HP::Cloud::Accounts.new()
+          if args.empty?
+            begin
+              acct = accounts.read(name)
+            rescue Exception => e
+              acct = accounts.create(name)
+            end
+            acct[:provider] ||= 'hp'
+            unless options[:provider].nil?
+              provider = options[:provider].downcase
+              if provider != acct[:provider]
+                acct[:provider] = provider
+                acct[:options] = {}
+                acct[:credentials] = {}
+                acct[:regions] = {}
+              end
+            end
+            cred = acct[:credentials]
+
+            # ask for credentials
+            case acct[:provider]
+            when "hp"
+              service_name = "HP Cloud Services"
+              @log.display "****** Setup your #{service_name} #{name} account ******"
+              unless options[:userpass].nil?
+                if options[:userpass] == true
+                  cred[:userpass] = options[:userpass]
+                else
+                  cred[:userpass] = nil
+                end
+              end
+              if cred[:userpass] == true
+                cred[:account_id] = ask_with_default 'User name:', "#{cred[:account_id]}"
+                cred[:secret_key] = ask_with_default 'Password:', "#{cred[:secret_key]}"
+              else
+                cred[:account_id] = ask_with_default 'Access Key Id:', "#{cred[:account_id]}"
+                cred[:secret_key] = ask_with_default 'Secret Key:', "#{cred[:secret_key]}"
+              end
+              cred[:tenant_id] = ask_with_default 'Project (aka Tenant) Id:', "#{cred[:tenant_id]}"
+              cred[:auth_uri] = ask_with_default 'Identity (Auth) Uri:', "#{cred[:auth_uri]}"
+            when "aws"
+              service_name = "AWS"
+              @log.display "****** Setup your #{service_name} #{name} account ******"
+              cred[:aws_access_key_id] = ask_with_default 'Access Key ID:', "#{cred[:aws_access_key_id]}"
+              cred[:aws_secret_access_key] = ask_with_default 'Secret Access Key:', "#{cred[:aws_secret_access_key]}"
+              acct[:options] = {}
+              acct[:regions] = {}
+            when "rackspace"
+              service_name = "Rackspace"
+              @log.display "****** Setup your #{service_name} #{name} account ******"
+              cred[:rackspace_username] = ask_with_default 'Username:', "#{cred[:rackspace_username]}"
+              cred[:rackspace_api_key] = ask_with_default 'API Key:', "#{cred[:rackspace_api_key]}"
+              acct[:options] = {}
+              acct[:regions] = {}
+            when "google"
+              service_name = "Google"
+              @log.display "****** Setup your #{service_name} #{name} account ******"
+              cred[:google_storage_access_key_id] = ask_with_default 'Storage access key id:', "#{cred[:google_storage_access_key_id]}"
+              cred[:google_storage_secret_access_key] = ask_with_default 'Storage secret access key:', "#{cred[:google_storage_secret_access_key]}"
+              acct[:options] = {}
+              acct[:regions] = {}
+            else
+              @log.error "Provider '#{acct[:provider]}' not recognized.  Supported providers include hp, aws and rackspace."
+              @log.fatal "If your provider is not supported, you may manually create an account configuration file in the ~/.hpcloud/accounts directory."
+            end
+
+            # update credentials and stash in config directory
+            accounts.set_cred(name, cred)
+            accounts.write(name)
+
+            unless options['no-validate']
+              @log.display "Verifying your #{service_name} account..."
+              if cred[:auth_uri].nil?
+                identifier = cred.to_s
+              else
+                identifier = cred[:auth_uri]
+              end
+
+              begin
+                cata = Connection.instance.catalog(name, [])
+                regions = acct[:regions]
+                if acct[:provider] == "hp"
+                  services = []
+                  cata.keys.each { |x| services << x.to_s }
+                  services.sort!
+                  services.each { |service|
+                    zone = "#{service.downcase}".to_sym
+                    regs = []
+                    cata[service.to_sym].keys.each { |x| regs << x.to_s }
+                    regs.sort!
+                    default_region = regions[zone] || regs.first.to_s
+                    az = regs.join(',')
+                    unless service == "Image Management" || service == "Identity"
+                      regions[zone] = ask_with_default "#{service} region (#{az}):", "#{default_region}"
+                    end
+                  }
+                end
+                acct[:regions] = regions
+                accounts.set_regions(name, regions)
+                accounts.write(name)
+              rescue Exception => e
+                e = ErrorResponse.new(e).to_s
+                @log.error "Account verification failed. Error connecting to the service endpoint at: '#{identifier}'. Please verify your account credentials. \n Exception: #{e}"
+              end
+            end
+
+            @log.display "Account credentials for #{service_name} have been saved."
+            unless acct[:provider] == "hp"
+              @log.display "Accounts for providers other than HP are only supported for migration"
+            end
+          else
+            acct = accounts.read(name, true)
+            updated = ""
+            args.each { |nvp|
+              sub_command {
+                k, v = Config.split(nvp)
+                accounts.set(name, k, v)
+                updated += " " if updated.empty? == false
+                updated += nvp
+              }
+            }
+            if updated.empty? == false
+              accounts.write(name)
+              @log.display "Account '#{name}' set " + updated
+            end
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account/remove.rb

@@ -0,0 +1,53 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+
+module HP
+  module Cloud
+    class CLI < Thor
+    
+      map %w(account:rm account:delete account:del) => 'account:remove'
+
+      desc 'account:remove account_name [account_name ...]', "Remove accounts."
+      long_desc <<-DESC
+  Remove accounts.  You may specify one or more account to remove on the command line.
+  
+Examples:
+  hpcloud account:remove useast uswest # Remove the `useast` and `uswest` accounts
+
+Aliases: account:rm, account:delete, account:del
+      DESC
+      define_method "account:remove" do |name, *names|
+        cli_command(options) {
+          accounts = HP::Cloud::Accounts.new()
+          names = [name] + names
+          names.each{ |name|
+            sub_command {
+              accounts.remove(name)
+              @log.display("Removed account '#{name}'")
+            }
+          }
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account/setup.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc 'account:setup <account_name>', "Create or edit your account credentials."
+      long_desc <<-DESC
+See account:edit
+      DESC
+      method_option 'no-validate', :type => :boolean, :aliases => '-n',
+                    :default => false,
+                    :desc => "Don't verify account settings during edit"
+      define_method "account:setup" do |*args|
+        send("account:edit", args)
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account/tenants.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+      desc 'account:tenants', "List the tenants."
+      long_desc <<-DESC
+  Lists all the tenants associated with this account.
+
+Examples:
+  hpcloud account:tenants          # List all the tenants associated with the account
+      DESC
+      CLI.add_report_options
+      CLI.add_common_options
+      define_method "account:tenants" do
+        cli_command(options) {
+          default_keys = [ "id", "name", "enabled" ]
+          ray = Connection.instance.tenants
+          Tableizer.new(options, default_keys, ray).print
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account/use.rb

@@ -0,0 +1,46 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+
+module HP
+  module Cloud
+    class CLI < Thor
+    
+      desc 'account:use <account_to_use>', "Set the named account to the default account."
+      long_desc <<-DESC
+  Use the specified account as your default account.  Any command executed without the `-a` account_name option uses this account.
+  
+Examples:
+  hpcloud account:use useast # Set the default account to `useast`
+      DESC
+      define_method "account:use" do |name|
+        cli_command(options) {
+          HP::Cloud::Accounts.new().read(name)
+          config = Config.new(true)
+          config.set(:default_account, name)
+          config.write()
+          @log.display("Account '#{name}' is now the default")
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account/verify.rb

@@ -0,0 +1,55 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+
+module HP
+  module Cloud
+    class CLI < Thor
+    
+      desc 'account:verify <account_to_verify>', "Verify the credentials of the specified account."
+      long_desc <<-DESC
+  Verify the credentials of an account.
+  
+Examples:
+  hpcloud account:verify useast # Verify the `useast` account credentials
+      DESC
+      method_option :debug, :type => :string, :alias => '-x',
+                    :desc => 'Debug logging 1,2,3,...'
+      define_method "account:verify" do |name|
+        cli_command(options) {
+          HP::Cloud::Accounts.new().read(name)
+          @log.display "Verifying '#{name}' account..."
+          begin
+            Connection.instance.validate_account(name)
+            @log.display "Able to connect to valid account '#{name}'."
+          rescue Exception => e
+            unless options[:debug].nil?
+              puts e.backtrace
+            end
+            e = ErrorResponse.new(e).to_s
+            @log.error "Account verification failed. Please verify your account credentials. \n Exception: #{e}"
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/account.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/accounts'
+require 'hpcloud/commands/account/catalog'
+require 'hpcloud/commands/account/copy'
+require 'hpcloud/commands/account/edit'
+require 'hpcloud/commands/account/remove'
+require 'hpcloud/commands/account/setup'
+require 'hpcloud/commands/account/tenants'
+require 'hpcloud/commands/account/use'
+require 'hpcloud/commands/account/verify'
+
+module HP
+  module Cloud
+    class CLI < Thor
+    
+      map 'account:list' => 'account'
+
+      desc 'account [account_name]', "List your accounts and account settings."
+      long_desc <<-DESC
+  List your accounts and your account settings.
+  
+Examples:
+  hpcloud account # List your accounts and account settings
+  hpcloud account:list # List your accounts and account settings
+  hpcloud account:list useast # List your accounts and account settings for domain `useast`
+
+Aliases: account:list
+      DESC
+      def account(name=nil)
+        cli_command(options) {
+          accounts = HP::Cloud::Accounts.new()
+          if name.nil?
+            config = Config.new(true)
+            name = config.get(:default_account)
+            listo = accounts.list
+            @log.display listo.gsub(/^(#{name})$/, '\1 <= default')
+          else
+            sub_command {
+              acct = accounts.read(name)
+              @log.display acct.to_yaml.gsub(/---\n/,'').gsub(/^:/,'').gsub(/^[ ]*:/,'  ')
+            }
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/acl/grant.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'hpcloud/acl_cmd'
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      map 'acl:set' => 'acl:grant'
+
+      desc 'acl:grant <container> <permissions> [user ...]', "Grant the specified permissions."
+      long_desc <<-DESC
+  Set the access control list (ACL) values for the specified container. The supported permissions are `r` (read), `w` (write), or `rw` (read and write). You may specify one or more user for the given permission.  If you do not specify a user, the permissions are set to public.  Public write permissions are not allowed.
+
+Examples:
+  hpcloud acl:grant :my_container r    # Allow anyone to read 'my_container'
+  hpcloud acl:grant :my_container rw bob@example.com sally@example.com # Allow Bob and Sally to read and write 'my_container'
+  hpcloud acl:grant :my_container r billy@example.com # Give Billy read permissions to 'my_container'
+
+Aliases: acl:set
+      DESC
+      CLI.add_common_options
+      define_method 'acl:grant' do |name, permissions, *users|
+        cli_command(options) {
+          acl = HP::Cloud::AclCmd.new(permissions, users)
+          if acl.is_valid?
+            resource = ResourceFactory.create(Connection.instance.storage, name)
+            if resource.grant(acl)
+              @log.display "ACL for #{name} updated to #{acl}."
+            else
+              @log.fatal resource.cstatus
+            end
+          else
+            @log.fatal acl.cstatus
+          end
+        }
+      end
+    end
+  end
+end

data/lib/hpcloud/commands/acl/revoke.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+#
+# © Copyright 2013 Hewlett-Packard Development Company, L.P.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+module HP
+  module Cloud
+    class CLI < Thor
+
+      desc 'acl:revoke <container> <permissions> [user ...]', "Revoke the specified permissions."
+      long_desc <<-DESC
+  Revoke the access control list (ACL) values from the specified container. The supported permissions are `r` (read), `w` (write), or `rw` (read and write). You may specify one or more user fo the given permission.  If you do not specify a user, the permissions are set to public.  Public write permissions are not allowed.
+
+Examples:
+  hpcloud acl:revoke :my_container public-read    # Revoke public read from 'my_container'
+  hpcloud acl:revoke :my_container rw bob@example.com # Revoke read and write from bob@example.com from 'my_container'
+      DESC
+      CLI.add_common_options
+      define_method 'acl:revoke' do |name, permissions, *users|
+        cli_command(options) {
+          acl = AclCmd.new(permissions, users)
+          if acl.is_valid?
+            resource = ResourceFactory.create(Connection.instance.storage, name)
+            if resource.revoke(acl)
+              @log.display "Revoked #{acl} from #{name}"
+            else
+              @log.fatal resource.cstatus
+            end
+          else
+            @log.fatal acl.cstatus
+          end
+        }
+      end
+    end
+  end
+end