brightbox-cli 0.17.1 → 0.17.2

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

@@ -56,20 +56,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-southeast-1'
-            'sns.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'sns.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'sns.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'sns.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'sns.us-west-2.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "sns.#{options[:region]}.amazonaws.com"
 
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false

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

@@ -5,7 +5,7 @@ module Fog
     class SQS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :aws_session_token
 
       request_path 'fog/aws/requests/sqs'
       request :change_message_visibility
@@ -71,29 +71,22 @@ 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']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1' and etc.
         #
         # ==== Returns
         # * SQS object with connection to AWS.
         def initialize(options={})
           @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)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-southeast-1'
-            'ap-southeast-1.queue.amazonaws.com'
-          when 'eu-west-1'
-            'eu-west-1.queue.amazonaws.com'
           when 'us-east-1'
             'queue.amazonaws.com'
-          when 'us-west-1'
-            'us-west-1.queue.amazonaws.com'
-          when 'us-west-2'
-            'us-west-2.queue.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "#{options[:region]}.queue.amazonaws.com"
           end
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
@@ -121,6 +114,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => path || @path,

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

@@ -19,11 +19,13 @@ module Fog
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_lifecycle
       request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
       request :get_bucket
       request :get_bucket_acl
+      request :get_bucket_lifecycle
       request :get_bucket_location
       request :get_bucket_logging
       request :get_bucket_object_versions
@@ -45,6 +47,7 @@ module Fog
       request :post_object_hidden_fields
       request :put_bucket
       request :put_bucket_acl
+      request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
       request :put_bucket_versioning
@@ -189,20 +192,10 @@ module Fog
           @aws_secret_access_key = options[:aws_secret_access_key]
           options[:region] ||= 'us-east-1'
           @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            's3-ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            's3-ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            's3-eu-west-1.amazonaws.com'
           when 'us-east-1'
             's3.amazonaws.com'
-          when 'us-west-1'
-            's3-us-west-1.amazonaws.com'
-          when 'us-west-2'
-            's3-us-west-2.amazonaws.com'
           else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            "s3-#{options[:region]}.amazonaws.com"
           end
           @region = options[:region]
         end
@@ -263,20 +256,10 @@ module Fog
           else
             options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              's3-ap-northeast-1.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
-            when 'eu-west-1'
-              's3-eu-west-1.amazonaws.com'
             when 'us-east-1'
               's3.amazonaws.com'
-            when 'us-west-1'
-              's3-us-west-1.amazonaws.com'
-            when 'us-west-2'
-              's3-us-west-2.amazonaws.com'
             else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+              "s3-#{options[:region]}.amazonaws.com"
             end
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || true
@@ -332,6 +315,7 @@ DATA
           for key in (params[:query] || {}).keys.sort
             if %w{
               acl
+              lifecycle
               location
               logging
               notification

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

@@ -55,6 +55,8 @@ end
 require 'fog/bin/aws'
 require 'fog/bin/bluebox'
 require 'fog/bin/brightbox'
+require 'fog/bin/cloudstack'
+require 'fog/bin/clodo'
 require 'fog/bin/dnsimple'
 require 'fog/bin/dnsmadeeasy'
 require 'fog/bin/dynect'

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

@@ -13,6 +13,8 @@ class AWS < Fog::Bin
         Fog::AWS::CloudWatch
       when :compute
         Fog::Compute::AWS
+      when :ddb, :dynamodb
+        Fog::AWS::DynamoDB
       when :dns
         Fog::DNS::AWS
       when :elasticache
@@ -35,6 +37,8 @@ class AWS < Fog::Bin
         Fog::AWS::RDS
       when :sns
         Fog::AWS::SNS
+      when :sts
+        Fog::AWS::STS
       else
         # @todo Replace most instances of ArgumentError with NotImplementedError
         # @todo For a list of widely supported Exceptions, see:
@@ -56,8 +60,10 @@ class AWS < Fog::Bin
         when :cloud_watch
           Fog::AWS::CloudWatch.new
         when :compute
-          Fog::Logger.warning("AWS[:compute] is not recommended, use Comptue[:aws] for portability")
+          Fog::Logger.warning("AWS[:compute] is not recommended, use Compute[:aws] for portability")
           Fog::Compute.new(:provider => 'AWS')
+        when :ddb, :dynamodb
+          Fog::AWS::DynamoDB.new
         when :dns
           Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
           Fog::DNS.new(:provider => 'AWS')
@@ -84,6 +90,8 @@ class AWS < Fog::Bin
           Fog::Storage.new(:provider => 'AWS')
         when :sns
           Fog::AWS::SNS.new
+        when :sts
+          Fog::AWS::STS.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

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

@@ -14,7 +14,7 @@ class Voxel < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Voxel[:comupte] is not recommended, use Compute[:voxel]] for portability")
+          Fog::Logger.warning("Voxel[:compute] is not recommended, use Compute[:voxel] for portability")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/brightbox-cli/vendor/fog/lib/fog/brightbox/models/compute/server.rb

