fog 0.3.31 → 0.3.32

data/lib/fog/core/deprecation.rb

@@ -2,12 +2,18 @@ module Fog
   module Deprecation
 
     def deprecate(older, newer)
-      class_eval <<-EOS, __FILE__, __LINE__
+      module_eval <<-EOS, __FILE__, __LINE__
         def #{older}(*args)
-          location = caller.first
-          warning = "[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/]"
-          warning << " [light_black](" << location << ")[/] "
-          Formatador.display_line(warning)
+          Formatador.display_line("[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/] [light_black](#{caller.first})[/]")
+          send(:#{newer}, *args)
+        end
+      EOS
+    end
+
+    def self_deprecate(older, newer)
+      module_eval <<-EOS, __FILE__, __LINE__
+        def self.#{older}(*args)
+          Formatador.display_line("[yellow][WARN] #{self} => ##{older} is deprecated, use ##{newer} instead[/] [light_black](#{caller.first})[/]")
           send(:#{newer}, *args)
         end
       EOS

data/lib/fog/core/mock.rb

@@ -0,0 +1,34 @@
+module Fog
+
+  @mocking = false
+
+  def self.mock!
+    @mocking = true
+  end
+
+  def self.mock?
+    @mocking
+  end
+
+  def self.mocking?
+    @mocking
+  end
+
+  module Mock
+    @delay = 1
+    def self.delay
+      @delay
+    end
+
+    def self.delay=(new_delay)
+      raise ArgumentError, "delay must be non-negative" unless new_delay >= 0
+      @delay = new_delay
+    end
+
+    def self.not_implemented
+      raise Fog::Errors::MockNotImplemented.new("Contributions welcome!")
+    end
+
+  end
+
+end

data/lib/fog/core/model.rb

@@ -39,7 +39,15 @@ module Fog
     def wait_for(timeout=600, interval=1, &block)
       reload
       Fog.wait_for(timeout, interval) do
-        reload or raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} went away.")
+        retries = 3
+        if reload
+          retries = 3
+        elsif retries > 0
+          retries -= 1
+          sleep(1)
+        elsif retries == 0
+          raise Fog::Errors::Error.new("Reload failed, #{self.class} #{self.identity} went away.")
+        end
         instance_eval(&block)
       end
     end

data/lib/fog/core/service.rb

@@ -18,26 +18,6 @@ module Fog
 
     class << self
 
-      # this is to accomodate Real implementations of Service subclasses
-      # NOTE: it might be good to enforce parameter specs to Mock classes as well.
-      def inject_parameter_specs
-        lambda do |spec|
-          implementation = "Real"
-          self.const_set(implementation, Class.new) unless self.const_defined? implementation
-          realclass = self.const_get implementation
-
-          if realclass.declared_parameters_for(:'self.new', :required).empty?
-            required = declared_parameters_for(:'self.new', :required)
-            realclass.send(:requires, *required)
-          end
-        
-          if realclass.declared_parameters_for(:'self.new', :optional).empty?
-            optional = declared_parameters_for(:'self.new', :optional)
-            realclass.send(:recognizes, *optional) 
-          end
-        end
-      end
-
       def inherited(child)
         child.class_eval <<-EOS, __FILE__, __LINE__
           module Collections
@@ -54,16 +34,16 @@ module Fog
         EOS
       end
 
-      def requirements
-        declared_parameters_for :'self.new', :required
-      end
-
       def new(options={})
-        if Fog.bin
-          default_credentials = filter_parameters(Fog.credentials)
+        # attempt to load credentials from config file
+        begin
+          default_credentials = Fog.credentials.reject {|key, value| !(recognized | requirements).include?(key)}
           options = default_credentials.merge(options)
+        rescue LoadError
+          # if there are no configured credentials, do nothing
         end
 
+        validate_options(options)
         setup_requirements
 
         if Fog.mocking?
@@ -133,10 +113,44 @@ module Fog
         @requests ||= []
       end
 
+      def requires(*args)
+        requirements.concat(args)
+      end
+
+      def requirements
+        @requirements ||= []
+      end
+
+      def recognizes(*args)
+        recognized.concat(args)
+      end
+
+      def recognized
+        @recognized ||= []
+      end
+
+      def reset_data(keys=Mock.data.keys)
+        Mock.reset_data(keys)
+      end
+
       def reset_data(keys=Mock.data.keys)
         Mock.reset_data(keys)
       end
 
+      def validate_options(options)
+        missing = requirements - options.keys
+        unless missing.empty?
+          raise ArgumentError, "Missing required arguments: #{missing.join(', ')}"
+        end
+
+        unless recognizes.empty?
+          unrecognized = options.keys - requirements - recognized
+          unless unrecognized.empty?
+            raise ArgumentError, "Unrecognized arguments: #{unrecognized.join(', ')}"
+          end
+        end
+      end
+
     end
 
   end

data/lib/fog/core/storage.rb

@@ -2,6 +2,7 @@ module Fog
   class Storage
 
     def self.new(attributes)
+      attributes = attributes.dup # prevent delete from having side effects
       case provider = attributes.delete(:provider)
       when 'AWS'
         require 'fog/aws'

data/lib/fog/core/time.rb

@@ -0,0 +1,21 @@
+module Fog
+  class Time < ::Time
+    class << self
+
+      def now
+        ::Time.now - offset
+      end
+
+      def now=(new_now)
+        old_now = ::Time.now
+        @offset = old_now - new_now
+        new_now
+      end
+
+      def offset
+        @offset ||= 0
+      end
+
+    end
+  end
+end

data/lib/fog/core/wait_for.rb

@@ -0,0 +1,17 @@
+module Fog
+
+  def self.wait_for(timeout=600, interval=1, &block)
+    duration = 0
+    start = Time.now
+    until yield || duration > timeout
+      sleep(interval)
+      duration = Time.now - start
+    end
+    if duration > timeout
+      false
+    else
+      { :duration => duration }
+    end
+  end
+  
+end

data/lib/fog/go_grid.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'core')
+
 module Fog
   module GoGrid
 

