fog 1.11.1 → 1.12.0

data/lib/fog/aws/storage.rb

@@ -33,6 +33,7 @@ module Fog
         response-content-language
         response-content-type
         response-expires
+        restore
         torrent
         uploadId
         uploads
@@ -87,6 +88,7 @@ module Fog
       request :list_multipart_uploads
       request :list_parts
       request :post_object_hidden_fields
+      request :post_object_restore
       request :put_bucket
       request :put_bucket_acl
       request :put_bucket_cors
@@ -201,8 +203,6 @@ module Fog
             if !path_style && COMPLIANT_BUCKET_NAMES !~ bucket_name
               Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
               path_style = true
-            elsif bucket_name.include?('.')
-              Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) might fail with https.")
             end
 
             if path_style
@@ -219,7 +219,7 @@ module Fog
             :path         => path,
             :headers      => headers,
           })
-          
+
           #
           ret.delete(:path_style)
           ret.delete(:bucket_name)
@@ -451,7 +451,7 @@ DATA
               if VALID_QUERY_KEYS.include?(key)
                 value = params[:query][key]
                 if value
-                  query_args << "#{key}=#{Fog::AWS.escape(value.to_s)}"
+                  query_args << "#{key}=#{value}"
                 else
                   query_args << key
                 end
@@ -492,7 +492,7 @@ DATA
 
           expires = Fog::Time.now.to_date_header
           signature = signature(params, expires)
-          
+
           params = request_params(params)
           params.delete(:port) unless params[:port]
 

data/lib/fog/billing.rb

@@ -0,0 +1,23 @@
+module Fog
+  module Billing
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
+
+    def self.new(attributes)
+      attributes = attributes.dup
+      provider = attributes.delete(:provider).to_s.downcase.to_sym
+      if provider == :stormondemand
+        require 'fog/storm_on_demand/billing'
+        Fog::Billing::StormOnDemand.new(attributes)
+      else
+        raise ArgumentError.new("#{provider} has no billing service")
+      end
+    end
+
+    def self.providers
+      Fog.services[:billing]
+    end
+  end
+end

data/lib/fog/bin.rb

@@ -94,3 +94,5 @@ require 'fog/bin/vsphere'
 require 'fog/bin/voxel'
 require 'fog/bin/xenserver'
 require 'fog/bin/zerigo'
+require 'fog/bin/cloudsigma'
+require 'fog/bin/openvz'

data/lib/fog/bin/cloudsigma.rb

@@ -0,0 +1,29 @@
+class CloudSigma < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+        when :compute
+          Fog::Compute::CloudSigma
+        else
+          raise ArgumentError, "Unrecognized service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+                      when :compute
+                        Fog::Compute.new(:provider => 'CloudSigma')
+                      else
+                        raise ArgumentError, "Unrecognized service: #{key.inspect}"
+                    end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::CloudSigma.services
+    end
+  end
+end

data/lib/fog/bin/openvz.rb

@@ -0,0 +1,31 @@
+class Openvz < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::Compute::Openvz
+      else
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Logger.warning("Openvz[:compute] is not recommended, use Compute[:openvz] for portability")
+          Fog::Compute.new(:provider => 'Openvz')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::Openvz.services
+    end
+
+  end
+end

data/lib/fog/bluebox/models/dns/zone.rb

@@ -19,7 +19,6 @@ module Fog
         attribute :minimum
 
         def initialize(attributes = {})
-          self.ttl ||= 3600
           super(attributes)
         end
 
@@ -51,6 +50,7 @@ module Fog
         end
 
         def save
+          self.ttl ||= 3600
           requires :domain, :ttl
           options = attributes.dup
           options[:name] = options.delete(:domain)

data/lib/fog/brightbox/compute.rb

@@ -71,15 +71,15 @@ module Fog
       request :create_load_balancer
       request :create_server
       request :create_server_group
