fog 0.8.1 → 0.8.2

data/lib/fog/compute/storm_on_demand.rb

@@ -56,6 +56,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def self.reset_data(keys=data.keys)
           for key in [*keys]
             data.delete(key)
@@ -64,7 +68,14 @@ module Fog
 
         def initialize(options={})
           @storm_on_demand_username = options[:storm_on_demand_username]
-          @data = self.class.data[@storm_on_demand_username]
+        end
+
+        def data
+          self.class.data[@storm_on_demand_username]
+        end
+
+        def reset_data
+          self.class.data.delete(@storm_on_demand_username)
         end
 
       end

data/lib/fog/compute/voxel.rb

@@ -48,14 +48,20 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           @voxel_api_key = options[:voxel_api_key]
-          @data = self.class.data[@voxel_api_key]
+        end
+
+        def data
+          self.class.data[@voxel_api_key]
         end
 
         def reset_data
           self.class.data.delete(@voxel_api_key)
-          @data = self.class.data[@voxel_api_key]
         end
 
       end

data/lib/fog/core/mock.rb

@@ -63,6 +63,19 @@ module Fog
       selection
     end
 
+    def self.reset
+      providers = Fog.providers.map {|p| Fog.const_get(p) }
+      possible_service_constants = providers.map {|p| p.constants.map {|c| p.const_get(c) } }.flatten
+      # c.to_sym is 1.8.7 / 1.9.2 compat
+      services = possible_service_constants.select {|s| s.constants.map {|c| c.to_sym }.include?(:Mock) }
+      service_mocks = services.map {|s| s.const_get(:Mock) }
+
+      service_mocks.each do |service_mock|
+        next unless service_mock.respond_to?(:reset)
+        service_mock.reset
+      end
+    end
+
   end
 
-end
+end

data/lib/fog/dns/aws.rb

@@ -33,6 +33,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -44,12 +48,14 @@ module Fog
           require 'mime/types'
           @aws_access_key_id  = options[:aws_access_key_id]
           @region             = options[:region]
-          @data = self.class.data[@region][@aws_access_key_id]
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
         end
 
         def reset_data
           self.class.data[@region].delete(@aws_access_key_id)
-          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)

data/lib/fog/dns/bluebox.rb

@@ -30,6 +30,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -40,12 +44,14 @@ module Fog
 
           @bluebox_customer_id = options[:bluebox_customer_id]
           @bluebox_api_key = options[:bluebox_api_key]
-          @data = self.class.data[@bluebox_customer_id]
+        end
+
+        def data
+          self.class.data[@bluebox_customer_id]
         end
 
         def reset_data
           self.class.data.delete(@bluebox_customer_id)
-          @data = self.class.data[@bluebox_customer_id]
         end
       end
 

data/lib/fog/dns/dnsimple.rb

@@ -3,7 +3,7 @@ module Fog
     class DNS < Fog::Service
 
       requires :dnsimple_email, :dnsimple_password
-      recognizes :host, :path, :port, :scheme, :persistent
+      recognizes :dnsimple_url, :host, :path, :port, :scheme, :persistent
       recognizes :provider # remove post deprecation
 
       model_path 'fog/dns/models/dnsimple'
@@ -31,6 +31,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -41,12 +45,14 @@ module Fog
 
           @dnsimple_email = options[:dnsimple_email]
           @dnsimple_password  = options[:dnsimple_password]
-          @data = self.class.data[@dnsimple_email]
+        end
+
+        def data
+          self.class.data[@dnsimple_email]
         end
 
         def reset_data
           self.class.data.delete(@dnsimple_email)
-          @data = self.class.data[@dnsimple_email]
         end
 
       end
@@ -65,6 +71,12 @@ module Fog
 
           @dnsimple_email = options[:dnsimple_email]
           @dnsimple_password  = options[:dnsimple_password]
+          if options[:dnsimple_url]
+            uri = URI.parse(options[:dnsimple_url])
+            options[:host]    = uri.host
+            options[:port]    = uri.port
+            options[:scheme]  = uri.scheme
+          end
           @host   = options[:host]    || "dnsimple.com"
           @port   = options[:port]    || 443
           @scheme = options[:scheme]  || 'https'

data/lib/fog/dns/linode.rb

@@ -30,6 +30,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -39,12 +43,14 @@ module Fog
           end
 
           @linode_api_key = options[:linode_api_key]
-          @data = self.class.data[@linode_api_key]
+        end
+
+        def data
+          self.class.data[@linode_api_key]
         end
 
         def reset_data
           self.class.data.delete(@linode_api_key)
-          @data = self.class.data[@linode_api_key]
         end
 
       end

data/lib/fog/dns/slicehost.rb

@@ -30,6 +30,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -39,12 +43,14 @@ module Fog
           end
 
           @slicehost_password = options[:slicehost_password]
-          @data = self.class.data[@slicehost_password]
+        end
+
+        def data
+          self.class.data[@slicehost_password]
         end
 
         def reset_data
           self.class.data.delete(@slicehost_password)
-          @data = self.class.data[@slicehost_password]
         end
 
       end

data/lib/fog/dns/zerigo.rb

