fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/aws/storage.rb

@@ -34,6 +34,7 @@ module Fog
         response-content-type
         response-expires
         restore
+        tagging
         torrent
         uploadId
         uploads
@@ -44,7 +45,7 @@ module Fog
       ]
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
+      recognizes :endpoint, :region, :host, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :path_style
 
       secrets    :aws_secret_access_key, :hmac
 
@@ -65,6 +66,7 @@ module Fog
       request :delete_bucket_website
       request :delete_object
       request :delete_multiple_objects
+      request :delete_bucket_tagging
       request :get_bucket
       request :get_bucket_acl
       request :get_bucket_cors
@@ -73,6 +75,7 @@ module Fog
       request :get_bucket_logging
       request :get_bucket_object_versions
       request :get_bucket_policy
+      request :get_bucket_tagging
       request :get_bucket_versioning
       request :get_bucket_website
       request :get_object
@@ -95,6 +98,7 @@ module Fog
       request :put_bucket_lifecycle
       request :put_bucket_logging
       request :put_bucket_policy
+      request :put_bucket_tagging
       request :put_bucket_versioning
       request :put_bucket_website
       request :put_object
@@ -161,11 +165,19 @@ module Fog
         end
 
         def object_to_path(object_name=nil)
-          '/' + Fog::AWS.escape(object_name.to_s).gsub('%2F','/')
+          '/' + escape(object_name.to_s).gsub('%2F','/')
         end
 
         def bucket_to_path(bucket_name, path=nil)
-          "/#{Fog::AWS.escape(bucket_name.to_s)}#{path}"
+          "/#{escape(bucket_name.to_s)}#{path}"
+        end
+
+        # NOTE: differs from Fog::AWS.escape by NOT escaping `/`
+        def escape(string)
+          string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
+          string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
+            "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+          }
         end
 
         # Transforms things like bucket_name, object_name, region
@@ -176,9 +188,9 @@ module Fog
 
           if params[:scheme]
             scheme = params[:scheme]
-            port   = params[:port]
+            port   = params[:port] || DEFAULT_SCHEME_PORT[scheme]
           else
-            scheme = @scheme || DEFAULT_SCHEME
+            scheme = @scheme
             port   = @port
           end
           if DEFAULT_SCHEME_PORT[scheme] == port
@@ -217,7 +229,7 @@ module Fog
             :host         => host,
             :port         => port,
             :path         => path,
-            :headers      => headers,
+            :headers      => headers
           })
 
           #
@@ -232,7 +244,7 @@ module Fog
         def params_to_url(params)
           query = params[:query] && params[:query].map do |key, value|
             if value
-              [key, Fog::AWS.escape(value.to_s)].join('=')
+              [key, escape(value.to_s)].join('=')
             else
               key
             end
@@ -324,7 +336,8 @@ module Fog
                 :buckets => {},
                 :cors => {
                   :bucket => {}
-                }
+                },
+                :bucket_tagging => {}
               }
             end
           end
@@ -395,27 +408,19 @@ module Fog
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
-            @path = if endpoint.path.empty?
-              '/'
-            else
-              endpoint.path
-            end
             @scheme = endpoint.scheme
             @port = endpoint.port
           else
             @region     = options[:region]      || DEFAULT_REGION
             @host       = options[:host]        || region_to_host(@region)
-            @path       = options[:path]        || '/'
             @scheme     = options[:scheme]      || DEFAULT_SCHEME
             @port       = options[:port]        || DEFAULT_SCHEME_PORT[@scheme]
             @path_style = options[:path_style]  || false
           end
-
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload
-          @connection.reset
+          @connection.reset if @connection
         end
 
         def signature(params, expires)
@@ -485,6 +490,20 @@ DATA
           @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
         end
 
+        def connection(scheme, host, port)
+          uri = "#{scheme}://#{host}:#{port}"
+          if @persistent
+            unless uri == @connection_uri
+              @connection_uri = uri
+              reload
+              @connection = nil
+            end
+          else
+            @connection = nil
+          end
+          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+        end
+
         def request(params, &block)
           refresh_credentials_if_expired
 
@@ -494,7 +513,9 @@ DATA
           signature = signature(params, expires)
 
           params = request_params(params)
