fog 1.19.0 → 1.20.0

data/lib/fog/clodo.rb

@@ -1,34 +1 @@
-require 'fog/core'
-
-module Fog
-  module Clodo
-
-    extend Fog::Provider
-
-    service(:compute, 'clodo/compute', 'Compute')
-
-    def self.authenticate(options)
-      clodo_auth_url = options[:clodo_auth_url] || "api.clodo.ru"
-      url = clodo_auth_url.match(/^https?:/) ? \
-                clodo_auth_url : 'https://' + clodo_auth_url
-      uri = URI.parse(url)
-      connection = Fog::Connection.new(url)
-      @clodo_api_key  = options[:clodo_api_key]
-      @clodo_username = options[:clodo_username]
-      response = connection.request({
-        :expects  => [200, 204],
-        :headers  => {
-          'X-Auth-Key'  => @clodo_api_key,
-          'X-Auth-User' => @clodo_username
-        },
-        :host     => uri.host,
-        :method   => 'GET',
-        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
-      })
-      response.headers.reject do |key, value|
-        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
-      end
-
-    end # authenticate
-  end # module Clodo
-end # module Fog
+require 'fog/clodo/compute'

data/lib/fog/clodo/compute.rb

@@ -1,3 +1,5 @@
+require 'fog/clodo/core'
+
 module Fog
   module Compute
     class Clodo < Fog::Service

data/lib/fog/clodo/core.rb

@@ -0,0 +1,34 @@
+require 'fog/core'
+
+module Fog
+  module Clodo
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+    def self.authenticate(options)
+      clodo_auth_url = options[:clodo_auth_url] || "api.clodo.ru"
+      url = clodo_auth_url.match(/^https?:/) ? \
+                clodo_auth_url : 'https://' + clodo_auth_url
+      uri = URI.parse(url)
+      connection = Fog::Connection.new(url)
+      @clodo_api_key  = options[:clodo_api_key]
+      @clodo_username = options[:clodo_username]
+      response = connection.request({
+        :expects  => [200, 204],
+        :headers  => {
+          'X-Auth-Key'  => @clodo_api_key,
+          'X-Auth-User' => @clodo_username
+        },
+        :host     => uri.host,
+        :method   => 'GET',
+        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
+      })
+      response.headers.reject do |key, value|
+        !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)
+      end
+
+    end # authenticate
+  end # module Clodo
+end # module Fog

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

