fog-maestrodev 1.19.0.20140212012611 → 1.20.0.20140305101305

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

@@ -17,22 +17,28 @@ module Fog
         def bootstrap(new_attributes = {})
           server = new(new_attributes)
 
-          raise(ArgumentError, "public_key_path is required to configure the server.") unless new_attributes[:public_key_path]
-          raise(ArgumentError, "private_key_path is required to configure the server.") unless new_attributes[:private_key_path]
+          check_keys(new_attributes)
+
           credential = Fog.respond_to?(:credential) && Fog.credential || :default
           name       = "fog_#{credential}"
           ssh_key    = service.ssh_keys.detect { |key| key.name == name }
           if ssh_key.nil?
             ssh_key = service.ssh_keys.create(
               :name        => name,
-              :ssh_pub_key => File.read(new_attributes[:public_key_path])
+              :ssh_pub_key => (new_attributes[:public_key] || File.read(new_attributes[:public_key_path]))
             )
           end
           server.ssh_keys = [ssh_key]
 
           server.save
           server.wait_for { ready? }
-          server.setup :keys => [new_attributes[:private_key_path]]
+
+          if new_attributes[:private_key]
+            server.setup :key_data => [new_attributes[:private_key]]
+          else
+            server.setup :keys => [new_attributes[:private_key_path]]
+          end
+
           server
         end
 
@@ -43,6 +49,19 @@ module Fog
           nil
         end
 
+        protected
+
+        def check_keys(attributes)
+          check_key :public, attributes[:public_key], attributes[:public_key_path]
+          check_key :private, attributes[:private_key], attributes[:private_key_path]
+        end
+
+        def check_key(name, data, path)
+          if [data, path].all?(&:nil?)
+            raise ArgumentError, "either #{name}_key or #{name}_key_path is required to configure the server"
+          end
+        end
+
       end
 
     end

data/lib/fog/digitalocean/requests/compute/create_server.rb

@@ -54,7 +54,8 @@ module Fog
             "image_id" => image_id,
             "region_id" => region_id,
             "ip_address" => "127.0.0.1",
-            "status" => 'active'
+            "status" => 'active',
+            "created_at" => Time.now.strftime("%FT%TZ")
           }
 
           response.body = {

data/lib/fog/digitalocean/requests/compute/destroy_server.rb

@@ -10,7 +10,9 @@ module Fog
           request(
             :expects  => [200],
             :method   => 'GET',
-            :path     => "droplets/#{id}/destroy"
+            :path     => "droplets/#{id}/destroy",
+            # We scrub data so future users can't read our disks.
+            :query    => {:scrub_data => '1' }
           )
         end
 

data/lib/fog/dnsimple.rb

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

data/lib/fog/dnsimple/core.rb

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

data/lib/fog/dnsimple/dns.rb

@@ -1,4 +1,4 @@
-require 'fog/dnsimple'
+require 'fog/dnsimple/core'
 require 'fog/dns'
 
 module Fog
@@ -67,7 +67,7 @@ module Fog
             options[:port]    = uri.port
             options[:scheme]  = uri.scheme
           end
-          @host       = options[:host]        || "dnsimple.com"
+          @host       = options[:host]        || "api.dnsimple.com"
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
@@ -85,6 +85,9 @@ module Fog
                                     "Accept" => "application/json",
                                     "Content-Type" => "application/json" })
 
+          version = params.delete(:version) || 'v1'
+          params[:path] = "/#{version}#{params[:path]}"
+
           response = @connection.request(params)
 
           unless response.body.empty?

data/lib/fog/dnsimple/models/dns/record.rb

@@ -11,14 +11,14 @@ module Fog
 
         identity :id
 
+        attribute :zone_id,     :aliases => "domain_id"
         attribute :name
         attribute :value,       :aliases => "content"
         attribute :ttl
+        attribute :priority,    :aliases => "prio"
+        attribute :type,        :aliases => "record_type"
         attribute :created_at
         attribute :updated_at
-        attribute :zone_id,     :aliases => "domain_id"
-        attribute :type,        :aliases => "record_type"
-        attribute :priority,    :aliases => "prio"
 
         def initialize(attributes={})
           super

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