@@ -16,6 +16,7 @@ module Fog
         attribute :hostname
         attribute :user_data
         attribute :console_url
+        attribute :fqdn
         attribute :console_token
 
         # Times

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

@@ -17,6 +17,12 @@ module Fog
       when :brightbox
         require 'fog/brightbox/compute'
         Fog::Compute::Brightbox.new(attributes)
+      when :cloudstack
+        require 'fog/cloudstack/compute'
+        Fog::Compute::Cloudstack.new(attributes)
+      when :clodo
+        require 'fog/clodo/compute'
+        Fog::Compute::Clodo.new(attributes)
       when :ecloud
         require 'fog/ecloud/compute'
         Fog::Compute::Ecloud.new(attributes)

data/lib/brightbox-cli/vendor/fog/lib/fog/compute/models/server.rb

@@ -13,6 +13,17 @@ module Fog
         Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
       end
 
+      alias_method :scp_upload, :scp
+
+      def scp_download(remote_path, local_path, download_options = {})
+        require 'net/scp'
+        requires :public_ip_address, :username
+
+        scp_options = {}
+        scp_options[:key_data] = [private_key] if private_key
+        Fog::SCP.new(public_ip_address, username, scp_options).download(remote_path, local_path, download_options)
+      end
+
       def ssh(commands, options={})
         require 'net/ssh'
         requires :public_ip_address, :username

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

@@ -5,7 +5,6 @@ $LOAD_PATH.unshift __LIB_DIR__ unless
   $LOAD_PATH.include?(File.expand_path(__LIB_DIR__))
 
 # external core dependencies
-require 'rubygems'
 require 'base64'
 require 'cgi'
 require 'uri'

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

@@ -16,7 +16,6 @@ module Fog
           block = lambda { |chunk, remaining, total| body << chunk }
         end
       end
-
       response = @excon.request(params, &block)
       
       if parser

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

@@ -38,6 +38,8 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :bluebox_customer_id:
   :brightbox_client_id:
   :brightbox_secret:
+  :clodo_api_key:
+  :clodo_username:
   :go_grid_api_key:
   :go_grid_shared_secret:
   :google_storage_access_key_id:
@@ -69,6 +71,9 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :dnsimple_password:
   :dnsmadeeasy_api_key:
   :dnsmadeeasy_secret_key:
+  :cloudstack_host:
+  :cloudstack_api_key:
+  :cloudstack_secret_access_key:
   :vsphere_server:
   :vsphere_username:
   :vsphere_password:

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

@@ -27,6 +27,10 @@ module Fog
         Fog::Mock.not_implemented
       end
 
+      def download(remote_path, local_path, download_options = {})
+        Fog::Mock.not_implemented
+      end
+
     end
 
     class Real
@@ -45,10 +49,22 @@ module Fog
         @options  = { :paranoid => false }.merge(options)
       end
 