@@ -96,8 +96,8 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :public_ip_address, :identity, :public_key, :username
-          Fog::SSH.new(public_ip_address, username, credentials).run([
+          requires :ssh_ip_address, :identity, :public_key, :username
+          Fog::SSH.new(ssh_ip_address, username, credentials).run([
             %{mkdir .ssh},
             %{echo "#{public_key}" >> ~/.ssh/authorized_keys},
             %{passwd -l #{username}},

data/lib/fog/cloudsigma.rb

@@ -1,9 +1 @@
-require 'fog/core'
-
-module Fog
-  module CloudSigma
-    extend Fog::Provider
-
-    service(:compute, 'cloudsigma/compute', 'Compute')
-  end
-end
+require 'fog/cloudsigma/compute'

data/lib/fog/cloudsigma/compute.rb

@@ -1,6 +1,6 @@
-require 'fog/compute'
+require 'fog/cloudsigma/core'
 require 'fog/cloudsigma/connection'
-
+require 'fog/compute'
 
 module Fog
   module Compute

data/lib/fog/cloudsigma/core.rb

@@ -0,0 +1,9 @@
+require 'fog/core'
+
+module Fog
+  module CloudSigma
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+  end
+end

data/lib/fog/cloudstack.rb

@@ -1,40 +1 @@
-require 'fog/core'
-require 'uri'
-
-module Fog
-  module Cloudstack
-
-    extend Fog::Provider
-
-    service(:compute, 'cloudstack/compute','Compute')
-
-    @@digest  = OpenSSL::Digest.new('sha1')
-
-    def self.escape(string)
-      string = CGI::escape(string)
-      string = string.gsub("+","%20")
-      string
-    end
-
-    def self.signed_params(key,params)
-      query = params.map{|k,v| [k.to_s, v]}.sort.collect{|c| "#{c[0]}=#{escape(c[1].to_s)}"}.join('&').downcase
-
-      signed_string = Base64.encode64(OpenSSL::HMAC.digest(@@digest,key,query)).strip
-
-      signed_string
-    end
-
-    def self.uuid
-      [8,4,4,4,12].map{|i| Fog::Mock.random_hex(i)}.join("-")
-    end
-
-    def self.ip_address
-      4.times.map{ Fog::Mock.random_numbers(3) }.join(".")
-    end
-
-    def self.mac_address
-      6.times.map{ Fog::Mock.random_numbers(2) }.join(":")
-    end
-  end
-end
-
+require 'fog/cloudstack/compute'

data/lib/fog/cloudstack/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/cloudstack'
+require 'fog/cloudstack/core'
 require 'fog/compute'
 require 'digest/md5'
 

data/lib/fog/cloudstack/core.rb

@@ -0,0 +1,40 @@
+require 'fog/core'
+require 'uri'
+
+module Fog
+  module Cloudstack
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+    @@digest  = OpenSSL::Digest.new('sha1')
+
+    def self.escape(string)
+      string = CGI::escape(string)
+      string = string.gsub("+","%20")
+      string
+    end
+
+    def self.signed_params(key,params)
+      query = params.map{|k,v| [k.to_s, v]}.sort.collect{|c| "#{c[0]}=#{escape(c[1].to_s)}"}.join('&').downcase
+
+      signed_string = Base64.encode64(OpenSSL::HMAC.digest(@@digest,key,query)).strip
+
+      signed_string
+    end
+
+    def self.uuid
+      [8,4,4,4,12].map{|i| Fog::Mock.random_hex(i)}.join("-")
+    end
+
+    def self.ip_address
+      4.times.map{ Fog::Mock.random_numbers(3) }.join(".")
+    end
+
+    def self.mac_address
+      6.times.map{ Fog::Mock.random_numbers(2) }.join(":")
+    end
+  end
+end
+

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

@@ -42,6 +42,9 @@ module Fog
         attr_accessor :network_ids, :disk_offering_id, :ip_address, :ip_to_network_list
         attr_writer :security_group_ids
 
+        alias_method :public_ip_address, :ip_address
+        alias_method :public_ip_address=, :ip_address=
+
         def addresses
           nics.map{|nic| Address.new(nic)}
         end

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

@@ -28,10 +28,36 @@ module Fog
         @public_key ||= public_key_path && File.read(public_key_path)
       end
 
+      # Port used for ssh/scp interactions with server.
+      # @return [Integer] IP port
+      # @note By default this returns 22
       def ssh_port
         @ssh_port ||= 22
       end
 
+      # Sets the proc used to determine the IP Address used for ssh/scp interactions.
+      # @example
+      #   service.servers.bootstrap :name => 'bootstrap-server',
+      #                             :flavor_id => service.flavors.first.id,
+      #                             :image_id => service.images.find {|img| img.name =~ /Ubuntu/}.id,
+      #                             :public_key_path => '~/.ssh/fog_rsa.pub',
+      #                             :private_key_path => '~/.ssh/fog_rsa',
+      #                             :ssh_ip_address => Proc.new {|server| server.private_ip_address }
+      #
+      # @note By default scp/ssh will use the public_ip_address if this proc is not set.
+      def ssh_ip_address=(proc)
+        @ssh_ip_address = proc
+      end
+
+      # IP Address used for ssh/scp interactions with server.
+      # @return [String] IP Address
+      # @note By default this returns the public_ip_address
+      def ssh_ip_address
+        return public_ip_address unless @ssh_ip_address
+        return @ssh_ip_address.call(self) if @ssh_ip_address.is_a?(Proc)
+        @ssh_ip_address
+      end
+
       def ssh_options
         @ssh_options ||= {}
         ssh_options = @ssh_options.merge({:port => ssh_port})
@@ -44,31 +70,31 @@ module Fog
 
       def scp(local_path, remote_path, upload_options = {})
         require 'net/scp'
-        requires :public_ip_address, :username
+        requires :ssh_ip_address, :username
 
-        Fog::SCP.new(public_ip_address, username, ssh_options).upload(local_path, remote_path, upload_options)
+        Fog::SCP.new(ssh_ip_address, username, ssh_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
+        requires :ssh_ip_address, :username
 
-        Fog::SCP.new(public_ip_address, username, ssh_options).download(remote_path, local_path, download_options)
+        Fog::SCP.new(ssh_ip_address, username, ssh_options).download(remote_path, local_path, download_options)
       end
 
       def ssh(commands, options={}, &blk)
         require 'net/ssh'
-        requires :public_ip_address, :username
+        requires :ssh_ip_address, :username
 
         options = ssh_options.merge(options)
 
-        Fog::SSH.new(public_ip_address, username, options).run(commands, &blk)
+        Fog::SSH.new(ssh_ip_address, username, options).run(commands, &blk)
       end
 
       def sshable?(options={})
-        ready? && !public_ip_address.nil? && !!Timeout::timeout(8) { ssh('pwd', options) }
+        ready? && !ssh_ip_address.nil? && !!Timeout::timeout(8) { ssh('pwd', options) }
       rescue SystemCallError, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Timeout::Error
         false
       end

data/lib/fog/core/collection.rb

@@ -9,7 +9,7 @@ module Fog
     attr_reader :service
 
     Array.public_instance_methods(false).each do |method|
-      unless [:reject, :select, :slice].include?(method.to_sym)
+      unless [:reject, :select, :slice, :clear, :inspect].include?(method.to_sym)
         class_eval <<-EOS, __FILE__, __LINE__
           def #{method}(*args)
             unless @loaded
@@ -41,7 +41,6 @@ module Fog
       end
     end
 
-    remove_method :clear
     def clear
       @loaded = true
       super
@@ -72,7 +71,6 @@ module Fog
     end
 
 
-    remove_method :inspect
     def inspect
       Thread.current[:formatador] ||= Formatador.new
       data = "#{Thread.current[:formatador].indentation}<#{self.class.name}\n"

data/lib/fog/core/errors.rb

@@ -74,6 +74,8 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :rackspace_username:
   :rackspace_servicenet:
   :rackspace_cdn_ssl:
+  :rage4_email:
+  :rage4_password:
   :riakcs_access_key_id:
   :riakcs_secret_access_key:
   :stormondemand_username:

data/lib/fog/core/hmac.rb

@@ -25,22 +25,9 @@ module Fog
     end
 
     def setup_sha256
-      begin
-        @digest = OpenSSL::Digest.new('sha256')
-        @signer = lambda do |data|
-          OpenSSL::HMAC.digest(@digest, @key, data)
-        end
-      rescue RuntimeError => error
-        unless error.message == 'Unsupported digest algorithm (sha256).'
-          raise error
-        else
-          require 'hmac-sha2'
-          @hmac = ::HMAC::SHA256.new(@key)
-          @signer = lambda do |data|
-            @hmac.update(data)
-            @hmac.digest
-          end
-        end
+      @digest = OpenSSL::Digest.new('sha256')
+      @signer = lambda do |data|
+        OpenSSL::HMAC.digest(@digest, @key, data)
       end
     end
 

data/lib/fog/core/logger.rb

@@ -2,11 +2,11 @@ module Fog
   class Logger
 
     @channels = {
-      :deprecation  => ::STDOUT,
-      :warning      => ::STDOUT
+      :deprecation  => ::STDERR,
+      :warning      => ::STDERR
     }
 
-    @channels[:debug] = ::STDOUT if ENV['DEBUG']
+    @channels[:debug] = ::STDERR if ENV['DEBUG']
 
     def self.[](channel)
       @channels[channel]

data/lib/fog/core/provider.rb

@@ -19,12 +19,11 @@ module Fog
       eval(@services_registry[service_key]).new
     end
 
-    def service(new_service, path, constant_string)
+    def service(new_service, constant_string)
       Fog.services[new_service] ||= []
       Fog.services[new_service] |= [self.to_s.split('::').last.downcase.to_sym]
       @services_registry ||= {}
       @services_registry[new_service] = [self.to_s, constant_string].join('::')
-      require File.join('fog', path)
     end
 
     def services

data/lib/fog/digitalocean.rb

@@ -1,9 +1 @@
-require 'fog/core'
-
-module Fog
-  module DigitalOcean
-    extend Fog::Provider
-    service(:compute, 'digitalocean/compute', 'Compute')
-  end
-end
-
+require 'fog/digitalocean/compute'

data/lib/fog/digitalocean/compute.rb

@@ -1,4 +1,4 @@
-require 'fog/digitalocean'
+require 'fog/digitalocean/core'
 require 'fog/compute'
 
 module Fog

data/lib/fog/digitalocean/core.rb

@@ -0,0 +1,9 @@
+require 'fog/core'
+
+module Fog
+  module DigitalOcean
+    extend Fog::Provider
+    service(:compute, 'Compute')
+  end
+end
+

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

@@ -19,6 +19,7 @@ module Fog
         attribute :public_ip_address, :aliases => 'ip_address'
         attribute :private_ip_address
         attribute :backups_active
+        attribute :created_at
 
         attr_writer :ssh_keys
 
@@ -82,7 +83,7 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :public_ip_address
+          requires :ssh_ip_address
           require 'net/ssh'
 
           commands = [
@@ -97,7 +98,7 @@ module Fog
           # wait for aws to be ready
           wait_for { sshable?(credentials) }
 
-          Fog::SSH.new(public_ip_address, username, credentials).run(commands)
+          Fog::SSH.new(ssh_ip_address, username, credentials).run(commands)
         end
 
         # Creates the server (not to be called directly).