fog 0.2.30 → 0.3.0

data/lib/fog.rb

@@ -8,6 +8,7 @@ require 'json'
 require 'mime/types'
 require 'net/ssh'
 require 'nokogiri'
+require 'tempfile'
 require 'time'
 
 __DIR__ = File.dirname(__FILE__)
@@ -24,24 +25,14 @@ require 'fog/errors'
 require 'fog/hmac'
 require 'fog/model'
 require 'fog/parser'
+require 'fog/provider'
 require 'fog/service'
 require 'fog/ssh'
 
-require 'fog/aws'
-require 'fog/bluebox'
-require 'fog/go_grid'
-require 'fog/linode'
-require 'fog/local'
-require 'fog/new_servers'
-require 'fog/rackspace'
-require 'fog/slicehost'
-require 'fog/terremark'
-require 'fog/vcloud'
-
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.2.30'
+    VERSION = '0.3.0'
   end
 
   module Mock
@@ -61,6 +52,14 @@ module Fog
 
   end
 
+  def self.bin
+    @bin ||= false
+  end
+
+  def self.bin=(new_bin)
+    @bin = new_bin
+  end
+
   def self.mock!
     @mocking = true
   end
@@ -84,3 +83,14 @@ module Fog
   end
 
 end
+
+require 'fog/aws'
+require 'fog/bluebox'
+require 'fog/go_grid'
+require 'fog/linode'
+require 'fog/local'
+require 'fog/new_servers'
+require 'fog/rackspace'
+require 'fog/slicehost'
+require 'fog/terremark'
+require 'fog/vcloud'

data/lib/fog/attributes.rb

@@ -15,10 +15,6 @@ module Fog
       end
 
       def attribute(name, options = {})
-        # FIXME: handle legacy where options would have been one or more aliases
-        if !options.is_a?(Hash)
-          options = {:aliases => options}
-        end
         class_eval <<-EOS, __FILE__, __LINE__
           attr_reader :#{name}
         EOS
@@ -100,9 +96,9 @@ module Fog
         end
       end
 
-      def identity(name, other_names = [])
+      def identity(name, options = {})
         @identity = name
-        self.attribute(name, {:aliases => other_names})
+        self.attribute(name, options)
       end
 
       def ignore_attributes(*args)

data/lib/fog/aws.rb

@@ -1,11 +1,16 @@
-require 'fog/aws/ec2.rb'
-require 'fog/aws/elb.rb'
-require 'fog/aws/s3'
-require 'fog/aws/simpledb'
-
 module Fog
   module AWS
 
+    extend Fog::Provider
+
+    service_path 'fog/aws'
+    service 'compute'
+    service 'ec2'
+    service 'elb'
+    service 's3'
+    service 'simpledb'
+    service 'storage'
+
     def self.indexed_param(key, values, offset = 0)
       params = {}
       unless key.include?('%d')

data/lib/fog/aws/bin.rb

@@ -1,73 +1,37 @@
-module AWS
+class AWS < Fog::Bin
   class << self
-    credential = (ARGV.first && :"#{ARGV.first}") || :default
-    if Fog.credentials[:aws_access_key_id] && Fog.credentials[:aws_secret_access_key]
 
-      def initialized?
-        true
-      end
-
-      def [](service)
-        @@connections ||= Hash.new do |hash, key|
-          credentials = Fog.credentials.reject do |k, v|
-            ![:aws_access_key_id, :aws_secret_access_key].include?(k)
-          end
-          hash[key] = case key
-          when :ec2
-            Fog::AWS::EC2.new(credentials)
-          when :elb
-            Fog::AWS::ELB.new(credentials)
-          when :simpledb
-            Fog::AWS::SimpleDB.new(credentials)
-          when :s3
-            Fog::AWS::S3.new(credentials)
-          end
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::AWS::Compute.new
+        when :ec2
+          location = caller.first
+          warning = "[yellow][WARN] AWS[:ec2] is deprecated, use AWS[:compute] instead[/]"
+          warning << " [light_black](" << location << ")[/] "
+          Formatador.display_line(warning)
+          Fog::AWS::Compute.new
+        when :elb
+          Fog::AWS::ELB.new
+        when :simpledb
+          Fog::AWS::SimpleDB.new
+        when :s3
+          location = caller.first
+          warning = "[yellow][WARN] AWS[:s3] is deprecated, use AWS[:storage] instead[/]"
+          warning << " [light_black](" << location << ")[/] "
+          Formatador.display_line(warning)
+          Fog::AWS::Storage.new
+        when :storage
+          Fog::AWS::Storage.new
         end
