fog 0.0.56 → 0.0.57

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.name = "fog"
     gem.description = %Q{brings clouds to you}
     gem.summary = %Q{fog = clouds + you}
-    gem.email = "me@geemus.com"
+    gem.email = "geemus@gmail.com"
     gem.homepage = "http://github.com/geemus/fog"
     gem.authors = ["geemus (Wesley Beary)"]
     gem.rubyforge_project = "fog"

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 0
-:patch: 56
+:patch: 57
 :build: 

data/fog.gemspec

@@ -1,18 +1,18 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fog}
-  s.version = "0.0.56"
+  s.version = "0.0.57"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["geemus (Wesley Beary)"]
-  s.date = %q{2010-03-11}
+  s.date = %q{2010-03-17}
   s.default_executable = %q{fog}
   s.description = %q{brings clouds to you}
-  s.email = %q{me@geemus.com}
+  s.email = %q{geemus@gmail.com}
   s.executables = ["fog"]
   s.extra_rdoc_files = [
     "README.rdoc"

data/lib/fog/aws.rb

@@ -1,11 +1,12 @@
+require 'fog/aws/s3'
+require 'fog/aws/simpledb'
+
 module Fog
   module AWS
 
     def self.dependencies
       [
-        'fog/aws/ec2.rb',
-        'fog/aws/simpledb.rb',
-        'fog/aws/s3.rb'
+        'fog/aws/ec2.rb'
       ]
     end
 

data/lib/fog/aws/ec2.rb

@@ -1,12 +1,65 @@
+require 'fog/aws/models/ec2/address'
+require 'fog/aws/models/ec2/addresses'
+require 'fog/aws/models/ec2/flavor'
+require 'fog/aws/models/ec2/flavors'
+require 'fog/aws/models/ec2/image'
+require 'fog/aws/models/ec2/images'
+require 'fog/aws/models/ec2/key_pair'
+require 'fog/aws/models/ec2/key_pairs'
+require 'fog/aws/models/ec2/security_group'
+require 'fog/aws/models/ec2/security_groups'
+require 'fog/aws/models/ec2/server'
+require 'fog/aws/models/ec2/servers'
+require 'fog/aws/models/ec2/snapshot'
+require 'fog/aws/models/ec2/snapshots'
+require 'fog/aws/models/ec2/volume'
+require 'fog/aws/models/ec2/volumes'
+require 'fog/aws/requests/ec2/allocate_address'
+require 'fog/aws/requests/ec2/associate_address'
+require 'fog/aws/requests/ec2/attach_volume'
+require 'fog/aws/requests/ec2/authorize_security_group_ingress'
+require 'fog/aws/requests/ec2/create_key_pair'
+require 'fog/aws/requests/ec2/create_security_group'
+require 'fog/aws/requests/ec2/create_snapshot'
+require 'fog/aws/requests/ec2/create_volume'
+require 'fog/aws/requests/ec2/delete_key_pair'
+require 'fog/aws/requests/ec2/delete_security_group'
+require 'fog/aws/requests/ec2/delete_snapshot'
+require 'fog/aws/requests/ec2/delete_volume'
+require 'fog/aws/requests/ec2/describe_addresses'
+require 'fog/aws/requests/ec2/describe_availability_zones'
+require 'fog/aws/requests/ec2/describe_images'
+require 'fog/aws/requests/ec2/describe_instances'
+require 'fog/aws/requests/ec2/describe_reserved_instances'
+require 'fog/aws/requests/ec2/describe_key_pairs'
+require 'fog/aws/requests/ec2/describe_regions'
+require 'fog/aws/requests/ec2/describe_security_groups'
+require 'fog/aws/requests/ec2/describe_snapshots'
+require 'fog/aws/requests/ec2/describe_volumes'
+require 'fog/aws/requests/ec2/detach_volume'
+require 'fog/aws/requests/ec2/disassociate_address'
+require 'fog/aws/requests/ec2/get_console_output'
+require 'fog/aws/requests/ec2/reboot_instances'
+require 'fog/aws/requests/ec2/release_address'
+require 'fog/aws/requests/ec2/revoke_security_group_ingress'
+require 'fog/aws/requests/ec2/run_instances'
+require 'fog/aws/requests/ec2/terminate_instances'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      if Fog.mocking?
-        def self.data
-          @data
+      def self.new(options={})
+        if Fog.mocking?
+          Fog::AWS::EC2::Mock.new(options)
+        else
+          Fog::AWS::EC2::Real.new(options)
         end
-        def self.reset_data
+      end
+
+      class Mock
+
+        def reset_data
           @data = {
             :deleted_at => {},
             :addresses => {},
@@ -17,163 +70,96 @@ module Fog
             :volumes => {}
           }
         end
-      end
 
-      def self.dependencies
-        [
-          "fog/aws/models/ec2/address.rb",
-          "fog/aws/models/ec2/addresses.rb",
-          "fog/aws/models/ec2/flavor.rb",
-          "fog/aws/models/ec2/flavors.rb",
-          "fog/aws/models/ec2/image.rb",
-          "fog/aws/models/ec2/images.rb",
-          "fog/aws/models/ec2/key_pair.rb",
-          "fog/aws/models/ec2/key_pairs.rb",
-          "fog/aws/models/ec2/security_group.rb",
-          "fog/aws/models/ec2/security_groups.rb",
-          "fog/aws/models/ec2/server.rb",
-          "fog/aws/models/ec2/servers.rb",
-          "fog/aws/models/ec2/snapshot.rb",
-          "fog/aws/models/ec2/snapshots.rb",
-          "fog/aws/models/ec2/volume.rb",
-          "fog/aws/models/ec2/volumes.rb",
-          "fog/aws/parsers/ec2/allocate_address.rb",
-          "fog/aws/parsers/ec2/attach_volume.rb",
-          "fog/aws/parsers/ec2/basic.rb",
-          "fog/aws/parsers/ec2/create_key_pair.rb",
-          "fog/aws/parsers/ec2/create_snapshot.rb",
-          "fog/aws/parsers/ec2/create_volume.rb",
-          "fog/aws/parsers/ec2/describe_addresses.rb",
-          "fog/aws/parsers/ec2/describe_availability_zones.rb",
-          "fog/aws/parsers/ec2/describe_images.rb",
-          "fog/aws/parsers/ec2/describe_instances.rb",
-          "fog/aws/parsers/ec2/describe_reserved_instances.rb",
-          "fog/aws/parsers/ec2/describe_key_pairs.rb",
-          "fog/aws/parsers/ec2/describe_regions.rb",
-          "fog/aws/parsers/ec2/describe_security_groups.rb",
-          "fog/aws/parsers/ec2/describe_snapshots.rb",
-          "fog/aws/parsers/ec2/describe_volumes.rb",
-          "fog/aws/parsers/ec2/detach_volume.rb",
-          "fog/aws/parsers/ec2/get_console_output.rb",
-          "fog/aws/parsers/ec2/run_instances.rb",
-          "fog/aws/parsers/ec2/terminate_instances.rb",
-          "fog/aws/requests/ec2/allocate_address.rb",
-          "fog/aws/requests/ec2/associate_address.rb",
-          "fog/aws/requests/ec2/attach_volume.rb",
-          "fog/aws/requests/ec2/authorize_security_group_ingress.rb",
-          "fog/aws/requests/ec2/create_key_pair.rb",
-          "fog/aws/requests/ec2/create_security_group.rb",
-          "fog/aws/requests/ec2/create_snapshot.rb",
-          "fog/aws/requests/ec2/create_volume.rb",
-          "fog/aws/requests/ec2/delete_key_pair.rb",
-          "fog/aws/requests/ec2/delete_security_group.rb",
-          "fog/aws/requests/ec2/delete_snapshot.rb",
-          "fog/aws/requests/ec2/delete_volume.rb",
-          "fog/aws/requests/ec2/describe_addresses.rb",
-          "fog/aws/requests/ec2/describe_availability_zones.rb",
-          "fog/aws/requests/ec2/describe_images.rb",
-          "fog/aws/requests/ec2/describe_instances.rb",
-          "fog/aws/requests/ec2/describe_reserved_instances.rb",
-          "fog/aws/requests/ec2/describe_key_pairs.rb",
-          "fog/aws/requests/ec2/describe_regions.rb",
-          "fog/aws/requests/ec2/describe_security_groups.rb",
-          "fog/aws/requests/ec2/describe_snapshots.rb",
-          "fog/aws/requests/ec2/describe_volumes.rb",
-          "fog/aws/requests/ec2/detach_volume.rb",
-          "fog/aws/requests/ec2/disassociate_address.rb",
-          "fog/aws/requests/ec2/get_console_output.rb",
-          "fog/aws/requests/ec2/reboot_instances.rb",
-          "fog/aws/requests/ec2/release_address.rb",
-          "fog/aws/requests/ec2/revoke_security_group_ingress.rb",
-          "fog/aws/requests/ec2/run_instances.rb",
-          "fog/aws/requests/ec2/terminate_instances.rb"
-        ]
-      end
-
-      def self.reload
-        self.dependencies.each {|dependency| load(dependency)}
-        if Fog.mocking?
+        def initialize(options={})
           reset_data
         end
-      end
 
-      # Initialize connection to EC2
-      #
-      # ==== Notes
-      # options parameter must include values for :aws_access_key_id and 
-      # :aws_secret_access_key in order to create a connection
-      #
-      # ==== Examples
-      #   sdb = SimpleDB.new(
-      #    :aws_access_key_id => your_aws_access_key_id,
-      #    :aws_secret_access_key => your_aws_secret_access_key
-      #   )
-      #
-      # ==== Parameters
-      # * options<~Hash> - config arguments for connection.  Defaults to {}.
-      #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1']
-      #
-      # ==== Returns
-      # * EC2 object with connection to aws.
-      def initialize(options={})
-        unless @aws_access_key_id = options[:aws_access_key_id]
-          raise ArgumentError.new('aws_access_key_id is required to access ec2')
-        end
-        unless @aws_secret_access_key = options[:aws_secret_access_key]
-          raise ArgumentError.new('aws_secret_access_key is required to access ec2')
-        end
-        @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
-        @host = options[:host] || case options[:region]
-        when 'eu-west-1'
-          'ec2.eu-west-1.amazonaws.com'
-        when 'us-east-1'
-          'ec2.us-east-1.amazonaws.com'
-        when 'us-west-1'
-          'ec2.us-west-1.amazonaws.com'
-        else
-          'ec2.amazonaws.com'
-        end
-        @port       = options[:port]      || 443
-        @scheme     = options[:scheme]    || 'https'
       end
 
-      private
-
-      def request(params, parser)
-        @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
-        params.merge!({
-          'AWSAccessKeyId' => @aws_access_key_id,
-          'SignatureMethod' => 'HmacSHA256',
-          'SignatureVersion' => '2',
-          'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-          'Version' => '2009-11-30'
-        })
-
-        body = ''
-        for key in params.keys.sort
-          unless (value = params[key]).nil?
-            body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
+      class Real
+
+        # Initialize connection to EC2
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and 
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   sdb = SimpleDB.new(
+        #    :aws_access_key_id => your_aws_access_key_id,
+        #    :aws_secret_access_key => your_aws_secret_access_key
+        #   )
+        #
+        # ==== Parameters
+        # * options<~Hash> - config arguments for connection.  Defaults to {}.
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1']
+        #
+        # ==== Returns
+        # * EC2 object with connection to aws.
+        def initialize(options={})
+          unless @aws_access_key_id = options[:aws_access_key_id]
+            raise ArgumentError.new('aws_access_key_id is required to access ec2')
+          end
+          unless @aws_secret_access_key = options[:aws_secret_access_key]
+            raise ArgumentError.new('aws_secret_access_key is required to access ec2')
+          end
+          @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
+          @host = options[:host] || case options[:region]
+          when 'eu-west-1'
+            'ec2.eu-west-1.amazonaws.com'
+          when 'us-east-1'
+            'ec2.us-east-1.amazonaws.com'
+          when 'us-west-1'
+            'ec2.us-west-1.amazonaws.com'
+          else
+            'ec2.amazonaws.com'
           end
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
         end
 
-        string_to_sign = "POST\n#{@host}\n/\n" << body.chop
-        hmac = @hmac.update(string_to_sign)
-        body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
+        private
 
-        response = @connection.request({
-          :body     => body,
-          :expects  => 200,
-          :headers  => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-          :host     => @host,
-          :method   => 'POST',
-          :parser   => parser
-        })
+        def request(params)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
 
-        response
-      end
+          idempotent = params.delete(:idempotent)
+          parser = params.delete(:parser)
+
+          params.merge!({
+            'AWSAccessKeyId' => @aws_access_key_id,
+            'SignatureMethod' => 'HmacSHA256',
+            'SignatureVersion' => '2',
+            'Timestamp' => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+            'Version' => '2009-11-30'
+          })
+
+          body = ''
+          for key in params.keys.sort
+            unless (value = params[key]).nil?
+              body << "#{key}=#{CGI.escape(value.to_s).gsub(/\+/, '%20')}&"
+            end
+          end
+
+          string_to_sign = "POST\n#{@host}\n/\n" << body.chop
+          hmac = @hmac.update(string_to_sign)
+          body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
 
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :idempotent => idempotent,
+            :host       => @host,
+            :method     => 'POST',
+            :parser     => parser
+          })
+
+          response
+        end
+
+      end
     end
   end
 end