-      request :destroy_api_client
-      request :destroy_application
-      request :destroy_cloud_ip
-      request :destroy_firewall_policy
-      request :destroy_firewall_rule
-      request :destroy_image
-      request :destroy_load_balancer
-      request :destroy_server
-      request :destroy_server_group
+      request :delete_api_client
+      request :delete_application
+      request :delete_cloud_ip
+      request :delete_firewall_policy
+      request :delete_firewall_rule
+      request :delete_image
+      request :delete_load_balancer
+      request :delete_server
+      request :delete_server_group
       request :get_account
       request :get_api_client
       request :get_application
@@ -244,6 +244,12 @@ module Fog
           @credentials.refresh_token
         end
 
+        # Returns the current token expiry time in seconds or nil
+        # @return [Number,nil]
+        def expires_in
+          @credentials.expires_in
+        end
+
         # Requests a new access token
         #
         # @return [String] New access token

data/lib/fog/brightbox/oauth2.rb

@@ -37,7 +37,7 @@ module Fog::Brightbox::OAuth2
   #
   class CredentialSet
     attr_reader :client_id, :client_secret, :username, :password
-    attr_reader :access_token, :refresh_token
+    attr_reader :access_token, :refresh_token, :expires_in
     #
     # @param [String] client_id
     # @param [String] client_secret
@@ -52,6 +52,7 @@ module Fog::Brightbox::OAuth2
       @password      = options[:password]
       @access_token  = options[:access_token]
       @refresh_token = options[:refresh_token]
+      @expires_in    = options[:expires_in]
     end
 
     # Returns true if user details are available
@@ -71,9 +72,10 @@ module Fog::Brightbox::OAuth2
     end
 
     # Updates the credentials with newer tokens
-    def update_tokens(access_token, refresh_token = nil)
+    def update_tokens(access_token, refresh_token = nil, expires_in = nil)
       @access_token  = access_token
       @refresh_token = refresh_token
+      @expires_in    = expires_in
     end
 
     # Based on available credentials returns the best strategy
@@ -159,6 +161,6 @@ private
   #
   def update_credentials_from_response(credentials, response)
     response_data = Fog::JSON.decode(response.body)
-    credentials.update_tokens(response_data["access_token"], response_data["refresh_token"])
+    credentials.update_tokens(response_data["access_token"], response_data["refresh_token"], response_data["expires_in"])
   end
 end

data/lib/fog/brightbox/requests/compute/activate_console_server.rb

@@ -6,7 +6,7 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_activate_console_server
         #

data/lib/fog/brightbox/requests/compute/add_listeners_load_balancer.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [Array] :listeners Array of Listener parameters. Timeout is optional and specified in milliseconds.
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_add_listeners_load_balancer
         #

data/lib/fog/brightbox/requests/compute/add_nodes_load_balancer.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [Array] :nodes Array of Node parameters
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_add_nodes_load_balancer
         #

data/lib/fog/brightbox/requests/compute/add_servers_server_group.rb

@@ -6,14 +6,22 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         # @param [Hash] options
-        # @option options [Array<Hash>] :servers Array of Hashes containing `{"server" => server_id}` for each server to add
+        # @option options [Array<Hash>] :servers Array of Hashes containing
+        #   +{"server" => server_id}+ for each server to add
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_group_add_servers_server_group
         #
         # @example
-        #    Compute[:brightbox].add_servers_server_group "grp-12345", :servers => [{"server" => "srv-abcde"}, {"server" => "srv-fghij"}]
+        #   options = {
+        #     :servers => [
+        #       {"server" => "srv-abcde"},
+        #       {"server" => "srv-fghij"}
+        #     ]
+        #   }
+        #   Compute[:brightbox].add_servers_server_group "grp-12345", options
         #
         def add_servers_server_group(identifier, options)
           return nil if identifier.nil? || identifier == ""

data/lib/fog/brightbox/requests/compute/apply_to_firewall_policy.rb

@@ -8,7 +8,8 @@ module Fog
         # @param [Hash] options
         # @option options [String] :server_group Server Group to apply to
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_policy_apply_to_firewall_policy
         #

data/lib/fog/brightbox/requests/compute/create_api_client.rb

@@ -8,7 +8,8 @@ module Fog
         # @option options [String] :name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#api_client_create_api_client
         #

