fog 1.1.2 → 1.2.0

data/lib/fog/ecloud/requests/compute/add_node.rb

@@ -20,7 +20,7 @@ module Fog
           if configure
             valid_opts.delete_if { |opt| ![:name, :enabled, :description].include?(opt) }
           end
-          unless valid_opts.all? { |opt| node_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| node_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - node_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/clone_vapp.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_clone_vapp_options(options)
           valid_opts = [:name, :poweron]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_internet_service.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_public_ip_address_data(ip_address_data)
           valid_opts = [:name, :href, :id]
-          unless valid_opts.all? { |opt| ip_address_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| ip_address_data.has_key?(opt) }
             raise ArgumentError.new("Required Internet Service data missing: #{(valid_opts - ip_address_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_network.rb

@@ -5,7 +5,7 @@ module Fog
 
         def validate_network_data(network_data, configure=false)
           valid_opts = [:id, :href, :name, :rnat, :address, :broadcast, :gateway]
-          unless valid_opts.all? { |opt| network_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_network_ip.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_network_ip_data(network_ip_data)
           valid_opts = [:id, :href, :name, :status, :server, :rnat]
-          unless valid_opts.all? { |opt| network_ip_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| network_ip_data.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - network_ip_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/configure_vapp.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_vapp_data(vapp_data)
           valid_opts = [:name, :cpus, :memory, :disks]
-          unless valid_opts.all? { |opt| vapp_data.keys.include?(opt) }
+          unless valid_opts.all? { |opt| vapp_data.has_key?(opt) }
             raise ArgumentError.new("Required Vapp data missing: #{(valid_opts - vapp_data.keys).map(&:inspect).join(", ")}")
           end
         end

data/lib/fog/ecloud/requests/compute/instantiate_vapp_template.rb

@@ -6,7 +6,7 @@ module Fog
 
         def validate_instantiate_vapp_template_options(catalog_item_uri, options)
           valid_opts = [:name, :vdc_uri, :network_uri, :cpus, :memory, :row, :group]
-          unless valid_opts.all? { |opt| options.keys.include?(opt) }
+          unless valid_opts.all? { |opt| options.has_key?(opt) }
             raise ArgumentError.new("Required data missing: #{(valid_opts - options.keys).map(&:inspect).join(", ")}")
           end
 

data/lib/fog/glesys/compute.rb

@@ -79,7 +79,7 @@ module Fog
         def request(method_name, options = {}) 
 
           options.merge!( {:format => 'json'})
-          
+
           begin
             parser = options.delete(:parser)
             data = @connection.request(
@@ -96,7 +96,9 @@ module Fog
 
             data.body = MultiJson.decode(data.body)
 
-            unless data.body['response']['status']['code'] == '200'
+            response_code =  data.body['response']['status']['code']
+
+            unless response_code.to_i == 200
               raise Fog::Compute::Glesys::Error, "#{data.body['response']['status']['text']}"
             end
             data

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

@@ -15,11 +15,11 @@ module Fog
         attribute :memorysize
         attribute :disksize
         attribute :transfer
-        attribute :template
+        attribute :templatename
         attribute :managedhosting
         attribute :platform
         attribute :cost
-        attribute :rootpw
+        attribute :rootpassword
         attribute :keepip
         attribute :state
         attribute :iplist
@@ -32,7 +32,7 @@ module Fog
 
         def start
           requires :identity
-          connection.start(:serverid => identity) 
+          connection.start(:serverid => identity)
         end
 
         def stop
@@ -47,24 +47,24 @@ module Fog
 
         def save
           raise "Operation not supported" if self.identity
-          requires :hostname, :rootpw
+          requires :hostname, :rootpassword
 
           options = {
-            :datacenter => datacenter || "Falkenberg",
-            :platform   => platform || "Xen",
-            :hostname   => hostname,
-            :template   => template || "Debian-6 x64",
-            :disksize   => disksize || "10",
-            :memorysize => memorysize || "512",
-            :cpucores   => cpucores || "1",
-            :rootpw     => rootpw,
-            :transfer   => transfer || "500",
+            :datacenter     => datacenter   || "Falkenberg",
+            :platform       => platform     || "Xen",
+            :hostname       => hostname,
+            :templatename   => templatename || "Debian-6 x64",
+            :disksize       => disksize     || "10",
+            :memorysize     => memorysize   || "512",
+            :cpucores       => cpucores     || "1",
+            :rootpassword   => rootpassword,
+            :transfer       => transfer     || "500",
           } 
           data = connection.create(options)
           merge_attributes(data.body['response']['server'])
           data.status == 200 ? true : false
         end
-        
+
       end
     end
   end

data/lib/fog/google/requests/storage/get_object.rb

@@ -32,22 +32,30 @@ module Fog
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
+
+          params = { :headers => {} }
           if version_id = options.delete('versionId')
-            query = {'versionId' => version_id}
+            params[:query] = {'versionId' => version_id}
+          end
+          params[:headers].merge!(options)
+          if options['If-Modified-Since']
+            params[:headers]['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header
+          end
+          if options['If-Modified-Since']
+            params[:headers]['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header
           end
-          headers = {}
-          headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since']
-          headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since']
-          headers.merge!(options)
-          request({
-            :expects  => 200,
-            :headers  => headers,
-            :host     => "#{bucket_name}.#{@host}",
-            :idempotent => true,
-            :method   => 'GET',
-            :path     => CGI.escape(object_name),
-            :query    => query
-          }, &block)
+
+          if block_given?
+            params[:response_block] = Proc.new
+          end
+
+          request(params.merge!({
+            :expects        => 200,
+            :host           => "#{bucket_name}.#{@host}",
+            :idempotent     => true,
+            :method         => 'GET',
+            :path           => CGI.escape(object_name),
+          }))
         end
 
       end

data/lib/fog/joyent.rb

@@ -0,0 +1,8 @@
+module Fog
+  module Joyent
+    extend Fog::Provider
+
+    service(:compute, 'joyent/compute', 'Compute')
+
+  end
+end

data/lib/fog/joyent/compute.rb

@@ -0,0 +1,228 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'joyent'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'errors'))
+require 'fog/compute'
+require 'multi_json'
+
+module Fog
+  module Compute
+    class Joyent < Fog::Service
+      requires :joyent_username
+
+      recognizes :joyent_password
+      recognizes :joyent_url
+      recognizes :joyent_keyname
+      recognizes :joyent_keyfile
+
+      model_path 'fog/joyent/models/compute'
+      request_path 'fog/joyent/requests/compute'
+
+      # request :list_datacenters
+      # request :get_datacenter
+
+      # Keys
+      collection :keys
+      model :key
+
+      request :list_keys
+      request :get_key
+      request :create_key
+      request :delete_key
+
+      # Images
+      collection :images
+      model :image
+      request :list_datasets
+      request :get_dataset
+
+      # Flavors
+      collection :flavors
+      model :flavor
+      request :list_packages
+      request :get_package
+
+      # Servers
+      collection :servers
+      model :server
+      request :list_machines
+      request :get_machine
+      request :create_machine
+      request :start_machine
+      request :stop_machine
+      request :reboot_machine
+      request :resize_machine
+      request :delete_machine
+
+      # Snapshots
+      collection :snapshots
+      model :snapshot
+      request :create_machine_snapshot
+      request :start_machine_from_snapshot
+      request :list_machine_snapshots
+      request :get_machine_snapshot
+      request :delete_machine_snapshot
+      request :update_machine_metadata
+      request :get_machine_metadata
+      request :delete_machine_metadata
+      request :delete_all_machine_metadata
+
+      # MachineTags
+      request :add_machine_tags
+      request :list_machine_tags
+      request :get_machine_tag
+      request :delete_machine_tag
+      request :delete_all_machine_tags
+
+
+
+      class Mock
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {}
+          end
+        end
+
+        def data
+          self.class.data
+        end
+
+        def initialize(options = {})
+          @joyent_username = options[:joyent_username] || Fog.credentials[:joyent_username]
+          @joyent_password = options[:joyent_password] || Fog.credentials[:joyent_password]
+        end
+
+        def request(opts)
+          raise "Not Implemented"
+        end
+      end # Mock
+
+      class Real
+        def initialize(options = {})
+          @connection_options = options[:connection_options] || {}
+          @persistent = options[:persistent] || false
+
+          @joyent_url = options[:joyent_url] || 'https://us-sw-1.api.joyentcloud.com'
+          @joyent_version = options[:joyent_version] || '~6.5'
+
+          @joyent_username = options[:joyent_username]
+
+          unless @joyent_username
+            raise ArgumentError, "options[:joyent_username] required"
+          end
+
+          if options[:joyent_keyname] && options[:joyent_keyfile]
+            if File.exists?(options[:joyent_keyfile])
+              @joyent_keyname = options[:joyent_keyname]
+              @joyent_key = File.read(options[:joyent_keyfile])
+
+              @rsa = OpenSSL::PKey::RSA.new(@joyent_key)
+
+              @header_method = method(:header_for_signature_auth)
+            else
+              raise ArgumentError, "options[:joyent_keyfile] provided does not exist."
+            end
+
+          elsif options[:joyent_password]
+            @joyent_password = options[:joyent_password]
+
+            @header_method = method(:header_for_basic_auth)
+          else
+            raise ArgumentError, "Must provide either a joyent_password or joyent_keyname and joyent_keyfile pair"
+          end
+
+          @connection = Fog::Connection.new(
+            @joyent_url,
+            @persistent,
+            @connection_options
+          )
+        end
+
+        def request(request = {})
+          request[:headers] = {
+            "X-Api-Version" => @joyent_version,
+            "Content-Type" => "application/json",
+            "Accept" => "application/json"
+          }.merge(request[:headers] || {}).merge(@header_method.call) 
+
+          if request[:body]
+            request[:body] = MultiJson.encode(request[:body])
+          end
+
+          response = @connection.request(request)
+
+          if response.headers["Content-Type"] == "application/json"
+            response.body = json_decode(response.body)
+          end
+
+          raise_if_error!(request, response)
+
+          response
+        end
+
+        private
+
+        def json_decode(body)
+          parsed = MultiJson.decode(body)
+          decode_time_attrs(parsed)
+        end
+
+        def header_for_basic_auth
+          {
+            "Authorization" => "Basic #{Base64.encode64("#{@joyent_username}:#{@joyent_password}").delete("\r\n")}"
+          }
+        end
+
+        def header_for_signature_auth
+          date = Time.now.utc.httpdate
+          signature = Base64.encode64(@rsa.sign("sha256", date)).delete("\r\n")
+          key_id = "/#{@joyent_username}/keys/#{@joyent_keyname}"
+
+          {
+            "Date" => date,
+            "Authorization" => "Signature keyId=\"#{key_id}\",algorithm=\"rsa-sha256\" #{signature}"
+          }
+        end
+
+        def decode_time_attrs(obj)
+          if obj.kind_of?(Hash)
+            obj["created"] = Time.parse(obj["created"]) if obj["created"]
+            obj["updated"] = Time.parse(obj["updated"]) if obj["updated"]
+          elsif obj.kind_of?(Array)
+            obj.map do |o|
+              decode_time_attrs(o)
+            end
+          end
+
+          obj
+        end
+
+        def raise_if_error!(request, response)
+          case response.status
+          when 401 then
+            raise Errors::Unauthorized.new('Invalid credentials were used', request, response)
+          when 403 then
+            raise Errors::Forbidden.new('No permissions to the specified resource', request, response)
+          when 404 then
+            raise Errors::NotFound.new('Requested resource was not found', request, response)
+          when 405 then
+            raise Errors::MethodNotAllowed.new('Method not supported for the given resource', request, response)
+          when 406 then
+            raise Errors::NotAcceptable.new('Try sending a different Accept header', request, response)
+          when 409 then
+            raise Errors::Conflict.new('Most likely invalid or missing parameters', request, response)
+          when 414 then
+            raise Errors::RequestEntityTooLarge.new('You sent too much data', request, response)
+          when 415 then
+            raise Errors::UnsupportedMediaType.new('You encoded your request in a format we don\'t understand', request, response)
+          when 420 then
+            raise Errors::PolicyNotForfilled.new('You are sending too many requests', request, response)
+          when 449 then
+            raise Errors::RetryWith.new('Invalid API Version requested; try with a different API Version', request, response)
+          when 503 then
+            raise Errors::ServiceUnavailable.new('Either there\'s no capacity in this datacenter, or we\'re in a maintenance window', request, response)
+          end
+        end
+
+      end # Real
+    end
+  end
+end

data/lib/fog/joyent/errors.rb

@@ -0,0 +1,90 @@
+module Fog
+  module Compute
+    class Joyent < Fog::Service
+
+      class Errors
+        module MessageParserMixin
+          def message
+            if response.body["code"] && response.body["message"]
+              "[ERROR #{response.body['code']}] : #{response.body['message']}"
+            else
+              ''
+            end
+          end
+
+          def to_s
+            message
+          end
+        end
+
+        # https://us-west-1.api.joyentcloud.com/docs#cloudapi-http-responses
+        #
+        # HTTP Status Codes
+        # 
+        # Your client should check for each of the following status codes from any API request:
+        # 
+        # Response  Code  Description
+
+        # 400 Bad Request Invalid HTTP Request
+        class BadRequest < Excon::Errors::BadRequest
+          include MessageParserMixin
+        end
+
+        # 401 Unauthorized  Either no Authorization header was sent, or invalid credentials were used
+        class Unauthorized < Excon::Errors::Unauthorized
+          include MessageParserMixin
+        end
+
+        # 403 Forbidden No permissions to the specified resource
+        class Forbidden < Excon::Errors::Forbidden
+          include MessageParserMixin
+        end
+
+        # 404 Not Found Something you requested was not found
+        class NotFound < Excon::Errors::NotFound
+          include MessageParserMixin
+        end
+
+        # 405 Method Not Allowed  Method not supported for the given resource
+        class MethodNotAllowed < Excon::Errors::MethodNotAllowed
+          include MessageParserMixin
+        end
+
+        # 406 Not Acceptable  Try sending a different Accept header
+        class NotAcceptable < Excon::Errors::NotAcceptable
+          include MessageParserMixin
+        end
+
+        # 409 Conflict  Most likely invalid or missing parameters
+        class Conflict < Excon::Errors::Conflict
+          include MessageParserMixin
+        end
+
+        # 413 Request Entity Too Large  You sent too much data
+        class RequestEntityTooLarge < Excon::Errors::RequestEntityTooLarge
+          include MessageParserMixin
+        end
+
+        # 415 Unsupported Media Type  You encoded your request in a format we don't understand
+        class UnsupportedMediaType < Excon::Errors::UnsupportedMediaType
+          include MessageParserMixin
+        end
+
+        # 420 Slow Down You're sending too many requests
+        class PolicyNotForfilled < Excon::Errors::HTTPStatusError
+          include MessageParserMixin
+        end
+
+        # 449 Retry With  Invalid Version header; try with a different X-Api-Version string
+        class RetryWith < Excon::Errors::HTTPStatusError
+          include MessageParserMixin
+        end
+
+        # 503 Service Unavailable Either there's no capacity in this datacenter, or we're in a maintenance window
+        class ServiceUnavailable < Excon::Errors::ServiceUnavailable
+          include MessageParserMixin
+        end
+      end
+    end
+  end
+end