fog 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog (0.3.2)
+    fog (0.3.3)
       builder
       excon (>= 0.2.1)
       formatador (>= 0.0.15)

data/fog.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.3.2'
+  s.version           = '0.3.3'
   s.date              = '2010-09-24'
   s.rubyforge_project = 'fog'
 

data/lib/fog.rb

@@ -32,7 +32,7 @@ require 'fog/ssh'
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 
   module Mock

data/lib/fog/aws/compute.rb

@@ -67,48 +67,50 @@ module Fog
       class Mock
 
         def self.data
-          @data ||= Hash.new do |hash, key|
+          @data ||= Hash.new do |hash, region|
             owner_id = Fog::AWS::Mock.owner_id
-            hash[key] = {
-              :deleted_at => {},
-              :addresses  => {},
-              :instances  => {},
-              :key_pairs  => {},
-              :limits     => { :addresses => 5 },
-              :owner_id   => owner_id,
-              :security_groups => {
-                'default' => {
-                  'groupDescription'  => 'default group',
-                  'groupName'         => 'default',
-                  'ipPermissions'     => [
-                    {
-                      'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
-                      'fromPort'    => -1,
-                      'toPort'      => -1,
-                      'ipProtocol'  => 'icmp',
-                      'ipRanges'    => []
-                    },
-                    {
-                      'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
-                      'fromPort'    => 0,
-                      'toPort'      => 65535,
-                      'ipProtocol'  => 'tcp',
-                      'ipRanges'    => []
-                    },
-                    {
-                      'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
-                      'fromPort'    => 0,
-                      'toPort'      => 65535,
-                      'ipProtocol'  => 'udp',
-                      'ipRanges'    => []
-                    }
-                  ],
-                  'ownerId'           => owner_id
-                }
-              },
-              :snapshots => {},
-              :volumes => {}
-            }
+            hash[region] = Hash.new do |hash, key|
+              hash[key] = {
+                :deleted_at => {},
+                :addresses  => {},
+                :instances  => {},
+                :key_pairs  => {},
+                :limits     => { :addresses => 5 },
+                :owner_id   => owner_id,
+                :security_groups => {
+                  'default' => {
+                    'groupDescription'  => 'default group',
+                    'groupName'         => 'default',
+                    'ipPermissions'     => [
+                      {
+                        'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
+                        'fromPort'    => -1,
+                        'toPort'      => -1,
+                        'ipProtocol'  => 'icmp',
+                        'ipRanges'    => []
+                      },
+                      {
+                        'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
+                        'fromPort'    => 0,
+                        'toPort'      => 65535,
+                        'ipProtocol'  => 'tcp',
+                        'ipRanges'    => []
+                      },
+                      {
+                        'groups'      => [{'groupName' => 'default', 'userId' => owner_id}],
+                        'fromPort'    => 0,
+                        'toPort'      => 65535,
+                        'ipProtocol'  => 'udp',
+                        'ipRanges'    => []
+                      }
+                    ],
+                    'ownerId'           => owner_id
+                  }
+                },
+                :snapshots => {},
+                :volumes => {}
+              }
+            end
           end
         end
 
@@ -120,7 +122,8 @@ module Fog
 
         def initialize(options={})
           @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[@aws_access_key_id]
+          @region = options[:region] || 'us-east-1'
+          @data = self.class.data[@region][@aws_access_key_id]
           @owner_id = @data[:owner_id]
         end
 

data/lib/fog/aws/storage.rb

@@ -74,10 +74,12 @@ module Fog
         include Utils
 
         def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :buckets => {}
-            }
+          @data ||= Hash.new do |hash, region|
+            hash[region] = Hash.new do |hash, key|
+              hash[key] = {
+                :buckets => {}
+              }
+            end
           end
         end
 
@@ -89,7 +91,8 @@ module Fog
 
         def initialize(options={})
           @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[@aws_access_key_id]
+          @region = options[:region] || 'us-east-1'
+          @data = self.class.data[@region][@aws_access_key_id]
         end
 
         def signature(params)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - geemus (Wesley Beary)