-        @@connections[service]
-      end
-
-      def addresses
-        self[:ec2].addresses
-      end
-
-      def directories
-        self[:s3].directories
-      end
-
-      def flavors
-        self[:ec2].flavors
-      end
-
-      def images
-        self[:ec2].images
-      end
-
-      def servers
-        self[:ec2].servers
-      end
-
-      def key_pairs
-        self[:ec2].key_pairs
-      end
-
-      def security_groups
-        self[:ec2].security_groups
-      end
-
-      def snapshots
-        self[:ec2].snapshots
-      end
-
-      def volumes
-        self[:ec2].volumes
-      end
-
-    else
-
-      def initialized?
-        false
       end
+      @@connections[service]
+    end
 
+    def services
+      [:compute, :elb, :simpledb, :storage]
     end
+
   end
 end

data/lib/fog/aws/compute.rb

@@ -0,0 +1,220 @@
+module Fog
+  module AWS
+    class Compute < Fog::Service
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      model_path 'fog/aws/models/compute'
+      model       :address
+      collection  :addresses
+      model       :flavor
+      collection  :flavors
+      model       :image
+      collection  :images
+      model       :key_pair
+      collection  :key_pairs
+      model       :security_group
+      collection  :security_groups
+      model       :server
+      collection  :servers
+      model       :snapshot
+      collection  :snapshots
+      model       :volume
+      collection  :volumes
+
+      require 'fog/aws/parsers/compute/basic'
+
+      request_path 'fog/aws/requests/compute'
+      request :allocate_address
+      request :associate_address
+      request :attach_volume
+      request :authorize_security_group_ingress
+      request :create_key_pair
+      request :create_security_group
+      request :create_snapshot
+      request :create_image
+      request :create_volume
+      request :delete_key_pair
+      request :delete_security_group
+      request :delete_snapshot
+      request :delete_volume
+      request :deregister_image
+      request :describe_addresses
+      request :describe_availability_zones
+      request :describe_images
+      request :describe_instances
+      request :describe_reserved_instances
+      request :describe_key_pairs
+      request :describe_regions
+      request :describe_security_groups
+      request :describe_snapshots
+      request :describe_volumes
+      request :detach_volume
+      request :disassociate_address
+      request :get_console_output
+      request :import_key_pair
+      request :modify_image_attributes
+      request :modify_snapshot_attribute
+      request :reboot_instances
+      request :release_address
+      request :register_image
+      request :revoke_security_group_ingress
+      request :run_instances
+      request :terminate_instances
+      request :start_instances
+      request :stop_instances
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            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 => {}
+            }
+          end
+        end
+
+        def self.reset_data(keys=data.keys)
+          for key in [*keys]
+            data.delete(key)
+          end
+        end
+
+        def initialize(options={})
+          @aws_access_key_id = options[:aws_access_key_id]
+          @data = self.class.data[@aws_access_key_id]
+          @owner_id = @data[:owner_id]
+        end
+
+      end
+
+      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={})
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || case options[:region]
+            when 'ap-southeast-1'
+              'ec2.ap-southeast-1.amazonaws.com'
+            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
+              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+            end
+          @port   = options[:port]      || 443
+          @scheme = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        private
+
+        def request(params)
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :version            => '2010-08-31'
+            }
+          )
+
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :idempotent => idempotent,
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+          rescue Excon::Errors::Error => error
+            if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
+              raise case match[1].split('.').last
+              when 'NotFound'
+                Fog::AWS::Compute::NotFound.slurp(error, match[2])
+              else
+                Fog::AWS::Compute::Error.slurp(error, "#{match[1]} => #{match[2]}")
+              end
+            else
+              raise error
+            end
+          end
+
+          response
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/ec2.rb

