fog 0.9.0 → 0.10.0

data/docs/index.markdown

@@ -17,10 +17,10 @@ With a rapidly expanding community and codebase the advantages of fog just keep
 
 Now type 'fog' to try stuff, confident that fog will let you know what to do. Here is an example of wading through server creation for Amazon Elastic Compute Cloud:
 
-    >> server = AWS.servers.create
+    >> server = Compute[:aws].servers.create
     ArgumentError: image_id is required for this operation
 
-    >> server = AWS.servers.create(:image_id => 'ami-5ee70037')
+    >> server = Compute[:aws].servers.create(:image_id => 'ami-5ee70037')
     <Fog::AWS::EC2::Server [...]>
 
     >> server.destroy # cleanup after yourself or regret it, trust me

data/fog.gemspec

@@ -6,8 +6,8 @@ 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.9.0'
-  s.date              = '2011-06-24'
+  s.version           = '0.10.0'
+  s.date              = '2011-07-25'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,13 +37,13 @@ Gem::Specification.new do |s|
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
   s.add_dependency('builder')
-  s.add_dependency('excon', '~>0.6.1')
-  s.add_dependency('formatador', '>=0.1.3')
-  s.add_dependency('json')
+  s.add_dependency('excon', '~>0.6.5')
+  s.add_dependency('formatador', '~>0.2.0')
+  s.add_dependency('multi_json', '~>1.0.3')
   s.add_dependency('mime-types')
-  s.add_dependency('net-scp', '>=1.0.4')
-  s.add_dependency('net-ssh', '>=2.1.4')
-  s.add_dependency('nokogiri', '>=1.4.4')
+  s.add_dependency('net-scp', '~>1.0.4')
+  s.add_dependency('net-ssh', '~>2.1.4')
+  s.add_dependency('nokogiri', '~>1.5.0')
   s.add_dependency('ruby-hmac')
 
   ## List your development dependencies here. Development dependencies are
@@ -51,9 +51,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('jekyll')
   s.add_development_dependency('rake')
   s.add_development_dependency('rdoc')
-  s.add_development_dependency('rspec', '1.3.1')
-  s.add_development_dependency('shindo', '0.3.4')
-  s.add_development_dependency('virtualbox', '0.8.3')
+  s.add_development_dependency('rspec', '~>1.3.1')
+  s.add_development_dependency('shindo', '~>0.3.4')
+  s.add_development_dependency('virtualbox', '~>0.8.3')
 
   s.files = `git ls-files`.split("\n")
   s.test_files = `git ls-files -- {spec,tests}/*`.split("\n")

data/lib/fog.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'fog', 'core')
 module Fog
 
   unless const_defined?(:VERSION)
-    VERSION = '0.9.0'
+    VERSION = '0.10.0'
   end
 
 end

data/lib/fog/aws/auto_scaling.rb

