fog 1.18.0 → 1.19.0

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

@@ -3,9 +3,7 @@ require 'fog/core/model'
 module Fog
   module Compute
     class Brightbox
-
       class Application < Fog::Model
-
         identity :id
         attribute :url
         attribute :name
@@ -15,12 +13,11 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           options = {
             :name => name
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_application(options)
           merge_attributes(data)
           true
         end
-
       end
     end
   end

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

@@ -26,13 +26,16 @@ module Fog
         attribute :port_translators
         attribute :name
 
+        # Attempt to map or point the Cloud IP to the destination resource.
+        #
+        # @param [Object] destination
+        #
         def map(destination)
           requires :identity
-          case destination
-          when Fog::Compute::Brightbox::Server
-            final_destination = destination.interfaces.first["id"]
-          when Fog::Compute::Brightbox::LoadBalancer
-            final_destination = destination.id
+          if destination.respond_to?(:mapping_identity)
+            final_destination = destination.mapping_identity
+          elsif destination.respond_to?(:identity)
+            final_destination = destination.identity
           else
             final_destination = destination
           end

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

@@ -43,9 +43,7 @@ module Fog
           merge_attributes(data)
           true
         end
-
       end
     end
   end
 end
-

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

@@ -31,7 +31,7 @@ module Fog
         def invite(email, role)
           return nil if email.nil? || email == ""
           return nil if role.nil? || role == ""
-          options = {:email => email, :role => role}
+          options = { :email => email, :role => role }
           data = service.create_collaboration(options)
           new(data)
         end

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

@@ -26,7 +26,7 @@ module Fog
             :server_group => server_group_id,
             :name => name,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_firewall_policy(options)
           merge_attributes(data)
           true
@@ -54,12 +54,10 @@ module Fog
 
         def destroy
           requires :identity
-          data = service.destroy_firewall_policy(identity)
+          service.destroy_firewall_policy(identity)
           true
         end
-
       end
-
     end
   end
 end

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

@@ -35,7 +35,7 @@ module Fog
             :destination => destination,
             :destination_port => destination_port,
             :icmp_type_name => icmp_type_name
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_firewall_rule(options)
           merge_attributes(data)
           true

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

@@ -47,7 +47,7 @@ module Fog
             :name => name,
             :username => username,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_image(options)
           merge_attributes(data)
           true
@@ -58,9 +58,7 @@ module Fog
           service.destroy_image(identity)
           true
         end
-
       end
-
     end
   end
 end

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

@@ -23,7 +23,9 @@ module Fog
         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
@@ -50,7 +52,7 @@ module Fog
             :name => name,
             :certificate_pem => certificate_pem,
             :certificate_private_key => certificate_private_key
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)
           true
@@ -80,24 +82,25 @@ module Fog
         # @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
+        private
 
         def time_or_original(value)
-          begin
-            Time.parse(value)
-          rescue TypeError, ArgumentError
-            value
-          end
+          Time.parse(value)
+        rescue TypeError, ArgumentError
+          value
         end
-
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Fog
         attribute :zone
         attribute :server_type
 
-        def initialize(attributes={})
+        def initialize(attributes = {})
           # Call super first to initialize the service object for our default image
           super
           self.image_id ||= service.default_image
@@ -83,10 +83,10 @@ module Fog
         def reboot(use_hard_reboot = true)
           requires :identity
           if ready?
-            unless use_hard_reboot
-              soft_reboot
-            else
+            if use_hard_reboot
               hard_reboot
+            else
+              soft_reboot
             end
           else
             # Not able to reboot if not ready in the first place
@@ -137,23 +137,23 @@ module Fog
         end
 
         def private_ip_address
-          unless interfaces.empty?
-            interfaces.first["ipv4_address"]
-          else
+          if interfaces.empty?
             nil
+          else
+            interfaces.first["ipv4_address"]
           end
         end
 
         def public_ip_address
-          unless cloud_ips.empty?
-            cloud_ips.first["public_ip"]
-          else
+          if cloud_ips.empty?
             nil
+          else
+            cloud_ips.first["public_ip"]
           end
         end
 
         def ready?
-          self.state == 'active'
+          state == "active"
         end
 
         def activate_console
@@ -171,20 +171,28 @@ module Fog
             :zone => zone_id,
             :user_data => user_data,
             :server_groups => server_groups
-          }.delete_if {|k,v| v.nil? || v == "" }
-          unless flavor_id.nil? || flavor_id == ""
-            options.merge!(:server_type => flavor_id)
-          end
+          }.delete_if { |k, v| v.nil? || v == "" }
+
+          options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
+
           data = service.create_server(options)
           merge_attributes(data)
           true
         end
 
-      private
+        # Replaces the server's identifier with it's interface's identifier for Cloud IP mapping
+        #
+        # @return [String] the identifier to pass to a Cloud IP mapping request
+        def mapping_identity
+          interfaces.first["id"]
+        end
+
+        private
+
         # Hard reboots are fast, avoiding the OS by doing a "power off"
         def hard_reboot
           stop
-          wait_for { ! ready? }
+          wait_for { !ready? }
           start
         end
 
@@ -194,11 +202,11 @@ module Fog
         # @todo Needs cleaner error handling when the OS times out
         def soft_reboot
           shutdown
-          # FIXME Using side effect of wait_for's (evaluated block) to detect timeouts
+          # FIXME: Using side effect of wait_for's (evaluated block) to detect timeouts
           begin
-            wait_for(20) { ! ready? }
+            wait_for(20) { !ready? }
             start
