brightbox-cli 0.17.1 → 0.17.2

data/lib/brightbox-cli/vendor/fog/docs/index.markdown

@@ -45,7 +45,7 @@ geemus says: "That should give you everything you need to get started, but let m
 * Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
-* Rebase your branch against geemus/fog to make sure everything is up to date.
+* Rebase your branch against fog/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
 ## Resources

data/lib/brightbox-cli/vendor/fog/docs/storage/index.markdown

@@ -35,8 +35,8 @@ First, create a connection with your new account:
     # create a connection
     connection = Fog::Storage.new({
       :provider                 => 'AWS',
-      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
-      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID
+      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID,
+      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY
     })
 
     # First, a place to contain the glorious details
@@ -131,8 +131,8 @@ Sign up <a href="http://gs-signup-redirect.appspot.com/">here</a> and get your c
 
     connection = Fog::Storage.new({
       :provider                         => 'Google',
-      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY,
-      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID
+      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID,
+      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY
     })
 
 ## Rackspace CloudFiles

data/lib/brightbox-cli/vendor/fog/examples/compute_tests.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
 Shindo.tests('compute examples', 'compute') do
 
   # iterate over all the providers
-  Fog.providers.each do |provider|
+  Fog.providers.values.each do |provider|
 
     # FIXME: implement expected shared compute stuff for these providers as well
     next if ['Bluebox', 'Brightbox', 'Ecloud', 'GoGrid', 'Linode', 'NewServers', 'Ninefold', 'Slicehost', 'StormOnDemand', 'VirtualBox', 'Voxel'].include?(provider)
@@ -44,17 +44,29 @@ Shindo.tests('compute examples', 'compute') do
 
       # scp a file to a server
       lorem_path = File.join([File.dirname(__FILE__), '..', 'tests', 'lorem.txt'])
-      tests("@server.scp('#{lorem_path}', 'lorem.txt')").succeeds do
-        @server.scp(lorem_path, 'lorem.txt')
+      tests("@server.scp_upload('#{lorem_path}', 'lorem.txt')").succeeds do
+        @server.scp_upload(lorem_path, 'lorem.txt')
       end
 
+      # scp a file from a server
+      tests("@server.scp_download('lorem.txt', '/tmp/lorem.txt)").succeeds do
+        @server.scp_download('lorem.txt', '/tmp/lorem.txt')
+      end
+      File.delete('/tmp/lorem.txt')
+
       # scp a directory to a server
       Dir.mkdir('/tmp/lorem')
       file = ::File.new('/tmp/lorem/lorem.txt', 'w')
       file.write(File.read(lorem_path))
-      lorem_dir = File.join([File.dirname(__FILE__), '..', 'tests'])
-      tests("@server.scp('#{lorem_dir}', '/tmp/lorem', :recursive => true)").succeeds do
-        @server.scp(lorem_dir, '/tmp/lorem', :recursive => true)
+      tests("@server.scp_upload('/tmp/lorem', '/tmp', :recursive => true)").succeeds do
+        @server.scp_upload('/tmp/lorem', '/tmp', :recursive => true)
+      end
+      File.delete('/tmp/lorem/lorem.txt')
+      Dir.rmdir('/tmp/lorem')
+
+      # scp a directory from a server
+      tests("@server.scp_download('/tmp/lorem', '/tmp', :recursive => true)").succeeds do
+        @server.scp_download('/tmp/lorem', '/tmp', :recursive => true)
       end
       File.delete('/tmp/lorem/lorem.txt')
       Dir.rmdir('/tmp/lorem')

data/lib/brightbox-cli/vendor/fog/examples/dns_tests.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
 Shindo.tests('dns examples', 'dns') do
 
   # iterate over all the providers
-  Fog.providers.each do |provider|
+  Fog.providers.values.each do |provider|
 
     provider = eval(provider) # convert from string to object
 

data/lib/brightbox-cli/vendor/fog/examples/storage_tests.rb

@@ -7,7 +7,7 @@ require File.join(File.dirname(__FILE__), '..', 'tests', 'helper')
 Shindo.tests('storage examples', 'storage') do
 
   # iterate over all the providers
-  Fog.providers.each do |provider|
+  Fog.providers.values.each do |provider|
 
     provider = eval(provider) # convert from string to object
 