@@ -0,0 +1,221 @@
+module Fog
+  module AWS
+    class AutoScaling < Fog::Service
+
+      class IdentifierTaken < Fog::Errors::Error; end
+      class ResourceInUse < Fog::Errors::Error; end
+      class ValidationError < Fog::Errors::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :host, :path, :port, :scheme, :persistent, :region
+
+      request_path 'fog/aws/requests/auto_scaling'
+      request :create_auto_scaling_group
+      request :create_launch_configuration
+      request :delete_auto_scaling_group
+      request :delete_launch_configuration
+      request :delete_policy
+      request :delete_scheduled_action
+      request :describe_adjustment_types
+      request :describe_auto_scaling_groups
+      request :describe_auto_scaling_instances
+      request :describe_launch_configurations
+      request :describe_metric_collection_types
+      request :describe_policies
+      request :describe_scaling_activities
+      request :describe_scaling_process_types
+      request :describe_scheduled_actions
+      request :disable_metrics_collection
+      request :enable_metrics_collection
+      request :execute_policy
+      request :put_scaling_policy
+      request :put_scheduled_update_group_action
+      request :resume_processes
+      request :set_desired_capacity
+      request :set_instance_health
+      request :suspend_processes
+      request :terminate_instance_in_auto_scaling_group
+      request :update_auto_scaling_group
+
+      model_path 'fog/aws/models/auto_scaling'
+      model      :activity
+      collection :activities
+      model      :configuration
+      collection :configurations
+      model      :group
+      collection :groups
+      model      :instance
+      collection :instances
+
+      class Real
+
+        # Initialize connection to AutoScaling
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   as = AutoScaling.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 {}.
+        #
+        # ==== Returns
+        # * AutoScaling object with connection to AWS.
+        def initialize(options={})
+          require 'fog/core/parser'
+
+          @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-northeast-1'
+            'autoscaling.ap-northeast-1.amazonaws.com'
+          when 'ap-southeast-1'
+            'autoscaling.ap-southeast-1.amazonaws.com'
+          when 'eu-west-1'
+            'autoscaling.eu-west-1.amazonaws.com'
+          when 'us-east-1'
+            'autoscaling.us-east-1.amazonaws.com'
+          when 'us-west-1'
+            'autoscaling.us-west-1.amazonaws.com'
+          else
+            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+          end
+          @path       = options[:path]      || '/'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", 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,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2010-08-01'
+            }
+          )
+
+          begin
+            response = @connection.request({
+              :body       => body,
+              :expects    => 200,
+              :idempotent => idempotent,
+              :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+              :host       => @host,
+              :method     => 'POST',
+              :parser     => parser
+            })
+          rescue Excon::Errors::HTTPStatusError => error
+            if match = error.message.match(/<Code>(.*)<\/Code>.*<Message>(.*)<\/Message>/)
+              case match[1]
+              when 'AlreadyExists'
+                #raise Fog::AWS::AutoScaling::IdentifierTaken.new(match[2])
+                raise Fog::AWS::AutoScaling::IdentifierTaken.slurp(error, match[2])
+              when 'ResourceInUse'
+                raise Fog::AWS::AutoScaling::ResourceInUse.slurp(error, match[2])
+              when 'ValidationError'
+                raise Fog::AWS::AutoScaling::ValidationError.slurp(error, match[2])
+              else
+                raise Fog::AWS::Compute::Error.slurp(error, "#{match[1]} => #{match[2]}")
+              end
+            else
+             raise
+            end
+          end
+
+          response
+        end
+
+      end
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :adjustment_types => [
+                  'ChangeInCapacity',
+                  'ExactCapacity',
+                  'PercentChangeInCapacity'
+                ],
+                :auto_scaling_groups => {},
+                :health_states => ['Healthy', 'Unhealthy'],
+                :launch_configurations => {},
+                :metric_collection_types => {
+                  :granularities => [ '1Minute' ],
+                  :metrics => [
+                    'GroupMinSize',
+                    'GroupMaxSize',
+                    'GroupDesiredCapacity',
+                    'GroupInServiceInstances',
+                    'GroupPendingInstances',
+                    'GroupTerminatingInstances',
+                    'GroupTotalInstances'
+                  ],
+                },
+                :process_types => [
+                  'AZRebalance',
+                  'AlarmNotification',
+                  'HealthCheck',
+                  'Launch',
+                  'ReplaceUnhealthy',
+                  'ScheduledActions',
+                  'Terminate'
+                ]
+              }
+            end
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+
+          @aws_access_key_id = options[:aws_access_key_id]
+
+          @region = options[:region] || 'us-east-1'
+
+          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)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/aws/cloud_formation.rb

@@ -43,7 +43,7 @@ module Fog
         # * CloudFormation object with connection to AWS.
         def initialize(options={})
           require 'fog/core/parser'
-          require 'json'
+          require 'multi_json'
 
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]

data/lib/fog/aws/cloud_watch.rb