data/lib/fog/brightbox/requests/compute/create_application.rb

@@ -8,7 +8,8 @@ module Fog
         # @option options [String] :name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#application_create_application
         #

data/lib/fog/brightbox/requests/compute/create_cloud_ip.rb

@@ -9,7 +9,8 @@ module Fog
         # @option options [String] :name Name for Cloud IP
         # @option options [Array] :port_translators Port on which external clients connect and port on which your service is listening.
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#cloud_ip_create_cloud_ip
         #

data/lib/fog/brightbox/requests/compute/create_firewall_policy.rb

@@ -11,7 +11,8 @@ module Fog
         # @option options [String] :name Editable label
         # @option options [String] :description Longer editable description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_policy_create_firewall_policy
         #

data/lib/fog/brightbox/requests/compute/create_firewall_rule.rb

@@ -14,7 +14,8 @@ module Fog
         # @option options [String] :icmp_type_name
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#firewall_rule_create_firewall_rule
         #

data/lib/fog/brightbox/requests/compute/create_image.rb

@@ -15,7 +15,8 @@ module Fog
         # @option options [Boolean] :compatibility_mode
         # @option options [String] :description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#image_create_image
         #

data/lib/fog/brightbox/requests/compute/create_load_balancer.rb

@@ -11,7 +11,8 @@ module Fog
         # @option options [Array] :listeners What port to listen on, port to pass through to and protocol (tcp, http or http+ws) of listener. Timeout is optional and specified in milliseconds (default is 50000).
         # @option options [String] :healthcheck Healthcheck options - only "port" and "type" required
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#load_balancer_create_load_balancer
         #

data/lib/fog/brightbox/requests/compute/create_server.rb

@@ -14,7 +14,8 @@ module Fog
         # @option options [String] :user_data
         # @option options [Array] :server_groups Array of server groups to add server to
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_create_server
         #

data/lib/fog/brightbox/requests/compute/create_server_group.rb

@@ -8,7 +8,8 @@ module Fog
         # @option options [String] :name Editable user label
         # @option options [String] :description Editable user description
         #
-        # @return [Hash, nil] The JSON response parsed to a Hash or nil if no options passed
+        # @return [Hash] if successful Hash version of JSON object
+        # @return [NilClass] if no options were passed
         #
         # @see https://api.gb1.brightbox.com/1.0/#server_group_create_server_group
         #

data/lib/fog/brightbox/requests/compute/{destroy_api_client.rb → delete_api_client.rb}

@@ -6,15 +6,22 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
-        # @see https://api.gb1.brightbox.com/1.0/#api_client_destroy_api_client
+        # @see https://api.gb1.brightbox.com/1.0/#api_client_delete_api_client
         #
-        def destroy_api_client(identifier)
+        def delete_api_client(identifier)
           return nil if identifier.nil? || identifier == ""
           wrapped_request("delete", "/1.0/api_clients/#{identifier}", [200])
         end
 
+        # Old format of the delete request.
+        #
+        # @deprecated Use +#delete_api_client+ instead
+        #
+        def destroy_api_client(identifier)
+          delete_api_client(identifier)
+        end
       end
     end
   end

data/lib/fog/brightbox/requests/compute/{destroy_application.rb → delete_application.rb}

@@ -6,15 +6,22 @@ module Fog
         #
         # @param [String] identifier Unique reference to identify the resource
         #
-        # @return [Hash] The JSON response parsed to a Hash
+        # @return [Hash] if successful Hash version of JSON object
         #
-        # @see https://api.gb1.brightbox.com/1.0/#application_destroy_application
+        # @see https://api.gb1.brightbox.com/1.0/#application_delete_application
         #
-        def destroy_application(identifier)
+        def delete_application(identifier)
           return nil if identifier.nil? || identifier == ""
           wrapped_request("delete", "/1.0/applications/#{identifier}", [200])
         end
 
+        # Old format of the delete request.
+        #
+        # @deprecated Use +#delete_application+ instead
+        #
+        def destroy_application(identifier)
+          delete_application(identifier)
+        end
       end
     end
   end