fog 0.9.0 → 0.10.0

data/lib/fog/core/collection.rb

@@ -6,19 +6,19 @@ module Fog
 
     Array.public_instance_methods(false).each do |method|
       unless [:reject, :select, :slice].include?(method.to_sym)
-        class_eval <<-RUBY
+        class_eval <<-EOS, __FILE__, __LINE__
           def #{method}(*args)
             unless @loaded
               lazy_load
             end
             super
           end
-        RUBY
+        EOS
       end
     end
 
     %w[reject select slice].each do |method|
-      class_eval <<-RUBY
+      class_eval <<-EOS, __FILE__, __LINE__
         def #{method}(*args)
           unless @loaded
             lazy_load
@@ -26,7 +26,7 @@ module Fog
           data = super
           result = self.clone.clear.concat(data)
         end
-      RUBY
+      EOS
     end
 
     def self.model(new_model=nil)
@@ -115,9 +115,9 @@ module Fog
       Formatador.display_table(self.map {|instance| instance.attributes}, attributes)
     end
 
-    def to_json
-      require 'json'
-      self.map {|member| member.attributes}.to_json
+    def to_json(options = {})
+      require 'multi_json'
+      MultiJson.encode(self.map {|member| member.attributes})
     end
 
     private

data/lib/fog/core/credentials.rb

@@ -21,6 +21,8 @@ module Fog
     @credential_path ||= begin
       path = ENV["FOG_RC"] || (ENV['HOME'] && File.directory?(ENV['HOME']) && '~/.fog')
       File.expand_path(path) if path
+    rescue
+      nil
     end
   end
 
@@ -45,9 +47,9 @@ module Fog
   
   def self.symbolize_credentials(args)
     if args.is_a? Hash
-      Hash[ args.collect do |key, value|
+      Hash[ *args.collect do |key, value|
         [key.to_sym, self.symbolize_credentials(value)]
-      end ]
+      end.flatten ]
     else
       args
     end

data/lib/fog/core/model.rb

@@ -37,12 +37,12 @@ module Fog
       self
     end
 
-    def to_json
-      require 'json'
-      attributes.to_json
+    def to_json(options = {})
+      require 'multi_json'
+      MultiJson.encode(attributes)
     end
 
-    def wait_for(timeout=600, interval=1, &block)
+    def wait_for(timeout=Fog.timeout, interval=1, &block)
       reload
       retries = 3
       Fog.wait_for(timeout, interval) do

data/lib/fog/core/time.rb

@@ -19,8 +19,7 @@ module Fog
     end
 
     def to_date_header
-      now = self.class.now.utc
-      now.strftime("#{DAYS[now.wday]}, %d #{MONTHS[now.month - 1]} %Y %H:%M:%S +0000")
+      self.utc.strftime("#{DAYS[self.utc.wday]}, %d #{MONTHS[self.utc.month - 1]} %Y %H:%M:%S +0000")
     end
 
   end

data/lib/fog/core/timeout.rb

@@ -0,0 +1,11 @@
+module Fog
+  @timeout = 600
+  def self.timeout
+    @timeout
+  end
+
+  def self.timeout=(timeout)
+    raise ArgumentError, "timeout must be non-negative" unless timeout >= 0
+    @timeout = timeout
+  end
+end

data/lib/fog/core/wait_for.rb

@@ -1,6 +1,6 @@
 module Fog
 
-  def self.wait_for(timeout=600, interval=1, &block)
+  def self.wait_for(timeout=Fog.timeout, interval=1, &block)
     duration = 0
     start = Time.now
     until yield || duration > timeout
@@ -14,4 +14,4 @@ module Fog
     end
   end
   
-end
+end

data/lib/fog/dns/dnsimple.rb

@@ -52,7 +52,7 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
 
           @dnsimple_email = options[:dnsimple_email]
           @dnsimple_password  = options[:dnsimple_password]
@@ -82,7 +82,7 @@ module Fog
           response = @connection.request(params.merge!({:host => @host}))
 
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/dns/dnsmadeeasy.rb

@@ -77,7 +77,7 @@ module Fog
         # * dns object with connection to aws.
         def initialize(options={})
           require 'fog/core/parser'
-          require 'json'
+          require 'multi_json'
 
           @dnsmadeeasy_api_key = options[:dnsmadeeasy_api_key]
           @dnsmadeeasy_secret_key = options[:dnsmadeeasy_secret_key]
@@ -117,7 +117,7 @@ module Fog
           end
 
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
 
           response

data/lib/fog/dns/linode.rb

@@ -50,7 +50,7 @@ module Fog
       class Real
 
         def initialize(options={})
-          require 'json'
+          require 'multi_json'
           @linode_api_key = options[:linode_api_key]
           @host   = options[:host]    || "api.linode.com"
           @port   = options[:port]    || 443
@@ -69,7 +69,7 @@ module Fog
           response = @connection.request(params.merge!({:host => @host}))
 
           unless response.body.empty?
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
             if data = response.body['ERRORARRAY'].first
               error = case data['ERRORCODE']
               when 5

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