@@ -0,0 +1,110 @@
+module Fog
+  module AWS
+    class CloudWatch < Fog::Service
+
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent
+
+      request_path 'fog/aws/requests/cloud_watch'
+
+      request :list_metrics
+      request :get_metric_statistics
+      request :put_metric_data
+      
+      model_path 'fog/aws/models/cloud_watch'
+      model       :metric
+      collection  :metrics
+      model       :metric_statistic
+      collection  :metric_statistics
+
+      class Mock
+
+        def initialize(options={})
+        end
+
+      end
+
+      class Real
+
+        # Initialize connection to Cloudwatch
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   elb = CloudWatch.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', 'ap-southeast-1', 'ap-northeast-1']
+        #
+        # ==== Returns
+        # * CloudWatch 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-northeast-1'
+            'monitoring.ap-northeast-1.amazonaws.com'
+          when 'ap-southeast-1'
+            'monitoring.ap-southeast-1.amazonaws.com'
+          when 'eu-west-1'
+            'monitoring.eu-west-1.amazonaws.com'
+          when 'us-east-1'
+            'monitoring.us-east-1.amazonaws.com'
+          when 'us-west-1'
+            'monitoring.us-west-1.amazonaws.com'
+          else
+            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
+          end
+          @path       = options[:path]      || '/'
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", 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,
+              :path               => @path,
+              :port               => @port,
+              :version            => '2010-08-01'
+            }
+          )
+
+          response = @connection.request({
+            :body       => body,
+            :expects    => 200,
+            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :idempotent => idempotent,
+            :host       => @host,
+            :method     => 'POST',
+            :parser     => parser
+          })
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/elb.rb

@@ -23,7 +23,7 @@ module Fog
       request :disable_availability_zones_for_load_balancer
       request :enable_availability_zones_for_load_balancer
       request :register_instances_with_load_balancer
-      #request :set_load_balancer_listener_ssl_certificate
+      request :set_load_balancer_listener_ssl_certificate
       request :set_load_balancer_policies_of_listener
 
       model_path 'fog/aws/models/elb'
@@ -36,10 +36,43 @@ module Fog
 
       class Mock
 
+        def self.data
+          @data ||= Hash.new do |hash, region|
+            owner_id = Fog::AWS::Mock.owner_id
+            hash[region] = Hash.new do |region_hash, key|
+              region_hash[key] = {
+                :owner_id => owner_id,
+                :load_balancers => {}
+              }
+            end
+          end
+        end
+
+        def self.dns_name(name, region)
+          "#{name}-#{Fog::Mock.random_hex(8)}.#{region}.elb.amazonaws.com"
+        end
+
+        def self.reset
+          @data = nil
+        end
+
         def initialize(options={})
-          Fog::Mock.not_implemented
+          @aws_access_key_id = options[:aws_access_key_id]
+
+          @region = options[:region] || 'us-east-1'
+
+          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)
+        end
       end
 
       class Real
@@ -111,34 +144,33 @@ module Fog
               :version            => '2011-04-05'
           }
           )
-          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::HTTPStatusError => error
-            if match = error.message.match(/<Code>(.*)<\/Code>/m)
-              case match[1]
-              when 'LoadBalancerNotFound'
-                raise Fog::AWS::ELB::NotFound
-              when 'DuplicateLoadBalancerName'
-                raise Fog::AWS::ELB::IdentifierTaken
-              when 'InvalidInstance'
-                raise Fog::AWS::ELB::InvalidInstance
-              else
-                raise
-              end
+
+          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::HTTPStatusError => error
+          if match = error.message.match(/<Code>(.*)<\/Code>(?:.*<Message>(.*)<\/Message>)?/m)
+            case match[1]
+            when 'CertificateNotFound'
+              raise Fog::AWS::IAM::NotFound.slurp(error, match[2])
+            when 'LoadBalancerNotFound'
+              raise Fog::AWS::ELB::NotFound.slurp(error, match[2])
+            when 'DuplicateLoadBalancerName'
+              raise Fog::AWS::ELB::IdentifierTaken.slurp(error, match[2])
+            when 'InvalidInstance'
+              raise Fog::AWS::ELB::InvalidInstance.slurp(error, match[2])
             else
               raise
             end
+          else
+            raise
           end
-
-          response
         end
       end
     end