-      def upload(local_path, remote_path, upload_options = {} )
+      def upload(local_path, remote_path, upload_options = {})
+        begin
+          Net::SCP.start(@address, @username, @options) do |scp|
+            scp.upload!(local_path, remote_path, upload_options) do |ch, name, sent, total|
+              # TODO: handle progress display?
+            end
+          end
+        rescue Exception => error
+          raise error
+        end
+      end
+
+      def download(remote_path, local_path, download_options = {})
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
-            scp.upload!(local_path, remote_path, upload_options ) do |ch, name, sent, total|
+            scp.download!(remote_path, local_path, download_options) do |ch, name, sent, total|
               # TODO: handle progress display?
             end
           end

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

@@ -4,7 +4,7 @@ module Fog
     duration = 0
     start = Time.now
     until yield || duration > timeout
-      sleep(interval)
+      sleep(interval.to_f)
       duration = Time.now - start
     end
     if duration > timeout

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

@@ -68,7 +68,7 @@ module Fog
         # :dnsmadeeasy_secret_key in order to create a connection
         #
         # ==== Examples
-        #   dns = Fog::DNSMadeEasy::DNS.new(
+        #   dns = Fog::DNS::DNSMadeEasy.new(
         #     :dnsmadeeasy_api_key => your_dnsmadeeasy_api_key,
         #     :dnsmadeeasy_secret_key => your_dnsmadeeasy_secret_key
         #   )

data/lib/brightbox-cli/vendor/fog/lib/fog/dynect/models/dns/records.rb

@@ -11,10 +11,10 @@ module Fog
 
         model Fog::DNS::Dynect::Record
 
-        def all
+        def all(options = {})
           requires :zone
           data = []
-          connection.get_node_list(zone.domain).body['data'].each do |fqdn|
+          connection.get_node_list(zone.domain, options).body['data'].each do |fqdn|
             records = connection.get_record('ANY', zone.domain, fqdn).body['data']
 
             # data in format ['/REST/xRecord/domain/fqdn/identity]

data/lib/brightbox-cli/vendor/fog/lib/fog/dynect/requests/dns/get_node_list.rb

@@ -11,10 +11,11 @@ module Fog
         #   * fqdn<~String> - fully qualified domain name of node to lookup
 
         def get_node_list(zone, options = {})
+          requested_fqdn = options['fqdn'] || options[:fqdn]
           request(
             :expects  => 200,
             :method   => :get,
-            :path     => ['NodeList', zone, options['fqdn']].compact.join('/')
+            :path     => ['NodeList', zone, requested_fqdn].compact.join('/')
           )
         end
       end

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

@@ -1184,7 +1184,7 @@ module Fog
         end
 
         def supporting_versions
-          ["v0.8b-ext2.6", "0.8b-ext2.6"]
+          ["v0.8b-ext2.6", "0.8b-ext2.6", "v0.8b-ext2.8" , "0.8b-ext2.8"]
         end
 
         private

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/add_backup_internet_service.rb

@@ -7,7 +7,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Backup Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/add_internet_service.rb

@@ -15,7 +15,7 @@ module Fog
                             [:type, :url_send_string, :http_headers, :receive_string, :is_enabled]
                           end
 
-          unless required_opts.all? { |opt| monitor.keys.include?(opt) && monitor[opt] }
+          unless required_opts.all? { |opt| monitor.has_key?(opt) && monitor[opt] }
             raise ArgumentError.new("Required Monitor data missing: #{(required_opts - monitor.keys).map(&:inspect).join(", ")}")
           end
 
@@ -36,7 +36,7 @@ module Fog
           if configure
             required_opts + [ :id, :href, :timeout ]
           end
-          unless required_opts.all? { |opt| service_data.keys.include?(opt) }
+          unless required_opts.all? { |opt| service_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(required_opts - service_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/add_node.rb

@@ -20,7 +20,7 @@ module Fog
           if configure
             valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
           end
-          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| node_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/configure_internet_service.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_public_ip_address_data(ip_address_data)
           valid_opts = [:name, :href, :id]
-          unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/brightbox-cli/vendor/fog/lib/fog/ecloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end