fog 0.4.0 → 0.4.1

data/lib/fog/core.rb

@@ -16,11 +16,9 @@ require 'timeout'
 # internal core dependencies
 require 'fog/core/attributes'
 require 'fog/core/collection'
-require 'fog/core/compute'
 require 'fog/core/connection'
 require 'fog/core/credentials'
 require 'fog/core/deprecation'
-require 'fog/core/dns'
 require 'fog/core/errors'
 require 'fog/core/hmac'
 require 'fog/core/model'
@@ -29,6 +27,5 @@ require 'fog/core/mock'
 require 'fog/core/provider'
 require 'fog/core/service'
 require 'fog/core/ssh'
-require 'fog/core/storage'
 require 'fog/core/time'
 require 'fog/core/wait_for'

data/lib/fog/core/connection.rb

@@ -1,8 +1,8 @@
 module Fog
   class Connection
 
-    def initialize(url, persistent=false)
-      @excon = Excon.new(url)
+    def initialize(url, persistent=false, params={})
+      @excon = Excon.new(url, params)
       @persistent = persistent
     end
 

data/lib/fog/core/credentials.rb

@@ -47,7 +47,7 @@ private
     <<-YML
 Missing Credentials
 
-To run as '#{credential}', add the following to your resource config file: #{config_path}
+To run as '#{credential}', add the following to your resource config file: #{credentials_path}
 An alternate file may be used by placing its path in the FOG_RC environment variable
 
 #######################################################
@@ -66,6 +66,7 @@ An alternate file may be used by placing its path in the FOG_RC environment vari
   :go_grid_shared_secret:
   :google_storage_access_key_id:
   :google_storage_secret_access_key:
+  :linode_api_key:
   :local_root:
   :new_servers_password:
   :new_servers_username:

data/lib/fog/core/parser.rb

@@ -21,6 +21,10 @@ module Fog
         @value = nil
       end
 
+      def attr_value(name, attrs)
+        (entry = attrs.detect {|a, v| a == name }) && entry.last
+      end
+
     end
   end
 end

data/lib/fog/core/provider.rb

@@ -1,13 +1,9 @@
 module Fog
   module Provider
 
-    def service_path(new_path)
-      @service_path = new_path
-    end
-
-    def service(new_service)
+    def service(new_service, path)
       services << new_service
-      require File.join(@service_path, new_service.to_s)
+      require File.join('fog', path)
     end
 
     def services

data/lib/fog/{core/dns.rb → dns.rb}

@@ -3,18 +3,18 @@ module Fog
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes.delete(:provider)
+      case provider = attributes[:provider] # attributes.delete(:provider)
       when 'AWS'
-        require 'fog/aws'
+        require 'fog/dns/aws'
         Fog::AWS::DNS.new(attributes)
       when 'Linode'
-        require 'fog/linode'
+        require 'fog/dns/linode'
         Fog::Linode::DNS.new(attributes)
       when 'Slicehost'
-        require 'fog/slicehost'
+        require 'fog/dns/slicehost'
         Fog::Slicehost::DNS.new(attributes)
       when 'Zerigo'
-        require 'fog/zerigo'
+        require 'fog/dns/zerigo'
         Fog::Zerigo::DNS.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")

data/lib/fog/{aws/dns.rb → dns/aws.rb}

@@ -4,14 +4,15 @@ module Fog
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :host, :path, :port, :scheme, :version, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/aws/models/dns'
+      model_path 'fog/dns/models/aws'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/aws/requests/dns'
+      request_path 'fog/dns/requests/aws'
       request :create_hosted_zone
       request :get_hosted_zone
       request :delete_hosted_zone