@@ -14,7 +14,7 @@ module Fog
         def create_domain(name)
           body = { "domain" => { "name" => name } }
           request(
-                  :body     => body.to_json,
+                  :body     => MultiJson.encode(body),
                   :expects  => 201,
                   :method   => 'POST',
                   :path     => '/domains'

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

@@ -36,7 +36,7 @@ module Fog
 
           body["record"].merge!(options)
 
-          request( :body     => body.to_json,
+          request( :body     => MultiJson.encode(body),
                    :expects  => 201,
                    :method   => 'POST',
                    :path     => "/domains/#{domain}/records" )

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

@@ -30,7 +30,7 @@ module Fog
 
           body = { "record" => options }
 
-          request( :body     => body.to_json,
+          request( :body     => MultiJson.encode(body),
                    :expects  => 200,
                    :method   => "PUT",
                    :path     => "/domains/#{domain}/records/#{record_id}" )

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

@@ -52,7 +52,7 @@ module Fog
             :expects  => 201,
             :method   => "POST",
             :path     => "/V1.2/domains/#{domain}/records",
-            :body     => body.to_json
+            :body     => MultiJson.encode(body)
           )
         end
 

data/lib/fog/dns/requests/dnsmadeeasy/create_secondary.rb

@@ -26,7 +26,7 @@ module Fog
             :expects  => 201,
             :method   => 'PUT',
             :path     => "/V1.2/secondary/#{secondary_name}",
-            :body     => body.to_json
+            :body     => MultiJson.encode(body)
           )
         end
 

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

@@ -46,7 +46,7 @@ module Fog
             :expects  => 200,
             :method   => "PUT",
             :path     => "/V1.2/domains/#{domain}/records/#{record_id}",
-            :body     => options.to_json
+            :body     => MultiJson.encode(options)
           )
         end
 

data/lib/fog/dns/requests/dnsmadeeasy/update_secondary.rb

@@ -26,7 +26,7 @@ module Fog
             :expects  => 201,
             :method   => 'PUT',
             :path     => "/V1.2/secondary/#{secondary_name}",
-            :body     => body.to_json
+            :body     => MultiJson.encode(body)
           )
         end
 

data/lib/fog/providers.rb

@@ -21,6 +21,7 @@ require 'fog/providers/ninefold'
 require 'fog/providers/rackspace'
 require 'fog/providers/slicehost'
 require 'fog/providers/storm_on_demand'
+require 'fog/providers/vcloud'
 require 'fog/providers/virtual_box'
 require 'fog/providers/voxel'
 require 'fog/providers/zerigo'

data/lib/fog/providers/aws.rb

@@ -1,5 +1,4 @@
 require 'fog/core'
-require 'fog/core/parser'
 require 'openssl' # For RSA key pairs
 require 'base64' # For console output
 
@@ -8,15 +7,19 @@ module Fog
 
     extend Fog::Provider
 
+    service(:auto_scaling,    'aws/auto_scaling')
     service(:cdn,             'cdn/aws')
     service(:compute,         'compute/aws')
     service(:cloud_formation, 'aws/cloud_formation')
+    service(:cloud_watch,     'aws/cloud_watch')
     service(:dns,             'dns/aws')
     service(:elb,             'aws/elb')
     service(:iam,             'aws/iam')
     service(:rds,             'aws/rds')
     service(:ses,             'aws/ses')
     service(:simpledb,        'aws/simpledb')
+    service(:sns,             'aws/sns')
+    service(:sqs,             'aws/sqs')
     service(:storage,         'storage/aws')
 
     def self.indexed_param(key, values)
@@ -44,7 +47,9 @@ module Fog
     end
 
     def self.escape(string)
-      string.gsub( /([^-a-zA-Z0-9_.~]+)/n ) { |match| '%' + match.unpack( 'H2' * match.size ).join( '%' ).upcase }
+      string.gsub(/([^a-zA-Z0-9_.\-~]+)/) {
+        "%" + $1.unpack("H2" * $1.bytesize).join("%").upcase
+      }
     end
 
     def self.signed_params(params, options = {})
@@ -71,6 +76,10 @@ module Fog
 
     class Mock
 
+      def self.arn(vendor, account_id, path, region = nil)
+        "arn:aws:#{vendor}:#{region}:#{account_id}:#{path}"
+      end
+
       def self.availability_zone(region)
         "#{region}#{Fog::Mock.random_selection('abcd', 1)}"
       end
@@ -167,6 +176,10 @@ module Fog
         request_id << Fog::Mock.random_hex(12)
         request_id.join('-')
       end
+      class << self
+        alias :reserved_instances_id :request_id
+        alias :reserved_instances_offering_id :request_id
+      end
 
       def self.reservation_id
         "r-#{Fog::Mock.random_hex(8)}"

data/lib/fog/providers/ninefold.rb

@@ -6,6 +6,7 @@ module Fog
     extend Fog::Provider
 
     service(:compute, 'compute/ninefold')
+    service(:storage, 'storage/ninefold')
 
   end
 end

data/lib/fog/providers/rackspace.rb