data/lib/fog/go_grid/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module GoGrid
     class Compute < Fog::Service
 
-      requires :go_grid_api_key, :go_grid_shared_secret, &inject_parameter_specs
-      recognizes :host, :path, :port, :scheme, :persistent, &inject_parameter_specs
+      requires :go_grid_api_key, :go_grid_shared_secret
+      recognizes :host, :path, :port, :scheme, :persistent
 
       model_path 'fog/go_grid/models/compute'
       model         :image

data/lib/fog/google.rb

@@ -1,4 +1,6 @@
 require 'nokogiri'
+
+require File.join(File.dirname(__FILE__), 'core')
 require 'fog/core/parser'
 
 module Fog

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

@@ -83,11 +83,12 @@ module Fog
 
               response.status = 200
               response.body = {
-                'Contents'    => truncated_contents,
-                'IsTruncated' => truncated_contents.size != contents.size,
-                'Marker'      => options['marker'],
-                'Name'        => bucket['Name'],
-                'Prefix'      => options['prefix']
+                'CommonPrefixes'  => [],
+                'Contents'        => truncated_contents,
+                'IsTruncated'     => truncated_contents.size != contents.size,
+                'Marker'          => options['marker'],
+                'Name'            => bucket['Name'],
+                'Prefix'          => options['prefix']
               }
               if options['max-keys'] && options['max-keys'] < response.body['Contents'].length
                   response.body['IsTruncated'] = true

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

@@ -23,9 +23,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'GET',
-            :path     => CGI.escape(object_name)
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 
@@ -42,9 +42,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'GET',
-            :path     => CGI.escape(object_name)
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 

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

@@ -23,9 +23,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'PUT',
-            :path     => CGI.escape(object_name)
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 
@@ -42,9 +42,9 @@ module Fog
           end
           url({
             :headers  => {},
-            :host     => "#{bucket_name}.#{@host}",
+            :host     => @host,
             :method   => 'PUT',
-            :path     => CGI.escape(object_name)
+            :path     => "#{bucket_name}/#{object_name}"
           }, expires)
         end
 