@@ -39,6 +40,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::DNS.new is deprecated, use Fog::DNS.new(:provider => 'AWS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'mime/types'
           @aws_access_key_id = options[:aws_access_key_id]
           @data = self.class.data[options[:region]][@aws_access_key_id]
@@ -69,6 +77,13 @@ module Fog
         # ==== Returns
         # * dns object with connection to aws.
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::DNS.new is deprecated, use Fog::DNS.new(:provider => 'DNS') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @aws_access_key_id = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
           @hmac     = Fog::HMAC.new('sha1', @aws_secret_access_key)

data/lib/fog/{linode/dns.rb → dns/linode.rb}

@@ -4,14 +4,15 @@ module Fog
 
       requires :linode_api_key
       recognizes :port, :scheme, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/linode/models/dns'
+      model_path 'fog/dns/models/linode'
       model       :record
       collection  :records
       model       :zone
       collection  :zones
 
-      request_path 'fog/linode/requests/dns'
+      request_path 'fog/dns/requests/linode'
       request :domain_create
       request :domain_delete
       request :domain_list
@@ -36,6 +37,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Linode::DNS.new is deprecated, use Fog::DNS.new(:provider => 'Linode') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @linode_api_key = options[:linode_api_key]
           @data = self.class.data[@linode_api_key]
         end
@@ -45,6 +53,13 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Linode::DNS.new is deprecated, use Fog::DNS.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"

data/lib/fog/{aws/models/dns → dns/models/aws}/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/dns/record'
+require 'fog/dns/models/aws/record'
 
 module Fog
   module AWS
@@ -25,7 +25,9 @@ module Fog
           options['Type']     ||= type
           data = connection.list_resource_record_sets(zone.id, options).body
           merge_attributes(data.reject {|key, value| !['IsTruncated', 'MaxItems', 'NextRecordName', 'NextRecordType'].include?(key)})
-          load(data['ResourceRecordSets'])
+          # leave out the default, read only records
+          data = data['ResourceRecordSets'].reject {|record| ['NS', 'SOA'].include?(record['Type'])}
+          load(data)
         end
 
         def get(record_id)

data/lib/fog/{aws/models/dns → dns/models/aws}/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-# require 'fog/aws/models/dns/records'
+# require 'fog/dns/models/aws/records'
 
 module Fog
   module AWS

data/lib/fog/{aws/models/dns → dns/models/aws}/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/aws/models/dns/zone'
+require 'fog/dns/models/aws/zone'
 
 module Fog
   module AWS

data/lib/fog/{linode/models/dns → dns/models/linode}/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/linode/models/dns/record'
+require 'fog/dns/models/linode/record'
 
 module Fog
   module Linode

data/lib/fog/{linode/models/dns → dns/models/linode}/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/linode/models/dns/records'
+require 'fog/dns/models/linode/records'
 
 module Fog
   module Linode

data/lib/fog/{linode/models/dns → dns/models/linode}/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/linode/models/dns/zone'
+require 'fog/dns/models/linode/zone'
 
 module Fog
   module Linode

data/lib/fog/{slicehost/models/dns → dns/models/slicehost}/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/dns/record'
+require 'fog/dns/models/slicehost/record'
 
 module Fog
   module Slicehost

data/lib/fog/{slicehost/models/dns → dns/models/slicehost}/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/slicehost/models/dns/records'
+require 'fog/dns/models/slicehost/records'
 
 module Fog
   module Slicehost

data/lib/fog/{slicehost/models/dns → dns/models/slicehost}/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/slicehost/models/dns/zone'
+require 'fog/dns/models/slicehost/zone'
 
 module Fog
   module Slicehost

data/lib/fog/{zerigo/models/dns → dns/models/zerigo}/records.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/zerigo/models/dns/record'
+require 'fog/dns/models/zerigo/record'
 
 module Fog
   module Zerigo

data/lib/fog/{zerigo/models/dns → dns/models/zerigo}/zone.rb

@@ -1,5 +1,5 @@
 require 'fog/core/model'
-require 'fog/zerigo/models/dns/records'
+require 'fog/dns/models/zerigo/records'
 
 module Fog
   module Zerigo

data/lib/fog/{zerigo/models/dns → dns/models/zerigo}/zones.rb

@@ -1,5 +1,5 @@
 require 'fog/core/collection'
-require 'fog/zerigo/models/dns/zone'
+require 'fog/dns/models/zerigo/zone'
 
 module Fog
   module Zerigo

data/lib/fog/{aws/requests/dns → dns/requests/aws}/change_resource_record_sets.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/change_resource_record_sets'
+        require 'fog/dns/parsers/aws/change_resource_record_sets'
 
         # Use this action to create or change your authoritative DNS information for a zone
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/create_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/create_hosted_zone'
+        require 'fog/dns/parsers/aws/create_hosted_zone'
 
         # Creates a new hosted zone
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/delete_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/delete_hosted_zone'
+        require 'fog/dns/parsers/aws/delete_hosted_zone'
 
         # Delete a hosted zone
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/get_change.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_change'
+        require 'fog/dns/parsers/aws/get_change'
 
         # returns the current state of a change request
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/get_hosted_zone.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/get_hosted_zone'
+        require 'fog/dns/parsers/aws/get_hosted_zone'
 
         # retrieve information about a hosted zone
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/list_hosted_zones.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_hosted_zones'
+        require 'fog/dns/parsers/aws/list_hosted_zones'
 
         # Describe all or specified instances
         #

data/lib/fog/{aws/requests/dns → dns/requests/aws}/list_resource_record_sets.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/aws/parsers/dns/list_resource_record_sets'
+        require 'fog/dns/parsers/aws/list_resource_record_sets'
 
         # list your resource record sets
         #

data/lib/fog/{slicehost/requests/dns → dns/requests/slicehost}/create_record.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS
       class Real
 
-        require 'fog/slicehost/parsers/dns/create_record'
+        require 'fog/dns/parsers/slicehost/create_record'
 
         # Create a new record in a DNS zone - or update an existing one
         # ==== Parameters