@@ -13,18 +13,19 @@ module Fog
       rackspace_auth_url = options[:rackspace_auth_url] || "auth.api.rackspacecloud.com"
       url = rackspace_auth_url.match(/^https?:/) ? \
                 rackspace_auth_url : 'https://' + rackspace_auth_url
+      uri = URI.parse(url)
       connection = Fog::Connection.new(url)
       @rackspace_api_key  = options[:rackspace_api_key]
       @rackspace_username = options[:rackspace_username]
       response = connection.request({
-        :expects  => 204,
+        :expects  => [200, 204],
         :headers  => {
           'X-Auth-Key'  => @rackspace_api_key,
           'X-Auth-User' => @rackspace_username
         },
-        :host     => rackspace_auth_url,
+        :host     => uri.host,
         :method   => 'GET',
-        :path     => 'v1.0'
+        :path     =>  (uri.path and not uri.path.empty?) ? uri.path : 'v1.0'
       })
       response.headers.reject do |key, value|
         !['X-Server-Management-Url', 'X-Storage-Url', 'X-CDN-Management-Url', 'X-Auth-Token'].include?(key)

data/lib/fog/providers/vcloud.rb

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

data/lib/fog/storage.rb

@@ -17,6 +17,9 @@ module Fog
       when :local
         require 'fog/storage/local'
         Fog::Storage::Local.new(attributes)
+      when :ninefold
+        require 'fog/storage/ninefold'
+        Fog::Storage::Ninefold.new(attributes)
       when :rackspace
         require 'fog/storage/rackspace'
         Fog::Storage::Rackspace.new(attributes)
@@ -27,7 +30,7 @@ module Fog
 
     def self.directories
       directories = []
-      for provider in [:aws, :google, :local, :rackspace]
+      for provider in [:aws, :google, :local, :ninefold, :rackspace]
         begin
           directories.concat(self[provider].directories)
         rescue # ignore any missing credentials/etc
@@ -50,17 +53,17 @@ module Fog
         0
       end
     end
-    
+
     def self.parse_data(data)
       metadata = {
         :body => nil,
         :headers => {}
       }
-      
+
       metadata[:body] = data
       metadata[:headers]['Content-Length'] = get_body_size(data)
-      
-      if data.respond_to?(:path)
+
+      if data.respond_to?(:path) and !data.path.nil?
         filename = ::File.basename(data.path)
         unless (mime_types = MIME::Types.of(filename)).empty?
           metadata[:headers]['Content-Type'] = mime_types.first.content_type
@@ -69,6 +72,6 @@ module Fog
       # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
       metadata
     end
-    
+
   end
 end

data/lib/fog/storage/aws.rb

@@ -30,6 +30,8 @@ module Fog
       request :get_object
       request :get_object_acl
       request :get_object_torrent
+      request :get_object_http_url
+      request :get_object_https_url
       request :get_object_url
       request :get_request_payment
       request :get_service
@@ -60,7 +62,22 @@ module Fog
           )
         end
 
+        def http_url(params, expires)
+          "http://" << host_path_query(params, expires)
+        end
+
+        def https_url(params, expires)
+          "https://" << host_path_query(params, expires)
+        end
+
         def url(params, expires)
+          Formatador.display_line("[yellow][WARN] #{Fog::Storage::AWS} => #url is deprecated, use #https_url instead[/] [light_black](#{caller.first})[/]")
+          https_url(params, expires)
+        end
+
+        private
+
+        def host_path_query(params, expires)
           params[:headers] ||= {}
           params[:headers]['Date'] = expires.to_i
           params[:path] = Fog::AWS.escape(params[:path]).gsub('%2F', '/')
@@ -73,7 +90,7 @@ module Fog
           query << "AWSAccessKeyId=#{@aws_access_key_id}"
           query << "Signature=#{Fog::AWS.escape(signature(params))}"
           query << "Expires=#{params[:headers]['Date']}"
-          "https://#{@host}/#{params[:path]}?#{query.join('&')}"
+          "#{@host}/#{params[:path]}?#{query.join('&')}"
         end
 
       end

data/lib/fog/storage/google.rb

@@ -20,6 +20,8 @@ module Fog
       request :get_object
       request :get_object_acl
       request :get_object_torrent
+      request :get_object_http_url
+      request :get_object_https_url
       request :get_object_url
       request :get_service
       request :head_object
@@ -30,14 +32,30 @@ module Fog
 
       module Utils
 
+
+        def http_url(params, expires)
+          "http://" << host_path_query(params, expires)
+        end
+
+        def https_url(params, expires)
+          "https://" << host_path_query(params, expires)
+        end
+
         def url(params, expires)
+          Formatador.display_line("[yellow][WARN] Fog::Storage::Google => #url is deprecated, use #https_url instead[/] [light_black](#{caller.first})[/]")
+          https_url(params, expires)
+        end
+
+        private
+
+        def host_path_query(params, expires)
           params[:headers]['Date'] = expires.to_i
           params[:path] = CGI.escape(params[:path]).gsub('%2F', '/')
           query = [params[:query]].compact
           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('&')}"
+          "#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
 
       end