fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

data/lib/fog/dnsimple/requests/dns/list_domains.rb

@@ -5,28 +5,20 @@ module Fog
 
         # Get the details for a specific domain in your account. You
         # may pass either the domain numeric ID or the domain name itself.
+        #
         # ==== Parameters
-        # * id<~String> - domain name or numeric ID
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'domains'<~Array>
-        #       * 'name'<~String>
-        #       * 'expires_at'<~String>
-        #       * 'created_at'<~String>
-        #       * 'registration_status'<~String>
-        #       * 'updated_at'<~String>
-        #       * 'registrant_id'<~Integer>
-        #       * 'id'<~Integer>
-        #       * 'user_id'<~Integer>
-        #       * 'name_server_status'<~String>
+        #     * <~Array>:
+        #       * 'domain'<~Hash> The representation of the domain.
         def list_domains
           request(
-                  :expects  => 200,
-                  :method   => 'GET',
-                  :path     => '/domains'
-                  )
+            :expects  => 200,
+            :method   => 'GET',
+            :path     => '/domains'
+          )
         end
 
       end

data/lib/fog/dnsimple/requests/dns/list_records.rb

@@ -6,24 +6,19 @@ module Fog
         # Get the list of records for the specific domain.
         #
         # ==== Parameters
-        # * domain<~String>
+        # * domain<~String> - domain name or numeric ID
+        #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * records<Array~>
-        #     * name<~String>
-        #     * ttl<~Integer>
-        #     * created_at<~String>
-        #     * special_type<~String>
-        #     * updated_at<~String>
-        #     * domain_id<~Integer>
-        #     * id<~Integer>
-        #     * content<~String>
-        #     * record_type<~String>
-        #     * prio<~Integer>
+        #   * body<~Hash>:
+        #     * <~Array>:
+        #       * 'record'<~Hash> The representation of the record.
         def list_records(domain)
-          request( :expects  => 200,
-                   :method   => "GET",
-                   :path     => "/domains/#{domain}/records" )
+          request(
+            :expects  => 200,
+            :method   => "GET",
+            :path     => "/domains/#{domain}/records"
+          )
         end
 
       end

data/lib/fog/dnsimple/requests/dns/update_record.rb

@@ -6,34 +6,29 @@ module Fog
         # Update the given record for the given domain.
         #
         # ==== Parameters
-        # * domain<~String>
+        # * domain<~String> - domain name or numeric ID
         # * record_id<~String>
         # * options<~Hash> - optional
         #   * type<~String>
         #   * content<~String>
         #   * priority<~Integer>
         #   * ttl<~Integer>
+        #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * record<~Hash>
-        #     * name<~String>
-        #     * ttl<~Integer>
-        #     * created_at<~String>
-        #     * special_type<~String>
-        #     * updated_at<~String>
-        #     * domain_id<~Integer>
-        #     * id<~Integer>
-        #     * content<~String>
-        #     * record_type<~String>
-        #     * prio<~Integer>
+        #   * body<~Hash>:
+        #     * 'record'<~Hash> The representation of the record.
         def update_record(domain, record_id, options)
-
-          body = { "record" => options }
-
-          request( :body     => Fog::JSON.encode(body),
-                   :expects  => 200,
-                   :method   => "PUT",
-                   :path     => "/domains/#{domain}/records/#{record_id}" )
+          body = {
+            "record" => options
+          }
+
+          request(
+            :body     => Fog::JSON.encode(body),
+            :expects  => 200,
+            :method   => "PUT",
+            :path     => "/domains/#{domain}/records/#{record_id}"
+          )
         end
 
       end

data/lib/fog/dnsmadeeasy.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module DNSMadeEasy
-
-    extend Fog::Provider
-
-    service(:dns, 'dnsmadeeasy/dns', 'DNS')
-
-  end
-end
+require 'fog/dnsmadeeasy/dns'

data/lib/fog/dnsmadeeasy/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module DNSMadeEasy
+
+    extend Fog::Provider
+
+    service(:dns, 'DNS')
+
+  end
+end

data/lib/fog/dnsmadeeasy/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/dnsmadeeasy'
+require 'fog/dnsmadeeasy/core'
 require 'fog/dns'
 
 module Fog

data/lib/fog/dreamhost.rb

@@ -1,11 +1 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
-
-module Fog
-  module Dreamhost 
-
-    extend Fog::Provider
-
-    service(:dns, 'dreamhost/dns', 'DNS')
-
-  end
-end
+require 'fog/dreamhost/dns'

data/lib/fog/dreamhost/core.rb

@@ -0,0 +1,11 @@
+require 'fog/core'
+
+module Fog
+  module Dreamhost
+
+    extend Fog::Provider
+
+    service(:dns, 'DNS')
+
+  end
+end

data/lib/fog/dreamhost/dns.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'dreamhost'))
+require 'fog/dreamhost/core'
 require 'fog/dns'
 
 module Fog

data/lib/fog/dynect.rb

