fog 1.0.0 → 1.1.0

data/lib/fog/bin.rb

@@ -4,7 +4,7 @@ module Fog
   class << self
 
     def available_providers
-      @available_providers ||= @providers.select {|provider| Kernel.const_get(provider).available?}.sort
+      @available_providers ||= Fog.providers.values.select {|provider| Kernel.const_get(provider).available?}.sort
     end
 
   end

data/lib/fog/bin/aws.rb

@@ -19,6 +19,8 @@ class AWS < Fog::Bin
         Fog::AWS::Elasticache
       when :elb
         Fog::AWS::ELB
+      when :emr
+        Fog::AWS::EMR
       when :iam
         Fog::AWS::IAM
       when :sdb, :simpledb
@@ -47,22 +49,24 @@ class AWS < Fog::Bin
         when :auto_scaling
           Fog::AWS::AutoScaling.new
         when :cdn
-          Fog::Logger.warning("AWS[:cdn] is deprecated, use CDN[:aws] instead")
+          Fog::Logger.warning("AWS[:cdn] is not recommended, use CDN[:aws] for portability")
           Fog::CDN.new(:provider => 'AWS')
         when :cloud_formation
           Fog::AWS::CloudFormation.new
         when :cloud_watch
           Fog::AWS::CloudWatch.new
         when :compute
-          Fog::Logger.warning("AWS[:compute] is deprecated, use Compute[:aws] instead")
+          Fog::Logger.warning("AWS[:compute] is not recommended, use Comptue[:aws] for portability")
           Fog::Compute.new(:provider => 'AWS')
         when :dns
-          Fog::Logger.warning("AWS[:dns] is deprecated, use DNS[:aws] instead")
+          Fog::Logger.warning("AWS[:dns] is not recommended, use DNS[:aws] for portability")
           Fog::DNS.new(:provider => 'AWS')
         when :elasticache
           Fog::AWS::Elasticache.new
         when :elb
           Fog::AWS::ELB.new
+        when :emr
+          Fog::AWS::EMR.new
         when :iam
           Fog::AWS::IAM.new
         when :rds
@@ -76,7 +80,7 @@ class AWS < Fog::Bin
         when :sqs
           Fog::AWS::SQS.new
         when :storage
-          Fog::Logger.warning("AWS[:storage] is deprecated, use Storage[:aws] instead")
+          Fog::Logger.warning("AWS[:storage] is not recommended, use Storage[:aws] for portability")
           Fog::Storage.new(:provider => 'AWS')
         when :sns
           Fog::AWS::SNS.new

data/lib/fog/bin/bluebox.rb

@@ -16,10 +16,10 @@ class Bluebox < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Bluebox[:compute] is deprecated, use Compute[:bluebox] instead")
+          Fog::Logger.warning("Bluebox[:compute] is not recommended, use Compute[:bluebox] for portability")
           Fog::Compute.new(:provider => 'Bluebox')
         when :dns
-          Fog::Logger.warning("Bluebox[:storage] is deprecated, use Storage[:bluebox] instead")
+          Fog::Logger.warning("Bluebox[:dns] is not recommended, use DNS[:bluebox] for portability")
           Fog::DNS.new(:provider => 'Bluebox')
         else
           raise ArgumentError, "Unrecognized service: #{service}"

data/lib/fog/bin/brightbox.rb

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

data/lib/fog/bin/dnsimple.rb

@@ -14,7 +14,7 @@ class DNSimple < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :dns
-          Fog::Logger.warning("DNSimple[:dns] is deprecated, use Storage[:dnsimple] instead")
+          Fog::Logger.warning("DNSimple[:dns] is not recommended, use DNS[:dnsimple] for portability")
           Fog::DNS.new(:provider => 'DNSimple')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/dnsmadeeasy.rb

@@ -14,7 +14,7 @@ class DNSMadeEasy < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :dns
-          Fog::Logger.warning("DNSMadeEasy[:dns] is deprecated, use Storage[:dnsmadeeasy] instead")
+          Fog::Logger.warning("DNSMadeEasy[:dns] is not recommended, use DNS[:dnsmadeeasy] for portability")
           Fog::DNS.new(:provider => 'DNSMadeEasy')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/ecloud.rb

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

data/lib/fog/bin/glesys.rb

@@ -14,7 +14,7 @@ class Glesys < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Formatador.display_line("[yellow][WARN] Glesys[:compute] is deprecated, use Compute[:glesys] instead[/]")
+          Fog::Logger.warning("Glesys[:compute] is not recommended, use Compute[:glesys] for portability")
           Fog::Compute.new(:provider => 'Glesys')
         else
           raise ArgumentError, "Unrecognized service: #{service}"

data/lib/fog/bin/go_grid.rb

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

data/lib/fog/bin/google.rb

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

data/lib/fog/bin/libvirt.rb