-          params.delete(:port) unless params[:port]
+          scheme = params.delete(:scheme)
+          host   = params.delete(:host)
+          port   = params.delete(:port) || DEFAULT_SCHEME_PORT[scheme]
 
           params[:headers]['Date'] = expires
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature}"
@@ -502,12 +523,12 @@ DATA
           original_params = params.dup
 
           begin
-            response = @connection.request(params, &block)
+            response = connection(scheme, host, port).request(params, &block)
           rescue Excon::Errors::TemporaryRedirect => error
             headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers)
             uri = URI.parse(headers['Location'])
             Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
-            response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false, @connection_options).request(original_params, &block)
+            response = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
           end
 
           response

data/lib/fog/aws.rb

@@ -1,7 +1,7 @@
 require 'fog/core'
 require 'fog/aws/credential_fetcher'
 require 'fog/aws/signaturev4'
-require 'unicode'
+
 module Fog
   module AWS
     extend Fog::Provider
@@ -86,8 +86,16 @@ module Fog
     end
 
     def self.escape(string)
-      string = Unicode::normalize_C(string)
-      string.gsub(/([^a-zA-Z0-9_.\-~\/]+)/) {
+      unless @unf_loaded_or_warned
+        begin
+          require('unf/normalizer')
+        rescue LoadError
+          Fog::Logger.warning("Unable to load the 'unf' gem. Your AWS strings may not be properly encoded.")
+        end
+        @unf_loaded_or_warned = true
+      end
+      string = defined?(::UNF::Normalizer) ? ::UNF::Normalizer.normalize(string, :nfc) : string
+      string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
         "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
       }
     end

data/lib/fog/bin/hp.rb

@@ -5,10 +5,18 @@ class HP < Fog::Bin
       case key
       when :block_storage
         Fog::HP::BlockStorage
+      when :block_storage_v2
+        Fog::HP::BlockStorageV2
       when :cdn
         Fog::CDN::HP
       when :compute
         Fog::Compute::HP
+      when :dns
+        Fog::HP::DNS
+      when :lb
+        Fog::HP::LB
+      when :network
+        Fog::HP::Network
       when :storage
         Fog::Storage::HP
       else
@@ -20,13 +28,22 @@ class HP < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :block_storage
+          Fog::Logger.deprecation "HP Cloud Block Storage V1 service will be soon deprecated. Please use `Fog::HP::BlockStorageV2` provider to use latest HP Cloud Block Storage service."
           Fog::HP::BlockStorage.new
+        when :block_storage_v2
+          Fog::HP::BlockStorageV2.new
         when :cdn
           Fog::Logger.warning("HP[:cdn] is deprecated, use CDN[:hp] instead")
           Fog::CDN.new(:provider => 'HP')
         when :compute
           Fog::Logger.warning("HP[:compute] is deprecated, use Compute[:hp] instead")
           Fog::Compute.new(:provider => 'HP')
+        when :dns
+          Fog::HP::DNS.new
+        when :lb
+          Fog::HP::LB.new
+        when :network
+          Fog::HP::Network.new
         when :storage
           Fog::Logger.warning("HP[:storage] is deprecated, use Storage[:hp] instead")
           Fog::Storage.new(:provider => 'HP')

data/lib/fog/bin/rackspace.rb

@@ -25,6 +25,8 @@ class Rackspace < Fog::Bin
         Fog::Rackspace::Databases
       when :monitoring
         Fog::Rackspace::Monitoring
+      when :queues
+        Fog::Rackspace::Queues
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -60,6 +62,8 @@ class Rackspace < Fog::Bin
           Fog::Rackspace::BlockStorage.new
         when :monitoring
           Fog::Rackspace::Monitoring.new
+        when :queues
+          Fog::Rackspace::Queues.new
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -18,6 +18,16 @@ module Fog
         attribute :healthcheck
         attribute :listeners
 
+        # These SSL attributes act only as setters. You can not read certs or keys via the API
+        attribute :certificate_pem
+        attribute :certificate_private_key
+
+        # These SSL attributes act only as getters for metadata
+        attribute :certificate_valid_from
+        attribute :certificate_expires_at
+        attribute :certificate_issuer
+        attribute :certificate_subject
+
         # Times
         attribute :created_at, :type => :time
         attribute :deleted_at, :type => :time
@@ -39,7 +49,9 @@ module Fog
             :listeners => listeners,
             :healthcheck => healthcheck,
             :policy => policy,