data/lib/fog/google/storage.rb

@@ -2,8 +2,8 @@ module Fog
   module Google
     class Storage < Fog::Service
 
-      requires :google_storage_access_key_id, :google_storage_secret_access_key, &inject_parameter_specs
-      recognizes :host, :port, :scheme, :persistent, &inject_parameter_specs
+      requires :google_storage_access_key_id, :google_storage_secret_access_key
+      recognizes :host, :port, :scheme, :persistent
 
       model_path 'fog/google/models/storage'
       collection  :directories
@@ -57,7 +57,8 @@ module Fog
           query << "GoogleAccessKeyId=#{@google_storage_access_key_id}"
           query << "Signature=#{CGI.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
+          path = CGI.escape(params[:path]).gsub('%2F', '/')
+          "http://#{params[:host]}/#{path}?#{query.join('&')}"
         end
 
       end

data/lib/fog/linode.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'core')
+
 module Fog
   module Linode
 
@@ -5,6 +7,7 @@ module Fog
 
     service_path 'fog/linode'
     service 'compute'
+    service 'dns'
 
     def self.new(attributes = {})
       location = caller.first

data/lib/fog/linode/bin.rb

@@ -3,9 +3,11 @@ class Linode < Fog::Bin
 
     def class_for(key)
       case key
-      when :compute, :linode
+      when :compute
         Fog::Linode::Compute
-      else 
+      when :dns
+        Fog::Linode::DNS
+      else
         raise ArgumentError, "Unsupported #{self} service: #{key}"
       end
     end
@@ -24,7 +26,7 @@ class Linode < Fog::Bin
     end
 
     def services
-      [:compute]
+      [:compute, :dns]
     end
 
   end

data/lib/fog/linode/compute.rb

@@ -2,8 +2,8 @@ module Fog
   module Linode
     class Compute < Fog::Service
 
-      requires :linode_api_key, &inject_parameter_specs
-      recognizes :port, :scheme, :persistent, &inject_parameter_specs
+      requires :linode_api_key
+      recognizes :port, :scheme, :persistent
 
       model_path 'fog/linode/models/compute'
 
@@ -13,10 +13,14 @@ module Fog
       request :avail_kernels
       request :avail_linodeplans
       request :avail_stackscripts
+      # request :linode_boot
       request :linode_create
       request :linode_delete
       request :linode_list
       request :linode_reboot
+      # request :linode_resize
+      # request :linode_shutdown
+      # request :linode_update
 
       class Mock
 

data/lib/fog/linode/dns.rb

@@ -0,0 +1,80 @@
+module Fog
+  module Linode
+    class DNS < Fog::Service
+
+      requires :linode_api_key
+      recognizes :port, :scheme, :persistent
+
+      model_path 'fog/linode/models/dns'
+
+      request_path 'fog/linode/requests/dns'
+      request :domain_create
+      request :domain_delete
+      request :domain_list
+      request :domain_update
+      request :domain_resource_create
+      request :domain_resource_delete
+      request :domain_resource_list
+      request :domain_resource_update
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {}
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @linode_api_key = options[:linode_api_key]
+          @data = self.class.data[@linode_api_key]
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'json'
+          @linode_api_key = options[:linode_api_key]
+          @host   = options[:host]    || "api.linode.com"
+          @port   = options[:port]    || 443
+          @scheme = options[:scheme]  || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        def request(params)
+          params[:query] ||= {}
+          params[:query].merge!(:api_key => @linode_api_key)
+
+          response = @connection.request(params.merge!({:host => @host}))
+
+          unless response.body.empty?
+            response.body = JSON.parse(response.body)
+            if data = response.body['ERRORARRAY'].first
+              error = case data['ERRORCODE']
+              when 5
+                Fog::Linode::DNS::NotFound
+              else
+                Fog::Linode::DNS::Error
+              end
+              raise error.new(data['ERRORMESSAGE'])
+            end
+          end
+          response
+        end
+
+      end
+    end
+  end
+end