fog 0.8.1 → 0.8.2

data/lib/fog/aws/rds.rb

@@ -54,6 +54,7 @@ module Fog
       class Mock
 
         def initialize(options={})
+          Fog::Mock.not_implemented
         end
 
       end

data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -34,16 +34,16 @@ module Fog
 
         def batch_put_attributes(domain_name, items, replace_attributes = Hash.new([]))
           response = Excon::Response.new
-          if @data[:domains][domain_name]
+          if self.data[:domains][domain_name]
             for item_name, attributes in items do
               for key, value in attributes do
-                @data[:domains][domain_name][item_name] ||= {}
+                self.data[:domains][domain_name][item_name] ||= {}
                 if replace_attributes[item_name] && replace_attributes[item_name].include?(key)
-                  @data[:domains][domain_name][item_name][key.to_s] = []
+                  self.data[:domains][domain_name][item_name][key.to_s] = []
                 else
-                  @data[:domains][domain_name][item_name][key.to_s] ||= []
+                  self.data[:domains][domain_name][item_name][key.to_s] ||= []
                 end
-                @data[:domains][domain_name][item_name][key.to_s] << value.to_s
+                self.data[:domains][domain_name][item_name][key.to_s] << value.to_s
               end
             end
             response.status = 200

data/lib/fog/aws/requests/simpledb/create_domain.rb

@@ -29,7 +29,7 @@ module Fog
 
         def create_domain(domain_name)
           response = Excon::Response.new