-            :name => name
+            :name => name,
+            :certificate_pem => certificate_pem,
+            :certificate_private_key => certificate_private_key
           }.delete_if {|k,v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)
@@ -52,8 +64,47 @@ module Fog
           true
         end
 
-      end
+        # SSL cert metadata for expiration of certificate
+        def certificate_expires_at
+          attributes[:certificate_expires_at]
+        end
+
+        # SSL cert metadata for subject
+        def certificate_subject
+          attributes[:certificate_subject]
+        end
 
+        # Sets the certificate metadata from the JSON object that contains it.
+        #
+        # It is used by fog's attribute setting and should not be used for attempting to set a
+        # certificate on a load balancer.
+        #
+        # @private
+        def certificate=(cert_metadata)
+          if cert_metadata
+            attributes[:certificate_valid_from] = time_or_original(cert_metadata["valid_from"])
+            attributes[:certificate_expires_at] = time_or_original(cert_metadata["expires_at"])
+            attributes[:certificate_issuer] = cert_metadata["issuer"]
+            attributes[:certificate_subject] = cert_metadata["subject"]
+          else
+            attributes[:certificate_valid_from] = nil
+            attributes[:certificate_expires_at] = nil
+            attributes[:certificate_issuer] = nil
+            attributes[:certificate_subject] = nil
+          end
+        end
+
+      private
+
+        def time_or_original(value)
+          begin
+            Time.parse(value)
+          rescue TypeError, ArgumentError
+            value
+          end
+        end
+
+      end
     end
   end
 end

data/lib/fog/cloudstack/models/compute/server.rb

@@ -87,6 +87,7 @@ module Fog
             'zoneid'            => zone_id,
             'networkids'        => network_ids,
             'diskofferingid'    => disk_offering_id,
+            'name'              => name,
             'displayname'       => display_name,
             'group'             => group,
             'domainid'          => domain_id,

data/lib/fog/compute.rb

@@ -14,6 +14,17 @@ module Fog
       when :gogrid
         require 'fog/go_grid/compute'
         Fog::Compute::GoGrid.new(attributes)
+      when :hp
+        version = attributes.delete(:version)
+        version = version.to_s.downcase.to_sym unless version.nil?
+        if version == :v2
+          require 'fog/hp/compute_v2'
+           Fog::Compute::HPV2.new(attributes)
+        else
+          Fog::Logger.deprecation "HP Cloud Compute V1 service will be soon deprecated. Please use `:version => v2` attribute to use HP Cloud Compute V2 service."
+          require 'fog/hp/compute'
+          Fog::Compute::HP.new(attributes)
+        end
       when :new_servers
         require 'fog/bare_metal_cloud/compute'
         Fog::Logger.deprecation "`new_servers` is deprecated. Please use `bare_metal_cloud` instead."
@@ -38,9 +49,9 @@ module Fog
       when :vcloud
         require 'fog/vcloud/compute'
         Fog::Vcloud::Compute.new(attributes)
-      when :vcloud_director
+      when :vclouddirector
         require 'fog/vcloud_director/compute'
-        Fog::VcloudDirector::Compute.new(attributes)
+        Fog::Compute::VcloudDirector.new(attributes)
       else
         if self.providers.include?(provider)
           require "fog/#{provider}/compute"

data/lib/fog/core/class_from_string.rb

@@ -0,0 +1,26 @@
+module Fog
+   # get class by string or nil
+   def self.class_from_string classname, defaultpath=""
+     if classname and classname.is_a? String then
+        chain = classname.split("::")
+        klass = Kernel
+        chain.each do |klass_string|
+           klass = klass.const_get klass_string
+        end
+        if klass.is_a? Class then
+           klass
+        elsif defaultpath != nil then
+           Fog.class_from_string((defaultpath.split("::")+chain).join("::"), nil)
+        else
+           nil
+        end
+     elsif classname and classname.is_a? Class then
+        classname
+     else
+        nil
+     end
+   rescue NameError
+     defaultpath != nil ? Fog.class_from_string((defaultpath.split("::")+chain).join("::"), nil) : nil
+   end
+end
+

data/lib/fog/core/logger.rb

@@ -5,7 +5,7 @@ module Fog
       :deprecation  => ::STDOUT,
       :warning      => ::STDOUT
     }