-
-Fog::AWS::EC2.reload

data/lib/fog/aws/models/ec2/address.rb

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Address < Fog::Model
 

data/lib/fog/aws/models/ec2/addresses.rb

@@ -1,11 +1,24 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/address'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def addresses(attributes = {})
-        Fog::AWS::EC2::Addresses.new({
-          :connection => self
-        }.merge!(attributes))
+      class Mock
+        def addresses(attributes = {})
+          Fog::AWS::EC2::Addresses.new({
+            :connection => self
+          }.merge!(attributes))
+        end
+      end
+
+      class Real
+        def addresses(attributes = {})
+          Fog::AWS::EC2::Addresses.new({
+            :connection => self
+          }.merge!(attributes))
+        end
       end
 
       class Addresses < Fog::Collection
@@ -29,8 +42,9 @@ module Fog
             end
           )
           if server
-            self.replace(self.select {|address| address.instance_id == server.id})
+            self.replace(self.select {|address| address.server_id == server.id})
           end
+          self
         end
 
         def get(public_ip)

data/lib/fog/aws/models/ec2/flavor.rb

@@ -1,6 +1,8 @@
+require 'fog/model'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
       class Flavor < Fog::Model
 

data/lib/fog/aws/models/ec2/flavors.rb

@@ -1,9 +1,20 @@
+require 'fog/collection'
+require 'fog/aws/models/ec2/flavor'
+
 module Fog
   module AWS
-    class EC2
+    module EC2
 
-      def flavors
-        Fog::AWS::EC2::Flavors.new(:connection => self)
+      class Mock
+        def flavors
+          Fog::AWS::EC2::Flavors.new(:connection => self)
+        end
+      end
+
+      class Real
+        def flavors
+          Fog::AWS::EC2::Flavors.new(:connection => self)
+        end
       end
 
       class Flavors < Fog::Collection