@@ -14,7 +14,7 @@ module Libvirt # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Libvirt[:compute] is deprecated, use Compute[:libvirt] instead")
+          Fog::Logger.warning("Libvirt[:compute] is not recommended, use Compute[:libvirt] for portability")
           Fog::Compute.new(:provider => 'Libvirt')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/linode.rb

@@ -16,10 +16,10 @@ class Linode < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Linode[:compute] is deprecated, use Compute[:linode] instead")
+          Fog::Logger.warning("Linode[:compute] is not recommended, use Compute[:linode] for portability")
           Fog::Compute.new(:provider => 'Linode')
         when :dns
-          Fog::Logger.warning("Linode[:storage] is deprecated, use Storage[:linode] instead")
+          Fog::Logger.warning("Linode[:dns] is not recommended, use DNS[:linode] for portability")
           Fog::DNS.new(:provider => 'Linode')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/local.rb

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

data/lib/fog/bin/new_servers.rb

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

data/lib/fog/bin/ninefold.rb

@@ -16,10 +16,10 @@ class Ninefold < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Ninefold[:compute] is deprecated, use Compute[:ninefold] instead")
+          Fog::Logger.warning("Ninefold[:compute] is not recommended, use Compute[:ninefold] for portability")
           Fog::Compute.new(:provider => 'Ninefold')
         when :storage
-          Fog::Logger.warning("Ninefold[:storage] is deprecated, use Storage[:ninefold] instead")
+          Fog::Logger.warning("Ninefold[:storage] is not recommended, use Storage[:ninefold] for portability")
           Fog::Storage.new(:provider => 'Ninefold')
         else
           raise ArgumentError, "Unrecognized service: #{service}"

data/lib/fog/bin/openstack.rb

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

data/lib/fog/bin/rackspace.rb

@@ -22,17 +22,17 @@ class Rackspace < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :cdn
-          Fog::Logger.warning("Rackspace[:cdn] is deprecated, use CDN[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:cdn] is not recommended, use CDN[:rackspace] for portability")
           Fog::CDN.new(:provider => 'Rackspace')
         when :compute
-          Fog::Logger.warning("Rackspace[:compute] is deprecated, use Compute[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:compute] is not recommended, use Compute[:rackspace] for portability")
           Fog::Compute.new(:provider => 'Rackspace')
         when :dns
           Fog::DNS.new(:provider => 'Rackspace')
         when :load_balancers
           Fog::Rackspace::LoadBalancers.new
         when :storage
-          Fog::Logger.warning("Rackspace[:storage] is deprecated, use Storage[:rackspace] instead")
+          Fog::Logger.warning("Rackspace[:storage] is not recommended, use Storage[:rackspace] for portability")
           Fog::Storage.new(:provider => 'Rackspace')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/slicehost.rb

@@ -16,7 +16,7 @@ class Slicehost < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Slicehost[:compute] is deprecated, use Compute[:slicehost] instead")
+          Fog::Logger.warning("Slicehost[:compute] is not recommended, use Compute[:slicehost] for portability")
           Fog::Compute.new(:provider => 'Slicehost')
         when :dns
           Fog::Logger.warning("Slicehost[:dns] is deprecated, use Storage[:slicehost] instead")

data/lib/fog/bin/stormondemand.rb

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

data/lib/fog/bin/virtual_box.rb

@@ -14,7 +14,7 @@ module VirtualBox # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("VirtualBox[:compute] is deprecated, use Compute[:virtualbox] instead")
+          Fog::Logger.warning("VirtualBox[:compute] is not recommended, use Compute[:virtualbox] for portability")
           Fog::Compute.new(:provider => 'VirtualBox')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/vmfusion.rb

@@ -14,7 +14,7 @@ module Vmfusion # deviates from other bin stuff to accomodate gem
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :compute
-          Fog::Logger.warning("Vmfusion[:compute] is deprecated, use Compute[:Vmfusion] instead")
+          Fog::Logger.warning("Vmfusion[:compute] is not recommended, use Compute[:vmfusion] for portability")
           Fog::Compute.new(:provider => 'Vmfusion')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/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[:compute] is deprecated, use Compute[:voxel] instead")
+          Fog::Logger.warning("Voxel[:comupte] is not recommended, use Compute[:voxel]] for portability")
           Fog::Compute.new(:provider => 'Voxel')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

data/lib/fog/bin/zerigo.rb

@@ -14,7 +14,7 @@ class Zerigo < Fog::Bin
       @@connections ||= Hash.new do |hash, key|
         hash[key] = case key
         when :dns
-          Fog::Logger.warning("Zerigo[:dns] is deprecated, use Storage[:zerigo] instead")
+          Fog::Logger.warning("Zerigo[:dns] is not recommended, use DNS[:zerigo] for portability")
           Fog::DNS.new(:provider => 'Zerigo')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"

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

@@ -53,7 +53,7 @@ module Fog
 
         def reset_ftp_password
           requires :identity
-          connection.reset_ftp_password_account(identity)["library_ftp_password"]
+          connection.reset_ftp_password_account["library_ftp_password"]
         end
 
       end

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