data/lib/brightbox-cli/vendor/fog/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '1.1.1'
-  s.date              = '2011-11-11'
+  s.version           = '1.1.2'
+  s.date              = '2011-12-18'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.7.4')
+  s.add_dependency('excon', '~>0.9.0')
   s.add_dependency('formatador', '~>0.2.0')
   s.add_dependency('multi_json', '~>1.0.3')
   s.add_dependency('mime-types')
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('rdoc')
+  s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
   s.add_development_dependency('shindo', '~>0.3.4')
   s.add_development_dependency('virtualbox', '~>0.9.1')

data/lib/brightbox-cli/vendor/fog/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws.rb

@@ -10,6 +10,7 @@ module Fog
     service(:compute,         'aws/compute',          'Compute')
     service(:cloud_formation, 'aws/cloud_formation',  'CloudFormation')
     service(:cloud_watch,     'aws/cloud_watch',      'CloudWatch')
+    service(:dynamodb,        'aws/dynamodb',         'DynamoDB')
     service(:dns,             'aws/dns',              'DNS')
     service(:elasticache,     'aws/elasticache',      'Elasticache')
     service(:elb,             'aws/elb',              'ELB')
@@ -20,6 +21,7 @@ module Fog
     service(:simpledb,        'aws/simpledb',         'SimpleDB')
     service(:sns,             'aws/sns',              'SNS')
     service(:sqs,             'aws/sqs',              'SQS')
+    service(:sts,             'aws/sts',              'STS')
     service(:storage,         'aws/storage',          'Storage')
 
     def self.indexed_param(key, values)
@@ -39,7 +41,7 @@ module Fog
       end
       params
     end
-    
+
     def self.serialize_keys(key, value, options = {})
       case value
       when Hash
@@ -85,6 +87,10 @@ module Fog
         'Version'           => options[:version]
       })
 
+      params.merge!({
+        'SecurityToken'     => options[:aws_session_token]
+      }) if options[:aws_session_token]
+
       body = ''
       for key in params.keys.sort
         unless (value = params[key]).nil?
@@ -218,6 +224,15 @@ module Fog
       def self.volume_id
         "vol-#{Fog::Mock.random_hex(8)}"
       end
+
+      def self.key_id(length=21)
+        #Probably close enough
+        Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',length)
+      end
+
+      def self.rds_address(db_name,region)
+        "#{db_name}.#{Fog::Mock.random_letters(rand(12) + 4)}.#{region}.rds.amazonaws.com"
+      end
     end
   end
 end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/auto_scaling.rb

@@ -77,22 +77,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'autoscaling.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'autoscaling.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'autoscaling.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'autoscaling.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'autoscaling.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'autoscaling.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "autoscaling.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @port       = options[:port]        || 443
           @persistent = options[:persistent]  || false
@@ -206,7 +191,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/cloud_formation.rb

@@ -54,22 +54,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'cloudformation.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'cloudformation.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'cloudformation.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'cloudformation.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'cloudformation.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'cloudformation.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/cloud_watch.rb

@@ -57,7 +57,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1', 'ap-northeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
         # * CloudWatch object with connection to AWS.
@@ -68,22 +68,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'monitoring.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'monitoring.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'monitoring.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'monitoring.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'monitoring.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'monitoring.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/compute.rb

@@ -6,7 +6,7 @@ module Fog
     class AWS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
+      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
 
       model_path 'fog/aws/models/compute'
       model       :address
@@ -57,6 +57,7 @@ module Fog
       request :describe_images
       request :describe_instances
       request :describe_reserved_instances
+      request :describe_instance_status
       request :describe_key_pairs
       request :describe_placement_groups
       request :describe_regions
@@ -170,7 +171,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
@@ -247,8 +248,9 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in
-        #     ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance,
+        #     'eu-west-1', 'us-east-1', and etc.
+        #   * aws_session_token<~String> - when using Session Tokens or Federated Users, a session_token must be presented
         #
         # ==== Returns
         # * EC2 object with connection to aws.
@@ -257,6 +259,7 @@ module Fog
 
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
           @connection_options     = options[:connection_options] || {}
           @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @region                 = options[:region] ||= 'us-east-1'
@@ -268,22 +271,7 @@ module Fog
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
-            @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              'ec2.ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              'ec2.ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              'ec2.eu-west-1.amazonaws.com'
-            when 'us-east-1'
-              'ec2.us-east-1.amazonaws.com'
-            when 'us-west-1'
-              'ec2.us-west-1.amazonaws.com'
-            when 'us-west-2'
-              'ec2.us-west-2.amazonaws.com'
-            else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-            end
+            @host = options[:host] || "ec2.#{options[:region]}.amazonaws.com"
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || false
             @port       = options[:port]        || 443
