fog 0.8.2 → 0.9.0

data/lib/fog/providers.rb

@@ -10,12 +10,14 @@ require 'fog/providers/aws'
 require 'fog/providers/bluebox'
 require 'fog/providers/brightbox'
 require 'fog/providers/dnsimple'
+require 'fog/providers/dnsmadeeasy'
 require 'fog/providers/ecloud'
 require 'fog/providers/go_grid'
 require 'fog/providers/google'
 require 'fog/providers/linode'
 require 'fog/providers/local'
 require 'fog/providers/new_servers'
+require 'fog/providers/ninefold'
 require 'fog/providers/rackspace'
 require 'fog/providers/slicehost'
 require 'fog/providers/storm_on_demand'

data/lib/fog/providers/aws.rb

@@ -1,6 +1,7 @@
 require 'fog/core'
 require 'fog/core/parser'
 require 'openssl' # For RSA key pairs
+require 'base64' # For console output
 
 module Fog
   module AWS
@@ -63,7 +64,7 @@ module Fog
       end
       string_to_sign = "POST\n#{options[:host]}:#{options[:port]}\n#{options[:path]}\n" << body.chop
       signed_string = options[:hmac].sign(string_to_sign)
-      body << "Signature=#{CGI.escape(Base64.encode64(signed_string).chomp!).gsub(/\+/, '%20')}"
+      body << "Signature=#{escape(Base64.encode64(signed_string).chomp!)}"
 
       body
     end
@@ -78,6 +79,11 @@ module Fog
         sprintf("%0.10f", rand / 100).to_f
       end
 
+      def self.console_output
+        # "[ 0.000000] Linux version 2.6.18-xenU-ec2-v1.2 (root@domU-12-31-39-07-51-82) (gcc version 4.1.2 20070626 (Red Hat 4.1.2-13)) #2 SMP Wed Aug 19 09:04:38 EDT 2009"
+        Base64.decode64("WyAwLjAwMDAwMF0gTGludXggdmVyc2lvbiAyLjYuMTgteGVuVS1lYzItdjEu\nMiAocm9vdEBkb21VLTEyLTMxLTM5LTA3LTUxLTgyKSAoZ2NjIHZlcnNpb24g\nNC4xLjIgMjAwNzA2MjYgKFJlZCBIYXQgNC4xLjItMTMpKSAjMiBTTVAgV2Vk\nIEF1ZyAxOSAwOTowNDozOCBFRFQgMjAwOQ==\n")
+      end
+
       def self.dns_name_for(ip_address)
         "ec2-#{ip_address.gsub('.','-')}.compute-1.amazonaws.com"
       end
@@ -173,7 +179,6 @@ module Fog
       def self.volume_id
         "vol-#{Fog::Mock.random_hex(8)}"
       end
-
     end
   end
 end

data/lib/fog/providers/dnsmadeeasy.rb

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

data/lib/fog/providers/ninefold.rb

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

data/lib/fog/providers/rackspace.rb