@@ -36,6 +36,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -46,12 +50,14 @@ module Fog
 
           @zerigo_email = options[:zerigo_email]
           @zerigo_token = options[:zerigo_token]
-          @data = self.class.data[@zerigo_email]
+        end
+
+        def data
+          self.class.data[@zerigo_email]
         end
 
         def reset_data
           self.class.data.delete(@zerigo_email)
-          @data = self.class.data[@zerigo_email]
         end
 
       end

data/lib/fog/providers/aws.rb

@@ -1,5 +1,6 @@
 require 'fog/core'
 require 'fog/core/parser'
+require 'openssl' # For RSA key pairs
 
 module Fog
   module AWS
@@ -44,7 +45,7 @@ module Fog
     def self.escape(string)
       string.gsub( /([^-a-zA-Z0-9_.~]+)/n ) { |match| '%' + match.unpack( 'H2' * match.size ).join( '%' ).upcase }
     end
-    
+
     def self.signed_params(params, options = {})
       params.merge!({
         'AWSAccessKeyId'    => options[:aws_access_key_id],
@@ -69,8 +70,8 @@ module Fog
 
     class Mock
 
-      def self.availability_zone
-        "us-east-1" << Fog::Mock.random_selection('abcd', 1)
+      def self.availability_zone(region)
+        "#{region}#{Fog::Mock.random_selection('abcd', 1)}"
       end
 
       def self.box_usage
@@ -140,13 +141,7 @@ module Fog
       end
 
       def self.key_material
-        key_material = ['-----BEGIN RSA PRIVATE KEY-----']
-        20.times do
-          key_material << Fog::Mock.random_base64(76)
-        end
-        key_material << Fog::Mock.random_base64(67) + '='
-        key_material << '-----END RSA PRIVATE KEY-----'
-        key_material.join("\n")
+        OpenSSL::PKey::RSA.generate(1024).to_s
       end
 
       def self.owner_id

data/lib/fog/providers/linode.rb

@@ -2,12 +2,9 @@ require 'fog/core'
 
 module Fog
   module Linode
-
     extend Fog::Provider
-
     service(:compute, 'compute/linode')
     service(:dns,     'dns/linode')
-
   end
 end
 

data/lib/fog/storage.rb

@@ -22,12 +22,14 @@ module Fog
     end
 
     def self.get_body_size(body)
-      case
-      when body.respond_to?(:bytesize)
+      if body.respond_to?(:force_encoding)
+        body.force_encoding('BINARY')
+      end
+      if body.respond_to?(:bytesize)
         body.bytesize
-      when body.respond_to?(:size)
+      elsif body.respond_to?(:size)
         body.size
-      when body.respond_to?(:stat)
+      elsif body.respond_to?(:stat)
         body.stat.size
       else
         0

data/lib/fog/storage/aws.rb

@@ -148,6 +148,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -175,12 +179,14 @@ module Fog
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end
           @region = options[:region]
-          @data = self.class.data[@region][@aws_access_key_id]
+        end
+
+        def data
+          self.class.data[@region][@aws_access_key_id]
         end
 
         def reset_data
           self.class.data[@region].delete(@aws_access_key_id)
-          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)

data/lib/fog/storage/google.rb

@@ -119,6 +119,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -129,12 +133,14 @@ module Fog
 
           require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
-          @data = self.class.data[@google_storage_access_key_id]
+        end
+
+        def data
+          self.class.data[@google_storage_access_key_id]
         end
 
         def reset_data
           self.class.data.delete(@google_storage_access_key_id)
-          @data = self.class.data[@google_storage_access_key_id]
         end
 
         def signature(params)

data/lib/fog/storage/local.rb

@@ -19,6 +19,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           Fog::Mock.not_implemented
 
@@ -31,7 +35,10 @@ module Fog
           end
 
           @local_root = ::File.expand_path(options[:local_root])
-          @data = self.class.data[@local_root]
+        end
+
+        def data
+          self.class.data[@local_root]
         end
 
         def local_root
@@ -44,7 +51,6 @@ module Fog
 
         def reset_data
           self.class.data.delete(@local_root)
-          @data = self.class.data[@local_root]
         end
 
       end

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

@@ -117,7 +117,6 @@ module Fog
           options['x-amz-storage-class'] = storage_class if storage_class
 
           data = connection.put_object(directory.key, key, body, options)
-          data.headers.delete('Content-Length')
           data.headers['ETag'].gsub!('"','')
           merge_attributes(data.headers)
           self.content_length = Fog::Storage.get_body_size(body)

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

@@ -119,11 +119,7 @@ module Fog
 
           data = connection.put_object(directory.key, key, body, options)
           merge_attributes(data.headers)
-          if body.is_a?(String)
-            self.content_length = body.size
-          else
-            self.content_length = ::File.size(body.path)
-          end
+          self.content_length = Fog::Storage.get_body_size(body)
           true
         end
 

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

@@ -88,7 +88,7 @@ module Fog
           end
           file.close
           merge_attributes(
-            :content_length => ::File.size(path),
+            :content_length => Fog::Storage.get_body_size(body),
             :last_modified  => ::File.mtime(path)
           )
           true