@@ -306,11 +294,12 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2011-05-15'
+              :version            => '2011-12-15'
             }
           )
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/elasticache.rb

@@ -54,13 +54,7 @@ module Fog
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'us-east-1'
-            'elasticache.us-east-1.amazonaws.com'
-            #TODO: Support other regions
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "elasticache.#{options[:region]}.amazonaws.com"
           @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/elb.rb

@@ -4,9 +4,15 @@ module Fog
   module AWS
     class ELB < Fog::Service
 
-      class IdentifierTaken < Fog::Errors::Error; end
-      class InvalidInstance < Fog::Errors::Error; end
-      class Throttled       < Fog::Errors::Error; end
+      class DuplicatePolicyName         < Fog::Errors::Error; end
+      class IdentifierTaken             < Fog::Errors::Error; end
+      class InvalidInstance             < Fog::Errors::Error; end
+      class InvalidConfigurationRequest < Fog::Errors::Error; end
+      class PolicyNotFound              < Fog::Errors::Error; end
+      class PolicyTypeNotFound          < Fog::Errors::Error; end
+      class Throttled                   < Fog::Errors::Error; end
+      class TooManyPolicies             < Fog::Errors::Error; end
+      class ValidationError             < Fog::Errors::Error; end
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :region, :host, :path, :port, :scheme, :persistent
@@ -17,12 +23,15 @@ module Fog
       request :create_lb_cookie_stickiness_policy
       request :create_load_balancer
       request :create_load_balancer_listeners
+      request :create_load_balancer_policy
       request :delete_load_balancer
       request :delete_load_balancer_listeners
       request :delete_load_balancer_policy
       request :deregister_instances_from_load_balancer
       request :describe_instance_health
       request :describe_load_balancers
+      request :describe_load_balancer_policies
+      request :describe_load_balancer_policy_types
       request :disable_availability_zones_for_load_balancer
       request :enable_availability_zones_for_load_balancer
       request :register_instances_with_load_balancer
@@ -39,13 +48,16 @@ module Fog
 
       class Mock
 
+        require 'fog/aws/elb/policy_types'
+
         def self.data
           @data ||= Hash.new do |hash, region|
             owner_id = Fog::AWS::Mock.owner_id
             hash[region] = Hash.new do |region_hash, key|
               region_hash[key] = {
                 :owner_id => owner_id,
-                :load_balancers => {}
+                :load_balancers => {},
+                :policy_types => Fog::AWS::ELB::Mock::POLICY_TYPES
               }
             end
           end
@@ -94,7 +106,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
         # * ELB object with connection to AWS.
@@ -107,22 +119,7 @@ module Fog
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'elasticloadbalancing.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'elasticloadbalancing.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'elasticloadbalancing.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'elasticloadbalancing.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'elasticloadbalancing.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'elasticloadbalancing.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "elasticloadbalancing.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
@@ -148,7 +145,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2011-04-05'
+              :version            => '2011-11-15'
           }
           )
 
@@ -166,14 +163,27 @@ module Fog
             case match[1]
             when 'CertificateNotFound'
               raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
-            when 'LoadBalancerNotFound'
-              raise Fog::AWS::ELB::NotFound.slurp(error, match[2])
             when 'DuplicateLoadBalancerName'
               raise Fog::AWS::ELB::IdentifierTaken.slurp(error, match[2])
+            when 'DuplicatePolicyName'
+              raise Fog::AWS::ELB::DuplicatePolicyName.slurp(error, match[2])
             when 'InvalidInstance'
               raise Fog::AWS::ELB::InvalidInstance.slurp(error, match[2])
+            when 'InvalidConfigurationRequest'
+              # when do they fucking use this shit?
+              raise Fog::AWS::ELB::InvalidConfigurationRequest.slurp(error, match[2])
+            when 'LoadBalancerNotFound'
+              raise Fog::AWS::ELB::NotFound.slurp(error, match[2])
+            when 'PolicyNotFound'
+              raise Fog::AWS::ELB::PolicyNotFound.slurp(error, match[2])
+            when 'PolicyTypeNotFound'
+              raise Fog::AWS::ELB::PolicyTypeNotFound.slurp(error, match[2])
             when 'Throttling'
               raise Fog::AWS::ELB::Throttled.slurp(error, match[2])
+            when 'TooManyPolicies'
+              raise Fog::AWS::ELB::TooManyPolicies.slurp(error, match[2])
+            when 'ValidationError'
+              raise Fog::AWS::ELB::ValidationError.slurp(error, match[2])
             else
               raise
             end