@@ -13,11 +13,10 @@ module Fog
         Fog::SCP.new(public_ip_address, username, scp_options).upload(local_path, remote_path, upload_options)
       end
 
-      def ssh(commands)
+      def ssh(commands, options={})
         require 'net/ssh'
         requires :public_ip_address, :username
 
-        options = {}
         options[:key_data] = [private_key] if private_key
         Fog::SSH.new(public_ip_address, username, options).run(commands)
       end

data/lib/fog/core/attributes.rb

@@ -25,9 +25,9 @@ module Fog
           class_eval <<-EOS, __FILE__, __LINE__
             def #{name}=(new_#{name})
               attributes[:#{name}] = case new_#{name}
-              when 'true'
+              when true,'true'
                 true
-              when 'false'
+              when false,'false'
                 false
               end
             end
@@ -71,8 +71,8 @@ module Fog
             class_eval <<-EOS, __FILE__, __LINE__
               def #{name}=(new_data)
                 if new_data.is_a?(Hash)
-                  if new_data.has_key?(:#{squash})
-                    attributes[:#{name}] = new_data[:#{squash}]
+                  if new_data.has_key?(:'#{squash}')
+                    attributes[:#{name}] = new_data[:'#{squash}']
                   elsif new_data.has_key?("#{squash}")
                     attributes[:#{name}] = new_data["#{squash}"]
                   else
@@ -142,7 +142,7 @@ module Fog
           unless self.class.ignored_attributes.include?(key)
             if aliased_key = self.class.aliases[key]
               send("#{aliased_key}=", value)
-            elsif (public_methods | private_methods).detect {|method| ["#{key}=", :"#{key}="].include?(method)}
+            elsif self.respond_to?("#{key}=",true)
               send("#{key}=", value)
             else
               attributes[key] = value

data/lib/fog/core/connection.rb

@@ -18,7 +18,7 @@ module Fog
       end
 
       response = @excon.request(params, &block)
-
+      
       if parser
         body.finish
         response.body = parser.response

data/lib/fog/core/deprecation.rb

@@ -4,7 +4,7 @@ module Fog
     def deprecate(older, newer)
       module_eval <<-EOS, __FILE__, __LINE__
         def #{older}(*args)
-          Fog::Logger.warning("#{self} => ##{older} is deprecated, use ##{newer} instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("#{self} => ##{older} is deprecated, use ##{newer} instead [light_black](#{caller.first})[/]")
           send(:#{newer}, *args)
         end
       EOS
@@ -13,7 +13,7 @@ module Fog
     def self_deprecate(older, newer)
       module_eval <<-EOS, __FILE__, __LINE__
         def self.#{older}(*args)
-          Fog::Logger.warning("#{self} => ##{older} is deprecated, use ##{newer} instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("#{self} => ##{older} is deprecated, use ##{newer} instead [light_black](#{caller.first})[/]")
           send(:#{newer}, *args)
         end
       EOS

data/lib/fog/core/logger.rb

@@ -2,7 +2,8 @@ module Fog
   class Logger
 
     @channels = {
-      :warning => ::STDOUT
+      :deprecation  => ::STDOUT,
+      :warning      => ::STDOUT
     }
 
     def self.[](channel)
@@ -14,11 +15,15 @@ module Fog
     end
 
     def self.debug(message)
-      self.write(:debug, "[light_black][DEBUG] #{message}[/]")
+      self.write(:debug, "[light_black][DEBUG] #{message}[/]\n")
+    end
+
+    def self.deprecation(message)
+      self.write(:deprecation, "[yellow][DEPRECATION] #{message}[/]\n")
     end
 
     def self.warning(message)
-      self.write(:warning, "[yellow][WARNING] #{message}[/]")
+      self.write(:warning, "[yellow][WARNING] #{message}[/]\n")
     end
 
     def self.write(key, value)

data/lib/fog/core/mock.rb

@@ -6,6 +6,10 @@ module Fog
     @mocking = true
   end
 
+  def self.unmock!
+    @mocking = false
+  end
+
   def self.mock?
     @mocking
   end

data/lib/fog/core/provider.rb

@@ -1,13 +1,18 @@
 module Fog
 
   def self.providers
-    @providers ||= []
+    @providers ||= {}
+  end
+
+  def self.providers=(new_providers)
+    @providers = new_providers
   end
 
   module Provider
 
     def self.extended(base)
-      Fog.providers << base.to_s.split('::').last
+      provider = base.to_s.split('::').last
+      Fog.providers[provider.downcase.to_sym] = provider
     end
 
     def [](service_key)

data/lib/fog/core/service.rb

@@ -172,11 +172,17 @@ module Fog
       end
 
       def recognized
-        @recognized ||= []
+        @recognized ||= [:connection_options]
       end
 
       def validate_options(options)
-        missing = requirements - options.keys
+        keys = []
+        for key, value in options
+          unless value.nil?
+            keys << key
+          end
+        end
+        missing = requirements - keys
         unless missing.empty?
           raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
         end