@@ -11,7 +11,9 @@ module Fog
 
     def self.authenticate(options)
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"
-      connection = Fog::Connection.new("https://" + rackspace_auth_url)
+      url = rackspace_auth_url.match(/^https?:/) ? \
+                rackspace_auth_url : 'https://' + rackspace_auth_url
+      connection = Fog::Connection.new(url)
       @rackspace_api_key  = options[:rackspace_api_key]
       @rackspace_username = options[:rackspace_username]
       response = connection.request({

data/lib/fog/storage.rb

@@ -1,26 +1,41 @@
 module Fog
-  class Storage
+  module Storage
+
+    def self.[](provider)
+      self.new(:provider => provider)
+    end
 
     def self.new(attributes)
       attributes = attributes.dup # prevent delete from having side effects
-      case provider = attributes[:provider] # attributes.delete(:provider)
-      when 'AWS'
+      case provider = attributes.delete(:provider).to_s.downcase.to_sym
+      when :aws
         require 'fog/storage/aws'
-        Fog::AWS::Storage.new(attributes)
-      when 'Google'
+        Fog::Storage::AWS.new(attributes)
+      when :google
         require 'fog/storage/google'
-        Fog::Google::Storage.new(attributes)
-      when 'Local'
+        Fog::Storage::Google.new(attributes)
+      when :local
         require 'fog/storage/local'
-        Fog::Local::Storage.new(attributes)
-      when 'Rackspace'
+        Fog::Storage::Local.new(attributes)
+      when :rackspace
         require 'fog/storage/rackspace'
-        Fog::Rackspace::Storage.new(attributes)
+        Fog::Storage::Rackspace.new(attributes)
       else
         raise ArgumentError.new("#{provider} is not a recognized storage provider")
       end
     end
 
+    def self.directories
+      directories = []
+      for provider in [:aws, :google, :local, :rackspace]
+        begin
+          directories.concat(self[provider].directories)
+        rescue # ignore any missing credentials/etc
+        end
+      end
+      directories
+    end
+
     def self.get_body_size(body)
       if body.respond_to?(:force_encoding)
         body.force_encoding('BINARY')

data/lib/fog/storage/aws.rb

@@ -1,10 +1,9 @@
 module Fog
-  module AWS
-    class Storage < Fog::Service
+  module Storage
+    class AWS < Fog::Service
 
       requires :aws_access_key_id, :aws_secret_access_key
       recognizes :endpoint, :region, :host, :path, :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/storage/models/aws'
       collection  :directories
@@ -17,6 +16,7 @@ module Fog
       request :complete_multipart_upload
       request :copy_object
       request :delete_bucket
+      request :delete_bucket_policy
       request :delete_bucket_website
       request :delete_object
       request :get_bucket
@@ -24,6 +24,7 @@ module Fog
       request :get_bucket_location
       request :get_bucket_logging
       request :get_bucket_object_versions
+      request :get_bucket_policy
       request :get_bucket_versioning
       request :get_bucket_website
       request :get_object
@@ -40,6 +41,7 @@ module Fog
       request :put_bucket
       request :put_bucket_acl
       request :put_bucket_logging
+      request :put_bucket_policy
       request :put_bucket_versioning
       request :put_bucket_website
       request :put_object
@@ -59,11 +61,17 @@ module Fog
         end
 
         def url(params, expires)
+          params[:headers] ||= {}
           params[:headers]['Date'] = expires.to_i
-          params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
-          query = [params[:query]].compact
+          params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
+          query = []
+          if params[:query]
+            for key, value in params[:query]
+              query << "#{key}=#{Fog::AWS.escape(value)}"
+            end
+          end
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
-          query << "Signature=#{CGI.escape(signature(params))}"
+          query << "Signature=#{Fog::AWS.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
           "https://#{@host}/#{params[:path]}?#{query.join('&')}"
         end
@@ -153,13 +161,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::Storage.new is deprecated, use Fog::Storage.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]
           @aws_secret_access_key = options[:aws_secret_access_key]
@@ -216,13 +217,6 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::AWS::Storage.new is deprecated, use Fog::Storage.new(:provider => 'AWS') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/core/parser'
           require 'mime/types'
 
@@ -268,7 +262,7 @@ module Fog
         def signature(params)
           string_to_sign =
 <<-DATA
-#{params[:method]}
+#{params[:method].to_s.upcase}
 #{params[:headers]['Content-MD5']}
 #{params[:headers]['Content-Type']}
 #{params[:headers]['Date']}
@@ -300,12 +294,33 @@ DATA
 
           canonical_resource  = @path.dup
           unless subdomain.nil? || subdomain == @host
-            canonical_resource << "#{CGI.escape(subdomain).downcase}/"
+            canonical_resource << "#{Fog::AWS.escape(subdomain).downcase}/"
           end
           canonical_resource << params[:path].to_s
           canonical_resource << '?'
           for key in (params[:query] || {}).keys.sort
-            if %w{acl location logging notification partNumber policy requestPayment torrent uploadId uploads versionId versioning versions website}.include?(key)
+            if %w{
+              acl
+              location
+              logging
+              notification
+              partNumber
+              policy
+              requestPayment
+              reponse-cache-control
+              response-content-disposition
+              response-content-encoding
+              response-content-language
+              response-content-type
+              response-expires
+              torrent
+              uploadId
+              uploads
+              versionId
+              versioning
+              versions
+              website
+            }.include?(key)
               canonical_resource << "#{key}#{"=#{params[:query][key]}" unless params[:query][key].nil?}&"
             end
           end

data/lib/fog/storage/google.rb

@@ -1,10 +1,9 @@
 module Fog
-  module Google
-    class Storage < Fog::Service
+  module Storage
+    class Google < Fog::Service
 
       requires :google_storage_access_key_id, :google_storage_secret_access_key
       recognizes :host, :port, :scheme, :persistent
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/storage/models/google'
       collection  :directories
@@ -124,13 +123,6 @@ module Fog
         end
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Google::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Google') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
         end
@@ -171,13 +163,6 @@ module Fog
         # ==== Returns
         # * Storage object with connection to google.
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Google::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Google') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'fog/core/parser'
           require 'mime/types'
 

data/lib/fog/storage/local.rb

@@ -1,9 +1,8 @@
 module Fog
-  module Local
-    class Storage < Fog::Service
+  module Storage
+    class Local < Fog::Service
 
       requires :local_root
-      recognizes :provider # remove post deprecation
 
       model_path 'fog/storage/models/local'
       collection  :directories
@@ -27,13 +26,6 @@ module Fog
           Fog::Mock.not_implemented
 
           require 'mime/types'
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Local::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Local') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           @local_root = ::File.expand_path(options[:local_root])
         end
 
@@ -58,13 +50,6 @@ module Fog
       class Real
 
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Local::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Local') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
-
           require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
         end

data/lib/fog/storage/models/aws/directories.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/storage/models/aws/directory'
 
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
 
       class Directories < Fog::Collection
 
-        model Fog::AWS::Storage::Directory
+        model Fog::Storage::AWS::Directory
 
         def all
           data = connection.get_service.body['Buckets']

data/lib/fog/storage/models/aws/directory.rb

@@ -2,8 +2,8 @@ require 'fog/core/model'
 require 'fog/storage/models/aws/files'
 
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
 
       class Directory < Fog::Model
 
@@ -39,7 +39,7 @@ module Fog
 
         def files
           @files ||= begin
-            Fog::AWS::Storage::Files.new(
+            Fog::Storage::AWS::Files.new(
               :directory    => self,
               :connection   => connection
             )

data/lib/fog/storage/models/aws/file.rb

@@ -1,8 +1,8 @@
 require 'fog/core/model'
 
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
 
       class File < Fog::Model
 

data/lib/fog/storage/models/aws/files.rb

@@ -2,8 +2,8 @@ require 'fog/core/collection'
 require 'fog/storage/models/aws/file'
 
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
 
       class Files < Fog::Collection
 
@@ -15,7 +15,7 @@ module Fog
         attribute :max_keys,        :aliases => ['MaxKeys', 'max-keys']
         attribute :prefix,          :aliases => 'Prefix'
 
-        model Fog::AWS::Storage::File
+        model Fog::Storage::AWS::File
 
         def all(options = {})
           requires :directory
@@ -65,8 +65,15 @@ module Fog
           })
           normalise_headers(file_data)
           new(file_data)
-        rescue Excon::Errors::NotFound
-          nil
+        rescue Excon::Errors::NotFound => error
+          case error.message
+          when /<Code>NoSuchKey<\/Code>/
+            nil
+          when /<Code>NoSuchBucket<\/Code>/
+            raise(Fog::Storage::AWS::NotFound.new("Directory #{directory.identity} does not exist."))
+          else
+            raise(error)
+          end
         end
 
         def get_url(key, expires)

data/lib/fog/storage/models/google/directories.rb

@@ -2,12 +2,12 @@ require 'fog/core/collection'
 require 'fog/storage/models/google/directory'
 
 module Fog
-  module Google
-    class Storage
+  module Storage
+    class Google
 
       class Directories < Fog::Collection
 
-        model Fog::Google::Storage::Directory
+        model Fog::Storage::Google::Directory
 
         def all
          data = connection.get_service.body['Buckets']