-    
+
     @channels[:debug] = ::STDOUT if ENV['DEBUG']
 
     def self.[](channel)
@@ -17,20 +17,19 @@ module Fog
     end
 
     def self.debug(message)
-      self.write(:debug, "[light_black][DEBUG] #{message}[/]\n")
+      self.write(:debug, "[light_black][fog][DEBUG] #{message}[/]\n")
     end
 
     def self.deprecation(message)
-      self.write(:deprecation, "[yellow][DEPRECATION] #{message}[/]\n")
+      self.write(:deprecation, "[yellow][fog][DEPRECATION] #{message}[/]\n")
     end
 
     def self.warning(message)
-      self.write(:warning, "[yellow][WARNING] #{message}[/]\n")
+      self.write(:warning, "[yellow][fog][WARNING] #{message}[/]\n")
     end
 
     def self.write(key, value)
       if channel = @channels[key]
-        value.gsub(Formatador::INDENT_REGEX, '')
         message = if channel.tty?
           value.gsub(Formatador::PARSE_REGEX) { "\e[#{Formatador::STYLES[$1.to_sym]}m" }.gsub(Formatador::INDENT_REGEX, '')
         else

data/lib/fog/core/service.rb

@@ -211,7 +211,7 @@ module Fog
         unless recognizes.empty?
           unrecognized = options.keys - requirements - recognized
           unless unrecognized.empty?
-            raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}"
+            Fog::Logger.warning("Unrecognized arguments: #{unrecognized.join(', ')}")
           end
         end
       end

data/lib/fog/core/uuid.rb

@@ -0,0 +1,23 @@
+require 'securerandom'
+
+module Fog
+  class UUID
+    class << self
+
+      def uuid
+        if supported?
+          SecureRandom.uuid
+        else
+          ary = SecureRandom.random_bytes(16).unpack("NnnnnN")
+          ary[2] = (ary[2] & 0x0fff) | 0x4000
+          ary[3] = (ary[3] & 0x3fff) | 0x8000
+          "%08x-%04x-%04x-%04x-%04x%08x" % ary
+        end
+      end
+
+      def supported?
+        SecureRandom.respond_to?(:uuid)
+      end
+    end
+  end
+end

data/lib/fog/core.rb

@@ -30,6 +30,8 @@ require 'fog/core/scp'
 require 'fog/core/time'
 require 'fog/core/timeout'
 require 'fog/core/wait_for'
+require 'fog/core/class_from_string'
+require 'fog/core/uuid'
 
 # data exchange specific (to be extracted and used on a per provider basis)
 require 'fog/xml'

data/lib/fog/dynect/dns.rb

@@ -91,7 +91,7 @@ module Fog
             params[:headers]['Auth-Token'] = auth_token unless params[:path] == 'Session'
             params[:path] = "#{@path}/#{params[:path]}" unless params[:path] =~ %r{^#{Regexp.escape(@path)}/}
 
-            response = @connection.request(params.merge!({:host => @host}))
+            response = @connection.request(params)
 
             if response.body.empty?
               response.body = {}

data/lib/fog/ecloud/compute.rb

@@ -10,8 +10,10 @@ module Fog
       attr_reader :authentication_method, :version
 
       #### Credentials
-      #requires 
-      recognizes :ecloud_username, :ecloud_password, :ecloud_version, :ecloud_access_key, :ecloud_private_key, :ecloud_authentication_method
+      #requires
+      recognizes :ecloud_username, :ecloud_password, :ecloud_version,
+                 :ecloud_access_key, :ecloud_private_key,
+                 :ecloud_authentication_method
 
       #### Models
       model_path 'fog/ecloud/models/compute'
@@ -245,6 +247,7 @@ module Fog
 
       module Shared
 
+        attr_accessor :base_path
         attr_reader :versions_uri
 
         def validate_data(required_opts = [], options = {})
@@ -258,7 +261,7 @@ module Fog
         end
 
         def default_organization_uri
-          "/cloudapi/ecloud/organizations/"
+          "#{@base_path}/organizations"
         end
       end
 
@@ -283,6 +286,7 @@ module Fog
 
         def initialize(options = {})
           require 'fog/core/parser'
+          @base_path               = options[:base_path] || '/cloudapi/ecloud'
           @connections             = {}
           @connection_options      = options[:connection_options] || {}
           @host                    = options[:ecloud_host] || API_URL
@@ -793,6 +797,7 @@ module Fog
         end
 
         def initialize(options={})
+          @base_path = '/cloudapi/ecloud'
           @ecloud_api_key = options[:ecloud]
         end
 

data/lib/fog/ecloud/models/compute/admin_organization.rb

@@ -11,19 +11,19 @@ module Fog
         attribute :support_access,      :aliases => :SupportAccess
 
         def ssh_keys
-          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/sshKeys/organizations/#{organization.id}")
+          @ssh_keys = Fog::Compute::Ecloud::SshKeys.new(:service => service, :href => "#{service.base_path}/admin/sshKeys/organizations/#{organization.id}")
         end
 
         def password_complexity_rules
-          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/passwordComplexityRules")
+          @password_complexity_rules = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/passwordComplexityRules")
         end
 
         def login_banner
-          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/loginBanner")
+          @login_banner = Fog::Compute::Ecloud::LoginBanner.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/loginBanner")
         end
 
         def authentication_levels
-          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:service => service, :href => "/cloudapi/ecloud/admin/organizations/#{organization.id}/authenticationLevels")
+          @authentication_levels = Fog::Compute::Ecloud::AuthenticationLevels.new(:service => service, :href => "#{service.base_path}/admin/organizations/#{organization.id}/authenticationLevels")
         end
 
         def id