-          rescue Fog::Errors::Timeout => e
+          rescue Fog::Errors::Timeout
             false
           end
         end

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

@@ -3,7 +3,6 @@ require 'fog/core/model'
 module Fog
   module Compute
     class Brightbox
-
       # A server group is a collection of servers
       #
       # Certain actions can accept a server group and affect all members
@@ -24,15 +23,15 @@ module Fog
           options = {
             :name => name,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_server_group(options)
           merge_attributes(data)
           true
         end
 
         def servers
-          srv_ids = server_ids.collect {|srv| srv["id"]}
-          srv_ids.collect do |srv_id|
+          srv_ids = server_ids.map { |srv| srv["id"] }
+          srv_ids.map do |srv_id|
             service.servers.get(srv_id)
           end
         end
@@ -41,7 +40,7 @@ module Fog
         #
         # @param [Array] identifiers array of server identifier strings to add
         # @return [Fog::Compute::ServerGroup]
-        def add_servers identifiers
+        def add_servers(identifiers)
           requires :identity
           options = {
             :servers => server_references(identifiers)
@@ -54,7 +53,7 @@ module Fog
         #
         # @param [Array] identifiers array of server identifier strings to remove
         # @return [Fog::Compute::ServerGroup]
-        def remove_servers identifiers
+        def remove_servers(identifiers)
           requires :identity
           options = {
             :servers => server_references(identifiers)
@@ -68,7 +67,7 @@ module Fog
         # @param [Array] identifiers array of server identifier strings to move
         # @param [String] destination_group_id destination server group identifier
         # @return [Fog::Compute::ServerGroup]
-        def move_servers identifiers, destination_group_id
+        def move_servers(identifiers, destination_group_id)
           requires :identity
           options = {
             :servers => server_references(identifiers),
@@ -84,12 +83,11 @@ module Fog
           true
         end
 
-      protected
+        protected
 
-        def server_references identifiers
-          identifiers.map {|id| {"server" => id} }
+        def server_references(identifiers)
+          identifiers.map { |id| { "server" => id } }
         end
-
       end
     end
   end

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

@@ -19,4 +19,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/brightbox/oauth2.rb

@@ -18,7 +18,7 @@ module Fog::Brightbox::OAuth2
     header_content = "#{credentials.client_id}:#{credentials.client_secret}"
     encoded_credentials = Base64.encode64(header_content).chomp
 
-    connection.request({
+    connection.request(
       :path => "/token",
       :expects  => 200,
       :headers  => {
@@ -27,7 +27,7 @@ module Fog::Brightbox::OAuth2
       },
       :method   => 'POST',
       :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
-    })
+    )
   end
 
   # Encapsulates credentials required to request access tokens from the
@@ -152,7 +152,7 @@ module Fog::Brightbox::OAuth2
     end
   end
 
-private
+  private
 
   # This updates the current credentials if passed a valid response
   #

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

@@ -9,7 +9,7 @@ module Fog
         # @option options [String] :name Editable label
         # @option options [String] :user_data User defined metadata
         # @option options [Boolean] :compatibility_mode Server needs to be shutdown and restarted for changes to this to take effect
-        # @opiton options [Array] :server_groups Array of Server Groups that this server should be part of
+        # @option options [Array] :server_groups Array of Server Groups that this server should be part of
         #
         # @return [Hash] if successful Hash version of JSON object
         # @return [NilClass] if no options were passed

data/lib/fog/cloudstack.rb

@@ -8,7 +8,7 @@ module Fog
 
     service(:compute, 'cloudstack/compute','Compute')
 
-    @@digest  = OpenSSL::Digest::Digest.new('sha1')
+    @@digest  = OpenSSL::Digest.new('sha1')
 
     def self.escape(string)
       string = CGI::escape(string)

data/lib/fog/compute.rb

@@ -49,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.rb

@@ -28,8 +28,8 @@ require 'fog/core/service'
 require 'fog/core/ssh'
 require 'fog/core/scp'
 require 'fog/core/time'
-require 'fog/core/timeout'
 require 'fog/core/wait_for'
+require 'fog/core/wait_for_defaults'
 require 'fog/core/class_from_string'
 require 'fog/core/uuid'
 

data/lib/fog/core/connection.rb

@@ -30,8 +30,8 @@ module Fog
         end
         params[:headers] ||= {}
         params[:headers]['User-Agent'] ||= "fog/#{Fog::VERSION}"
+        params.merge!(:persistent => params.fetch(:persistent, persistent))
         @excon = Excon.new(url, params)
-        @persistent = persistent
       end
 
       # Makes a request using the connection using Excon
@@ -53,7 +53,6 @@ module Fog
       # @raise [Excon::Errors::SocketError]
       #
       def request(params, &block)
-        reset unless @persistent
         @excon.request(params, &block)
       end
 

data/lib/fog/core/errors.rb

@@ -5,7 +5,7 @@ module Fog
       attr_accessor :verbose
 
       def self.slurp(error, message = nil)
-        new_error = new(message)
+        new_error = new(message || error.message)
         new_error.set_backtrace(error.backtrace)
         new_error.verbose = error.message
         new_error
@@ -17,9 +17,9 @@ module Fog
     class NotFound < Fog::Errors::Error; end
 
     class LoadError < LoadError; end
-    
+
     class TimeoutError< Fog::Errors::Error; end
-    
+
     class NotImplemented < Fog::Errors::Error; end
 
     # @return [String] The error message that will be raised, if credentials cannot be found