@@ -1,26 +1 @@
-require 'nokogiri'
-
-require 'fog/core'
-require 'fog/core/parser'
-
-module Fog
-  module Dynect
-    extend Fog::Provider
-
-    service(:dns, 'dynect/dns', 'DNS')
-
-    class Mock
-      def self.job_id
-        Fog::Mock.random_numbers(8).to_i
-      end
-
-      def self.token
-        Fog::Mock.random_hex(48)
-      end
-
-      def self.version
-        [Fog::Mock.random_numbers(1), Fog::Mock.random_numbers(1), Fog::Mock.random_numbers(1)].join('.')
-      end
-    end
-  end
-end
+require 'fog/dynect/dns'

data/lib/fog/dynect/core.rb

@@ -0,0 +1,26 @@
+require 'nokogiri'
+
+require 'fog/core'
+require 'fog/core/parser'
+
+module Fog
+  module Dynect
+    extend Fog::Provider
+
+    service(:dns, 'DNS')
+
+    class Mock
+      def self.job_id
+        Fog::Mock.random_numbers(8).to_i
+      end
+
+      def self.token
+        Fog::Mock.random_hex(48)
+      end
+
+      def self.version
+        [Fog::Mock.random_numbers(1), Fog::Mock.random_numbers(1), Fog::Mock.random_numbers(1)].join('.')
+      end
+    end
+  end
+end

data/lib/fog/dynect/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/dynect'
+require 'fog/dynect/core'
 require 'fog/dns'
 
 module Fog

data/lib/fog/dynect/requests/dns/put_record.rb

@@ -19,10 +19,11 @@ module Fog
           path = ["#{type}Record", zone, fqdn].join('/')
           path += "/#{options.delete('record_id')}" if options['record_id']
           request(
-            :body     => Fog::JSON.encode(options),
-            :expects  => 200,
-            :method   => :put,
-            :path     => path
+            :body       => Fog::JSON.encode(options),
+            :expects    => 200,
+            :idempotent => true,
+            :method     => :put,
+            :path       => path
           )
         end
       end

data/lib/fog/dynect/requests/dns/put_zone.rb

@@ -14,10 +14,11 @@ module Fog
 
         def put_zone(zone, options = {})
           request(
-            :body     => Fog::JSON.encode(options),
-            :expects  => 200,
-            :method   => :put,
-            :path     => 'Zone/' << zone
+            :body       => Fog::JSON.encode(options),
+            :expects    => 200,
+            :idempotent => true,
+            :method     => :put,
+            :path       => 'Zone/' << zone
           )
         end
       end

data/lib/fog/ecloud.rb

@@ -1,31 +1 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
-
-module Fog
-  module Ecloud
-    ECLOUD_OPTIONS = [:ecloud_authentication_method]
-
-    extend Fog::Provider
-
-    service(:compute, 'ecloud/compute', 'Compute')
-
-    def self.keep(hash, *keys)
-      {}.tap do |kept|
-        keys.each{|k| kept[k]= hash[k] if hash.key?(k)}
-      end
-    end
-
-    def self.slice(hash, *keys)
-      hash.dup.tap do |sliced|
-        keys.each{|k| sliced.delete(k)}
-      end
-    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/ecloud/compute'

data/lib/fog/ecloud/compute.rb

@@ -1,3 +1,4 @@
+require 'fog/ecloud/core'
 require 'fog/ecloud/collection'
 require 'fog/ecloud/model'
 require 'builder'

data/lib/fog/ecloud/core.rb

@@ -0,0 +1,31 @@
+require 'fog/core'
+
+module Fog
+  module Ecloud
+    ECLOUD_OPTIONS = [:ecloud_authentication_method]
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+
+    def self.keep(hash, *keys)
+      {}.tap do |kept|
+        keys.each{|k| kept[k]= hash[k] if hash.key?(k)}
+      end
+    end
+
+    def self.slice(hash, *keys)
+      hash.dup.tap do |sliced|
+        keys.each{|k| sliced.delete(k)}
+      end
+    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/glesys.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module Glesys
-
-    extend Fog::Provider
-
-    service(:compute, 'glesys/compute', 'Compute')
-
-  end
-end
+require 'fog/glesys/compute'

data/lib/fog/glesys/compute.rb

@@ -1,3 +1,5 @@
+require 'fog/glesys/core'
+
 module Fog
   module Compute
     class Glesys < Fog::Service
@@ -80,7 +82,7 @@ module Fog
           @connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
         end
 
-        def request(method_name, options = {}) 
+        def request(method_name, options = {})
 
           options.merge!( {:format => 'json'})
 
@@ -112,9 +114,9 @@ module Fog
               Fog::Compute::Glesys::NotFound.slurp(error)
             else
               error
-            end 
-          end 
-        end 
+            end
+          end
+        end
 
         private
 

data/lib/fog/glesys/core.rb

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

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

@@ -79,7 +79,7 @@ module Fog
         end
 
         def setup(credentials = {})
-          requires :public_ip_address, :username
+          requires :ssh_ip_address, :username
           require 'net/ssh'
 
           attrs = attributes.dup
@@ -100,7 +100,7 @@ module Fog
           # wait for glesys 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
 
         def ssh(command, options={}, &block)

data/lib/fog/go_grid.rb

@@ -1,11 +1 @@
-require 'fog/core'
-
-module Fog
-  module GoGrid
-
-    extend Fog::Provider
-
-    service(:compute, 'go_grid/compute', 'Compute')
-
-  end
-end
+require 'fog/go_grid/compute'