data/lib/fog/ecloud/models/compute/catalog_item.rb

@@ -12,7 +12,7 @@ module Fog
         attribute :files, :aliases => :Files
 
         def configuration
-          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/#{id}/configuration")
+          @configuration = Fog::Compute::Ecloud::CatalogConfigurations.new(:service => service, :href => "#{service.base_path}/admin/catalog/#{id}/configuration")
         end
 
         def id

data/lib/fog/ecloud/models/compute/compute_pool.rb

@@ -15,37 +15,37 @@ module Fog
         attribute :memory_burst, :aliases => :MemoryBurst
 
         def servers
-          @servers ||= Fog::Compute::Ecloud::Servers.new( :service => service, :href => "/cloudapi/ecloud/virtualMachines/computePools/#{id}" )
+          @servers ||= Fog::Compute::Ecloud::Servers.new( :service => service, :href => "#{service.base_path}/virtualMachines/computePools/#{id}" )
         end
 
         def layout
-          @layout ||= Fog::Compute::Ecloud::Layouts.new(:service => service, :href => "/cloudapi/ecloud/layout/computePools/#{id}").first
+          @layout ||= Fog::Compute::Ecloud::Layouts.new(:service => service, :href => "#{service.base_path}/layout/computePools/#{id}").first
         end
 
         def cpu_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/cpu")
+          @cpu_usage ||= Fog::Compute::Ecloud::CpuUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/cpu")
         end
 
         def memory_usage
 #          time ? query = "/details?time=#{Time.parse(time).utc.strftime('%Y-%m-%dT%H:%M:%SZ')}" : query = ""
-          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/memory")
+          @memory_usage ||= Fog::Compute::Ecloud::MemoryUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/memory")
         end
 
         def storage_usage
-          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:service => service, :href => "/cloudapi/ecloud/computePools/#{id}/usage/storage")
+          @storage_usage ||= Fog::Compute::Ecloud::StorageUsageDetailSummary.new(:service => service, :href => "#{service.base_path}/computePools/#{id}/usage/storage")
         end
 
         def operating_system_families
-          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:service => service, :href => "/cloudapi/ecloud/operatingSystemFamilies/computePools/#{id}")
+          @operating_system_families ||= Fog::Compute::Ecloud::OperatingSystemFamilies.new(:service => service, :href => "#{service.base_path}/operatingSystemFamilies/computePools/#{id}")
         end
 
         def templates
-          @templates ||= self.service.templates(:href => "/cloudapi/ecloud/templates/computePools/#{id}")
+          @templates ||= self.service.templates(:href => "#{service.base_path}/templates/computePools/#{id}")
         end
 
         def detached_disks
-          @detached_disks ||= self.service.detached_disks(:href => "/cloudapi/ecloud/detacheddisks/computepools/#{id}")
+          @detached_disks ||= self.service.detached_disks(:href => "#{service.base_path}/detacheddisks/computepools/#{id}")
         end
 
         def environment