-          @data[:domains][domain_name] = {}
+          self.data[:domains][domain_name] = {}
           response.status = 200
           response.body = {
             'BoxUsage'  => Fog::AWS::Mock.box_usage,

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -37,11 +37,11 @@ module Fog
 
         def delete_attributes(domain_name, item_name, attributes = nil)
           response = Excon::Response.new
-          if @data[:domains][domain_name]
+          if self.data[:domains][domain_name]
             if attributes
               for key, value in attributes
-                if @data[:domains][domain_name][key]
-                  @data[:domains][domain_name][key].delete('value')
+                if self.data[:domains][domain_name][key]
+                  self.data[:domains][domain_name][key].delete('value')
                 end
               end
             end

data/lib/fog/aws/requests/simpledb/delete_domain.rb

@@ -29,7 +29,7 @@ module Fog
 
         def delete_domain(domain_name)
           response = Excon::Response.new
-          if @data[:domains].delete(domain_name)
+          if self.data[:domains].delete(domain_name)
             response.status = 200
             response.body = {
               'BoxUsage'  => Fog::AWS::Mock.box_usage,

data/lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -38,7 +38,7 @@ module Fog
 
         def domain_metadata(domain_name)
           response = Excon::Response.new
-          if domain = @data[:domains][domain_name]
+          if domain = self.data[:domains][domain_name]
             response.status = 200
           
             attribute_names = []

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -42,16 +42,16 @@ module Fog
 
         def get_attributes(domain_name, item_name, attributes = nil)
           response = Excon::Response.new
-          if @data[:domains][domain_name]
+          if self.data[:domains][domain_name]
             object = {}
             if attributes
               for attribute in attributes
-                if @data[:domains][domain_name][item_name] && @data[:domains][domain_name][item_name]
-                  object[attribute] = @data[:domains][domain_name][item_name][attribute]
+                if self.data[:domains][domain_name][item_name] && self.data[:domains][domain_name][item_name]
+                  object[attribute] = self.data[:domains][domain_name][item_name][attribute]
                 end
               end
-            elsif @data[:domains][domain_name][item_name]
-              object = @data[:domains][domain_name][item_name]
+            elsif self.data[:domains][domain_name][item_name]
+              object = self.data[:domains][domain_name][item_name]
             end
             response.status = 200
             response.body = {

data/lib/fog/aws/requests/simpledb/list_domains.rb

@@ -34,11 +34,11 @@ module Fog
 
         def list_domains(options = {})
           response = Excon::Response.new
-          keys = @data[:domains].keys
+          keys = self.data[:domains].keys
           max = options['MaxNumberOfDomains'] || keys.size
           offset = options['NextToken'] || 0
           domains = []
-          for key, value in @data[:domains].keys[offset...max]
+          for key, value in self.data[:domains].keys[offset...max]
             domains << key
           end
           response.status = 200

data/lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -43,20 +43,20 @@ module Fog
           options[:expect] = {} unless options[:expect]
           options[:replace] = [] unless options[:replace]
           response = Excon::Response.new
-          if @data[:domains][domain_name]
+          if self.data[:domains][domain_name]
             options[:expect].each do |ck, cv|
-              if @data[:domains][domain_name][item_name][ck] != [cv]
+              if self.data[:domains][domain_name][item_name][ck] != [cv]
                 response.status = 409
                 raise(Excon::Errors.status_error({:expects => 200}, response))
               end
             end
             attributes.each do |key, value|
-              @data[:domains][domain_name][item_name] ||= {}
-              @data[:domains][domain_name][item_name][key.to_s] = [] unless @data[:domains][domain_name][item_name][key.to_s]
+              self.data[:domains][domain_name][item_name] ||= {}
+              self.data[:domains][domain_name][item_name][key.to_s] = [] unless self.data[:domains][domain_name][item_name][key.to_s]
               if options[:replace].include?(key.to_s)
-                @data[:domains][domain_name][item_name][key.to_s] = [*value].map {|x| x.to_s}
+                self.data[:domains][domain_name][item_name][key.to_s] = [*value].map {|x| x.to_s}
               else
-                @data[:domains][domain_name][item_name][key.to_s] += [*value].map {|x| x.to_s}
+                self.data[:domains][domain_name][item_name][key.to_s] += [*value].map {|x| x.to_s}
               end
             end
             response.status = 200

data/lib/fog/aws/ses.rb

@@ -17,6 +17,7 @@ module Fog
       class Mock
 
         def initialize(options={})
+          Fog::Mock.not_implemented
         end
 
       end

data/lib/fog/aws/simpledb.rb

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

data/lib/fog/bin.rb

@@ -3,8 +3,8 @@ require 'fog/core/credentials'
 module Fog
   class << self
 
-    def providers
-      @providers.select {|provider| eval("::#{provider.to_s.split('::').last}").available?}
+    def available_providers
+      @providers.select {|provider| Kernel.const_get(provider).available?}
     end
 
   end

data/lib/fog/cdn/aws.rb

@@ -28,6 +28,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
           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/cdn/rackspace.rb

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

data/lib/fog/compute/aws.rb

@@ -125,6 +125,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -136,15 +140,20 @@ module Fog
           require 'fog/compute/parsers/aws/basic'
 
           @aws_access_key_id = options[:aws_access_key_id]
+
           @region = options[:region] || 'us-east-1'
 
-          @data = self.class.data[@region][@aws_access_key_id]
-          @owner_id = @data[:owner_id]
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+            raise ArgumentError, "Unknown region: #{@region.inspect}"
+          end
+        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 apply_tag_filters(resources, filters)

data/lib/fog/compute/bluebox.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
@@ -42,12 +46,14 @@ module Fog
           end
 
           @bluebox_api_key = options[:bluebox_api_key]
-          @data = self.class.data[@bluebox_api_key]
+        end
+
+        def data
+          self.class.data[@bluebox_api_key]
         end
 
         def reset_data
           self.class.data.delete(@bluebox_api_key)
-          @data = self.class.data[@bluebox_api_key]
         end
 
       end

data/lib/fog/compute/ecloud.rb

@@ -959,10 +959,6 @@ module Fog
           "https://fakey.com/api/v0.8b-ext2.6"
         end
 
-        def self.data_reset
-          @mock_data = nil
-        end
-
         def self.data( base_url = self.base_url )
           @mock_data ||= MockData.new.tap do |vcloud_mock_data|
             vcloud_mock_data.versions.clear
@@ -1065,6 +1061,15 @@ module Fog
           end
         end
 
+        def self.reset
+          @mock_data = nil
+        end
+
+        def self.data_reset
+          Formatador.display_line("[yellow][WARN] #{self} => #data_reset is deprecated, use #reset instead[/] [light_black](#{caller.first})[/]")
+          self.reset
+        end
+
         def initialize(options = {})
           require 'builder'
           require 'fog/core/parser'

data/lib/fog/compute/go_grid.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
 
           @go_grid_api_key = options[:go_grid_api_key]
           @go_grid_shared_secret = options[:go_grid_shared_secret]
-          @data = self.class.data[@go_grid_api_key]
+        end
+
+        def data
+          self.class.data[@go_grid_api_key]
         end
 
         def reset_data
           self.class.data.delete(@go_grid_api_key)
-          @data = self.class.data[@go_grid_api_key]
         end
 
       end

data/lib/fog/compute/linode.rb

@@ -7,6 +7,22 @@ module Fog
       recognizes :provider # remove post deprecation
 
       model_path 'fog/compute/models/linode'
+      model :flavor
+      collection :flavors
+      model :image
+      collection :images
+      model :server
+      collection :servers
+      model :kernel
+      collection :kernels
+      model :data_center
+      collection :data_centers
+      model :stack_script
+      collection :stack_scripts
+      model :ip
+      collection :ips
+      model :disk
+      collection :disks
 
       request_path 'fog/compute/requests/linode'
       request :avail_datacenters
@@ -14,14 +30,24 @@ module Fog
       request :avail_kernels
       request :avail_linodeplans
       request :avail_stackscripts
-      # request :linode_boot
+      request :linode_disk_create
+      request :linode_disk_list
+      request :linode_disk_delete
+      request :linode_disk_createfromdistribution
+      request :linode_disk_createfromstackscript     
+      request :linode_ip_list
+      request :linode_ip_addprivate
+      request :linode_config_list
+      request :linode_config_create
       request :linode_create
       request :linode_delete
       request :linode_list
+      request :linode_boot
       request :linode_reboot
-      # request :linode_resize
-      # request :linode_shutdown
-      # request :linode_update
+      request :linode_shutdown
+      request :linode_update
+      request :stackscript_list
+      # request :linode_resize      
 
       class Mock
 
@@ -31,6 +57,10 @@ module Fog
           end
         end
 
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
           unless options.delete(:provider)
             location = caller.first
@@ -40,12 +70,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/compute/models/aws/volumes.rb

@@ -13,7 +13,7 @@ module Fog
         model Fog::AWS::Compute::Volume
 
         # Used to create a volume.  There are 3 arguments and availability_zone and size are required.  You can generate a new key_pair as follows:
-        # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 't1.micro')
+        # AWS.volumes.create(:availability_zone => 'us-east-1a', :size => 10)
         #
         # ==== Returns
         #
@@ -25,7 +25,7 @@ module Fog
         #  delete_on_termination=nil,
         #  device=nil,
         #  server_id=nil,
-        #  size="t1.micro",
+        #  size=10,
         #  snapshot_id=nil,
         #  state="creating",
         #  tags=nil
@@ -53,7 +53,7 @@ module Fog
         #  delete_on_termination=nil,
         #  device=nil,
         #  server_id=nil,
-        #  size="t1.micro",
+        #  size=10,
         #  snapshot_id=nil,
         #  state="creating",
         #  tags=nil
@@ -93,7 +93,7 @@ module Fog
         #    delete_on_termination=nil,
         #    device=nil,
         #    server_id=nil,
-        #    size="t1.micro",
+        #    size=10,
         #    snapshot_id=nil,
         #    state="available",
         #    tags={}