fog 0.8.2 → 0.9.0

data/lib/fog/compute/aws.rb

@@ -1,10 +1,9 @@
 module Fog
-  module AWS
-    class Compute < Fog::Service
+  module Compute
+    class AWS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/aws'
       model       :address
@@ -130,13 +129,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::Compute.new is deprecated, use Fog::Compute.new(:provider => 'AWS') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/compute/parsers/aws/basic'
 
           @aws_access_key_id = options[:aws_access_key_id]
@@ -204,13 +196,6 @@ module Fog
         # ==== Returns
         # * EC2 object with connection to aws.
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::Compute.new is deprecated, use Fog::Compute.new(:provider => 'AWS') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/core/parser'
 
           @aws_access_key_id      = options[:aws_access_key_id]
@@ -256,7 +241,7 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = AWS.signed_params(
+          body = Fog::AWS.signed_params(
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
@@ -282,9 +267,9 @@ module Fog
             if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
               raise case match[1].split('.').last
               when 'NotFound'
-                Fog::AWS::Compute::NotFound.slurp(error, match[2])
+                Fog::Compute::AWS::NotFound.slurp(error, match[2])
               else
-                Fog::AWS::Compute::Error.slurp(error, "#{match[1]} => #{match[2]}")
+                Fog::Compute::AWS::Error.slurp(error, "#{match[1]} => #{match[2]}")
               end
             else
               raise error

data/lib/fog/compute/bluebox.rb

@@ -1,10 +1,9 @@
 module Fog
-  module Bluebox
-    class Compute < Fog::Service
+  module Compute
+    class Bluebox < Fog::Service
 
       requires :bluebox_api_key, :bluebox_customer_id
       recognizes :bluebox_host, :bluebox_port, :bluebox_scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/bluebox'
       model       :flavor
@@ -38,13 +37,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Bluebox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Bluebox') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @bluebox_api_key = options[:bluebox_api_key]
         end
 
@@ -61,13 +53,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Bluebox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Bluebox') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'json'
           @bluebox_api_key      = options[:bluebox_api_key]
           @bluebox_customer_id  = options[:bluebox_customer_id]
@@ -92,7 +77,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Bluebox::Compute::NotFound.slurp(error)
+              Fog::Compute::Bluebox::NotFound.slurp(error)
             else
               error
             end

data/lib/fog/compute/brightbox.rb

@@ -1,12 +1,11 @@
 module Fog
-  module Brightbox
-    class Compute < Fog::Service
+  module Compute
+    class Brightbox < Fog::Service
 
       API_URL = "https://api.gb1.brightbox.com/"
 
       requires :brightbox_client_id, :brightbox_secret
       recognizes :brightbox_auth_url, :brightbox_api_url
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/brightbox'
       model       :account # Singular resource, no collection
@@ -77,13 +76,6 @@ module Fog
       class Mock
 
         def initialize(options)
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @brightbox_client_id = options[:brightbox_client_id] || Fog.credentials[:brightbox_client_id]
           @brightbox_secret = options[:brightbox_secret] || Fog.credentials[:brightbox_secret]
         end
@@ -96,13 +88,6 @@ module Fog
       class Real
 
         def initialize(options)
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Brightbox::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Brightbox') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require "json"
           # Currently authentication and api endpoints are the same but may change
           @auth_url = options[:brightbox_auth_url] || Fog.credentials[:brightbox_auth_url] || API_URL
@@ -126,7 +111,7 @@ module Fog
         end
 
         def account
-          Fog::Brightbox::Compute::Account.new(get_account)
+          Fog::Compute::Brightbox::Account.new(get_account)
         end
 
       private

data/lib/fog/compute/ecloud.rb

@@ -823,14 +823,13 @@ module Fog
 end
 
 module Fog
-  module Ecloud
-    class Compute < Fog::Service
+  module Compute
+    class Ecloud < Fog::Service
 
       class UnsupportedVersion < Exception ; end
 
       requires   :ecloud_username, :ecloud_password, :ecloud_versions_uri
       recognizes :ecloud_version
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/ecloud'
       model :catalog_item
@@ -953,7 +952,7 @@ module Fog
 
       class Mock
         include Shared
-        include MockDataClasses
+        include Fog::Ecloud::MockDataClasses
 
         def self.base_url
           "https://fakey.com/api/v0.8b-ext2.6"
@@ -1078,7 +1077,7 @@ module Fog
         end
 
         def mock_data
-          Fog::Ecloud::Compute::Mock.data
+          Fog::Compute::Ecloud::Mock.data
         end
 
         def mock_error(expected, status, body='', headers={})

data/lib/fog/compute/go_grid.rb

@@ -1,10 +1,9 @@
 module Fog
-  module GoGrid
-    class Compute < Fog::Service
+  module Compute
+    class GoGrid < Fog::Service
 
       requires :go_grid_api_key, :go_grid_shared_secret
       recognizes :host, :path, :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/go_grid'
       model         :image
@@ -41,13 +40,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::GoGrid::Compute.new is deprecated, use Fog::Compute.new(:provider => 'GoGrid') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
         end
@@ -65,13 +57,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::GoGrid::Compute.new is deprecated, use Fog::Compute.new(:provider => 'GoGrid') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'digest/md5'
           require 'json'
           @go_grid_api_key = options[:go_grid_api_key]
@@ -108,7 +93,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::GoGrid::Compute::NotFound.slurp(error)
+              Fog::Compute::GoGrid::NotFound.slurp(error)
             else
               error
             end

data/lib/fog/compute/linode.rb

@@ -1,10 +1,9 @@
 module Fog
-  module Linode
-    class Compute < Fog::Service
+  module Compute
+    class Linode < Fog::Service
 
       requires :linode_api_key
       recognizes :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/linode'
       model :flavor
@@ -62,13 +61,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Linode::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Linode') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @linode_api_key = options[:linode_api_key]
         end
 
@@ -85,13 +77,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Linode::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Linode') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'json'
           @linode_api_key = options[:linode_api_key]
           @host   = options[:host]    || "api.linode.com"
@@ -115,9 +100,9 @@ module Fog
             if data = response.body['ERRORARRAY'].first
               error = case data['ERRORCODE']
               when 5
-                Fog::Linode::Compute::NotFound
+                Fog::Compute::Linode::NotFound
               else
-                Fog::Linode::Compute::Error
+                Fog::Compute::Linode::Error
               end
               raise error.new(data['ERRORMESSAGE'])
             end

data/lib/fog/compute/models/aws/address.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Address < Fog::Model
 

data/lib/fog/compute/models/aws/addresses.rb

@@ -2,15 +2,15 @@ require 'fog/core/collection'
 require 'fog/compute/models/aws//address'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Addresses < Fog::Collection
 
         attribute :filters
         attribute :server
 
-        model Fog::AWS::Compute::Address
+        model Fog::Compute::AWS::Address
 
         # Used to create an IP address
         #

data/lib/fog/compute/models/aws/flavor.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Flavor < Fog::Model
 

data/lib/fog/compute/models/aws/flavors.rb

@@ -2,8 +2,8 @@ require 'fog/core/collection'
 require 'fog/compute/models/aws/flavor'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       FLAVORS = [
         { :bits => 0,  :cores =>   2,  :disk => 0,    :id =>  't1.micro',   :name => 'Micro Instance',       :ram => 613},
@@ -25,7 +25,7 @@ module Fog
 
       class Flavors < Fog::Collection
 
-        model Fog::AWS::Compute::Flavor
+        model Fog::Compute::AWS::Flavor
 
         # Returns an array of all flavors that have been created
         #
@@ -131,7 +131,7 @@ module Fog
         #
 
         def all
-          load(Fog::AWS::Compute::FLAVORS)
+          load(Fog::Compute::AWS::FLAVORS)
           self
         end
 

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

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Image < Fog::Model
 

data/lib/fog/compute/models/aws/images.rb

@@ -2,14 +2,14 @@ require 'fog/core/collection'
 require 'fog/compute/models/aws/image'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class Images < Fog::Collection
 
         attribute :filters
 
-        model Fog::AWS::Compute::Image
+        model Fog::Compute::AWS::Image
         
         # Creates a new Amazon machine image
         #

data/lib/fog/compute/models/aws/key_pair.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class KeyPair < Fog::Model
 
@@ -52,7 +52,6 @@ module Fog
           !!(private_key && ENV.has_key?('HOME'))
         end
 
-          private
       end
 
     end

data/lib/fog/compute/models/aws/key_pairs.rb

@@ -2,15 +2,15 @@ require 'fog/core/collection'
 require 'fog/compute/models/aws/key_pair'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class KeyPairs < Fog::Collection
 
         attribute :filters
         attribute :key_name
 
-        model Fog::AWS::Compute::KeyPair
+        model Fog::Compute::AWS::KeyPair
 
         # Used to create a key pair.  There are 3 arguments and only name is required.  You can generate a new key_pair as follows:
         # AWS.key_pairs.create(:name => "test", :fingerprint => "123", :private_key => '234234')

data/lib/fog/compute/models/aws/security_group.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Compute
+  module Compute
+    class AWS
 
       class SecurityGroup < Fog::Model