@@ -1,222 +1,15 @@
-	module Fog
+module Fog
   module AWS
-    module EC2
-      extend Fog::Service
-
-      requires :aws_access_key_id, :aws_secret_access_key
-
-      model_path 'fog/aws/models/ec2'
-      model 'address'
-      model 'addresses'
-      model 'flavor'
-      model 'flavors'
-      model 'image'
-      model 'images'
-      model 'key_pair'
-      model 'key_pairs'
-      model 'security_group'
-      model 'security_groups'
-      model 'server'
-      model 'servers'
-      model 'snapshot'
-      model 'snapshots'
-      model 'volume'
-      model 'volumes'
-
-      require 'fog/aws/parsers/ec2/basic'
-
-      request_path 'fog/aws/requests/ec2'
-      request 'allocate_address'
-      request 'associate_address'
-      request 'attach_volume'
-      request 'authorize_security_group_ingress'
-      request 'create_key_pair'
-      request 'create_security_group'
-      request 'create_snapshot'
-      request 'create_image'
-      request 'create_volume'
-      request 'delete_key_pair'
-      request 'delete_security_group'
-      request 'delete_snapshot'
-      request 'delete_volume'
-      request 'deregister_image'
-      request 'describe_addresses'
-      request 'describe_availability_zones'
-      request 'describe_images'
-      request 'describe_instances'
-      request 'describe_reserved_instances'
-      request 'describe_key_pairs'
-      request 'describe_regions'
-      request 'describe_security_groups'
-      request 'describe_snapshots'
-      request 'describe_volumes'
-      request 'detach_volume'
-      request 'disassociate_address'
-      request 'get_console_output'
-      request 'modify_image_attributes'
-      request 'modify_snapshot_attribute'
-      request 'reboot_instances'
-      request 'release_address'
-      request 'register_image'
-      request 'revoke_security_group_ingress'
-      request 'run_instances'
-      request 'terminate_instances'
-      request 'start_instances'
-      request 'stop_instances'
-
-      class Mock
-        include Collections
-
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            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 => {}
-            }
-          end
-        end
-
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
-        def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[@aws_access_key_id]
-          @owner_id = @data[:owner_id]
-        end
-
+    class EC2
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::EC2#new is deprecated, use Fog::AWS::Compute#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Compute.new(attributes)
       end
 
-      class Real
-        include Collections
-
-        # 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={})
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-            when 'ap-southeast-1'
-              'ec2.ap-southeast-1.amazonaws.com'
-            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
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-            end
-          @port   = options[:port]      || 443
-          @scheme = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
-        end
-
-        def reload
-          @connection.reset
-        end
-
-        private
-
-        def request(params)
-          idempotent  = params.delete(:idempotent)
-          parser      = params.delete(:parser)
-
-          body = AWS.signed_params(
-            params,
-            {
-              :aws_access_key_id  => @aws_access_key_id,
-              :hmac               => @hmac,
-              :host               => @host,
-              :version            => '2009-11-30'
-            }
-          )
-
-          begin
-            response = @connection.request({
-              :body       => body,
-              :expects    => 200,
-              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
-              :idempotent => idempotent,
-              :host       => @host,
-              :method     => 'POST',
-              :parser     => parser
-            })
-          rescue Excon::Errors::Error => error
-            if match = error.message.match(/<Code>(.*)<\/Code><Message>(.*)<\/Message>/)
-              raise case match[1].split('.').last
-              when 'NotFound'
-                Fog::AWS::EC2::NotFound.slurp(error, match[2])
-              else
-                Fog::AWS::EC2::Error.slurp(error, "#{match[1]} => #{match[2]}")
-              end
-            else
-              raise error
-            end
-          end
-
-          response
-        end
-
-      end
     end
   end
 end