@@ -4,21 +4,27 @@ module Fog
       class Real
 
         # Create a single domain in DNSimple in your account.
+        #
         # ==== Parameters
         # * name<~String> - domain name to host (ie example.com)
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'name'<~String>
+        #     * 'domain'<~Hash> The representation of the domain.
         def create_domain(name)
-          body = { "domain" => { "name" => name } }
+          body = {
+            "domain" => {
+              "name" => name
+            }
+          }
+
           request(
-                  :body     => Fog::JSON.encode(body),
-                  :expects  => 201,
-                  :method   => 'POST',
-                  :path     => '/domains'
-                  )
+            :body     => Fog::JSON.encode(body),
+            :expects  => 201,
+            :method   => 'POST',
+            :path     => "/domains"
+          )
         end
 
       end
@@ -26,32 +32,30 @@ module Fog
       class Mock
 
         def create_domain(name)
-          response = Excon::Response.new
-          response.status = 201
-
           body = {
             "domain" =>  {
-              "auto_renew"         => nil,
-              "created_at"         => Time.now.iso8601,
-              "expires_on"         => Date.today + 365,
               "id"                 => Fog::Mock.random_numbers(1).to_i,
-              "language"           => nil,
-              "lockable"           => true,
-              "name"               => name,
-              "name_server_status" => "unknown",
+              "user_id"            => 1,
               "registrant_id"      => nil,
-              "state"              => "registered",
-              "token"              => "4fIFYWYiJayvL2tkf_mkBkqC4L+4RtYqDA",
+              "name"               => name,
               "unicode_name"       => name,
-              "updated_at"         => Time.now.iso8601,
-              "user_id"            => 1,
+              "token"              => "4fIFYWYiJayvL2tkf_mkBkqC4L+4RtYqDA",
+              "state"              => "registered",
+              "language"           => nil,
+              "lockable"           => true,
+              "auto_renew"         => nil,
+              "whois_protected"    => false,
               "record_count"       => 0,
               "service_count"      => 0,
-              "private_whois?"     => false
+              "expires_on"         => Date.today + 365,
+              "created_at"         => Time.now.iso8601,
+              "updated_at"         => Time.now.iso8601,
             }
           }
           self.data[:domains] << body
 
+          response = Excon::Response.new
+          response.status = 201
           response.body = body
           response
         end

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

@@ -6,40 +6,35 @@ module Fog
         # Create a new host in the specified zone
         #
         # ==== Parameters
-        # * domain<~String>
+        # * domain<~String> - domain name or numeric ID
         # * name<~String>
         # * type<~String>
         # * content<~String>
         # * options<~Hash> - optional
         #   * priority<~Integer>
         #   * ttl<~Integer>
+        #
         # ==== Returns
         # * response<~Excon::Response>:
-        #   * body<~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 create_record(domain, name, type, content, options = {})
-
           body = {
             "record" => {
               "name" => name,
               "record_type" => type,
-              "content" => content } }
+              "content" => content
+            }
+          }
 
           body["record"].merge!(options)
 
-          request( :body     => Fog::JSON.encode(body),
-                   :expects  => 201,
-                   :method   => 'POST',
-                   :path     => "/domains/#{domain}/records" )
+          request(
+            :body     => Fog::JSON.encode(body),
+            :expects  => 201,
+            :method   => 'POST',
+            :path     => "/domains/#{domain}/records"
+          )
         end
 
       end
@@ -47,23 +42,25 @@ module Fog
       class Mock
 
         def create_record(domain, name, type, content, options = {})
-          response = Excon::Response.new
-          response.status = 201
           body = {
             "record" => {
+              "id" => Fog::Mock.random_numbers(1).to_i,
+              "domain_id" => domain,
               "name" => name,
-              "record_type" => type,
               "content" => content,
+              "ttl" => 3600,
+              "prio" => nil,
+              "record_type" => type,
+              "system_record" => nil,
               "created_at" => Time.now.iso8601,
               "updated_at" => Time.now.iso8601,
-              "id" => Fog::Mock.random_numbers(1).to_i,
-              "domain_id" => domain
             }.merge(options)
           }
-
           self.data[:records][domain] ||= []
           self.data[:records][domain] << body
 
+          response = Excon::Response.new
+          response.status = 201
           response.body = body
           response
         end

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

@@ -10,14 +10,14 @@ module Fog
         # DNSimple this will not delete the domain from the registry.
         #
         # ==== Parameters
-        # * name<~String> - domain name or numeric ID
+        # * domain<~String> - domain name or numeric ID
         #
-        def delete_domain(name)
+        def delete_domain(domain)
           request(
-                  :expects  => 200,
-                  :method   => 'DELETE',
-                  :path     => "/domains/#{name}"
-                  )
+            :expects  => 200,
+            :method   => 'DELETE',
+            :path     => "/domains/#{domain}"
+          )
         end
 
       end
@@ -27,6 +27,7 @@ module Fog
         def delete_domain(name)
           self.data[:records].delete name
           self.data[:domains].reject! { |domain| domain["domain"]["name"] == name }
+
           response = Excon::Response.new
           response.status = 200
           response

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

@@ -6,13 +6,14 @@ module Fog
         # Delete the record with the given ID for the given domain.
         #
         # ==== Parameters
-        # * domain<~String>
+        # * domain<~String> - domain name or numeric ID
         # * record_id<~String>
         def delete_record(domain, record_id)
-
-          request( :expects  => 200,
-                   :method   => "DELETE",
-                   :path     => "/domains/#{domain}/records/#{record_id}" )
+          request(
+            :expects  => 200,
+            :method   => "DELETE",
+            :path     => "/domains/#{domain}/records/#{record_id}"
+          )
         end
 
       end
@@ -21,6 +22,7 @@ module Fog
 
         def delete_record(domain, record_id)
           self.data[:records][domain].reject! { |record| record["record"]["id"] == record_id }
+
           response = Excon::Response.new
           response.status = 200
           response

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

@@ -8,27 +8,18 @@ module Fog
         # itself.
         #
         # ==== Parameters
-        # * id<~String> - domain name or numeric ID
+        # * domain<~String> - domain name or numeric ID
         #
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'domain'<~Hash>
-        #       * '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>
-        def get_domain(id)
+        #     * 'domain'<~Hash> The representation of the domain.
+        def get_domain(domain)
           request(
-                  :expects  => 200,
-                  :method   => "GET",
-                  :path     => "/domains/#{id}"
-                  )
+            :expects  => 200,
+            :method   => "GET",
+            :path     => "/domains/#{domain}"
+          )
         end
 
       end
@@ -36,7 +27,10 @@ module Fog
       class Mock
 
         def get_domain(id)
-          domain = self.data[:domains].detect { |domain| domain["domain"]["id"] == id }
+          domain = self.data[:domains].detect do |domain|
+            domain["domain"]["id"] == id || domain["domain"]["name"] == id
+          end
+
           response = Excon::Response.new
           response.status = 200
           response.body = domain
@@ -46,4 +40,4 @@ module Fog
       end
     end
   end
-end
+end

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

@@ -6,26 +6,19 @@ module Fog
         # Gets record from given domain.
         #
         # ==== Parameters
-        # * domain<~String>
+        # * domain<~String> - domain name or numeric ID
         # * record_id<~String>
+        #
         # ==== 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 get_record(domain, record_id)
-
-          request( :expects  => 200,
-                   :method   => "GET",
-                   :path     => "/domains/#{domain}/records/#{record_id}" )
+          request(
+            :expects  => 200,
+            :method   => "GET",
+            :path     => "/domains/#{domain}/records/#{record_id}"
+          )
         end
 
       end
@@ -34,7 +27,8 @@ module Fog
 
         def get_record(domain, record_id)
           response = Excon::Response.new
-          if self.data[:records].has_key? domain
+
+          if self.data[:records].has_key?(domain)
             response.status = 200
             response.body = self.data[:records][domain].detect { |record| record["record"]["id"] == record_id }