fog 0.0.84 → 0.0.85

data/Gemfile

@@ -10,3 +10,4 @@ gem 'nokogiri', ">= 0"
 gem 'ruby-hmac', ">= 0"
 gem 'rspec', '>= 0'
 gem 'shindo', '>= 0'
+gem 'fog', :path => '.'

data/Gemfile.lock

@@ -1,69 +1,79 @@
 --- 
+specs: 
+- rake: 
+    version: 0.8.7
+- annals: 
+    version: 0.0.3
+- excon: 
+    version: 0.0.21
+- formatador: 
+    version: 0.0.13
+- json: 
+    version: 1.4.1
+- mime-types: 
+    version: "1.16"
+- net-ssh: 
+    version: 2.0.22
+- nokogiri: 
+    version: 1.4.1
+- ruby-hmac: 
+    version: 0.4.0
+- fog: 
+    version: 0.0.84
+    source: 0
+- rspec: 
+    version: 1.3.0
+- shindo: 
+    version: 0.0.17
+hash: 6cf30542dfb9f6105f2e82d59ca1b74d7285aa68
+sources: 
+- Path: 
+    path: !ruby/object:Pathname 
+      path: .
+- Rubygems: 
+    uri: http://gemcutter.org
 dependencies: 
   formatador: 
+    version: ">= 0.0.10"
     group: 
     - :default
-    version: ">= 0.0.10"
-  rake: 
+  nokogiri: 
+    version: ">= 0"
     group: 
     - :default
+  rspec: 
     version: ">= 0"
-  ruby-hmac: 
     group: 
     - :default
+  rake: 
     version: ">= 0"
-  mime-types: 
     group: 
     - :default
+  mime-types: 
     version: ">= 0"
-  rspec: 
     group: 
     - :default
+  ruby-hmac: 
     version: ">= 0"
-  net-ssh: 
     group: 
     - :default
+  net-ssh: 
     version: ">= 0"
-  json: 
     group: 
     - :default
+  fog: 
     version: ">= 0"
-  excon: 
     group: 
     - :default
+  excon: 
     version: ">= 0.0.21"
-  shindo: 
     group: 
     - :default
+  json: 
     version: ">= 0"
-  nokogiri: 
     group: 
     - :default
+  shindo: 
     version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- annals: 
-    version: 0.0.3
-- excon: 
-    version: 0.0.21
-- formatador: 
-    version: 0.0.13
-- json: 
-    version: 1.4.1
-- mime-types: 
-    version: "1.16"
-- net-ssh: 
-    version: 2.0.22
-- nokogiri: 
-    version: 1.4.1
-- rspec: 
-    version: 1.3.0
-- ruby-hmac: 
-    version: 0.4.0
-- shindo: 
-    version: 0.0.17
-hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
+    group: 
+    - :default

data/bin/fog

@@ -1,21 +1,20 @@
 #!/usr/bin/env ruby
-lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
-require File.join(lib_dir, 'fog')
+require 'fog'
 require 'irb'
 require 'yaml'
-
-require File.join(lib_dir, 'fog', 'credentials')
-require File.join(lib_dir, 'fog', 'bin')
+require 'fog/credentials'
+require 'fog/bin'
 
 Fog.credential = (ARGV.first && :"#{ARGV.first}") || :default
 unless Fog.credentials
   exit
 end
 
-require File.join(lib_dir, 'fog', 'aws', 'bin')
-require File.join(lib_dir, 'fog', 'rackspace', 'bin')
-require File.join(lib_dir, 'fog', 'slicehost', 'bin')
-require File.join(lib_dir, 'fog', 'terremark', 'bin')
+require 'fog/aws/bin'
+require 'fog/local/bin'
+require 'fog/rackspace/bin'
+require 'fog/slicehost/bin'
+require 'fog/terremark/bin'
 
 if ARGV.length > 1
   print(instance_eval(ARGV[1..-1].join(' ')).to_json)
@@ -41,4 +40,4 @@ else
 
   catch(:IRB_EXIT) { @irb.eval_input }
 
-end
+end

data/fog.gemspec

@@ -7,8 +7,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.0.84'
-  s.date              = '2010-04-28'
+  s.version           = '0.0.85'
+  s.date              = '2010-05-02'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -73,6 +73,7 @@ Gem::Specification.new do |s|
     lib/fog/aws.rb
     lib/fog/aws/bin.rb
     lib/fog/aws/ec2.rb
+    lib/fog/aws/elb.rb
     lib/fog/aws/models/ec2/address.rb
     lib/fog/aws/models/ec2/addresses.rb
     lib/fog/aws/models/ec2/flavor.rb
@@ -113,6 +114,12 @@ Gem::Specification.new do |s|
     lib/fog/aws/parsers/ec2/get_console_output.rb
     lib/fog/aws/parsers/ec2/run_instances.rb
     lib/fog/aws/parsers/ec2/terminate_instances.rb
+    lib/fog/aws/parsers/elb/deregister_instances_from_load_balancer.rb
+    lib/fog/aws/parsers/elb/describe_instance_health.rb
+    lib/fog/aws/parsers/elb/describe_load_balancers.rb
+    lib/fog/aws/parsers/elb/disable_availability_zones_for_load_balancer.rb
+    lib/fog/aws/parsers/elb/enable_availability_zones_for_load_balancer.rb
+    lib/fog/aws/parsers/elb/register_instances_with_load_balancer.rb
     lib/fog/aws/parsers/s3/copy_object.rb
     lib/fog/aws/parsers/s3/get_bucket.rb
     lib/fog/aws/parsers/s3/get_bucket_location.rb
@@ -153,6 +160,12 @@ Gem::Specification.new do |s|
     lib/fog/aws/requests/ec2/revoke_security_group_ingress.rb
     lib/fog/aws/requests/ec2/run_instances.rb
     lib/fog/aws/requests/ec2/terminate_instances.rb
+    lib/fog/aws/requests/elb/deregister_instances_from_load_balancer.rb
+    lib/fog/aws/requests/elb/describe_instance_health.rb
+    lib/fog/aws/requests/elb/describe_load_balancers.rb
+    lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb
+    lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb
+    lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb
     lib/fog/aws/requests/s3/copy_object.rb
     lib/fog/aws/requests/s3/delete_bucket.rb
     lib/fog/aws/requests/s3/delete_object.rb
@@ -181,6 +194,12 @@ Gem::Specification.new do |s|
     lib/fog/connection.rb
     lib/fog/credentials.rb
     lib/fog/deprecation.rb
+    lib/fog/local.rb
+    lib/fog/local/bin.rb
+    lib/fog/local/models/directories.rb
+    lib/fog/local/models/directory.rb
+    lib/fog/local/models/file.rb
+    lib/fog/local/models/files.rb
     lib/fog/model.rb
     lib/fog/parser.rb
     lib/fog/rackspace.rb
@@ -310,8 +329,8 @@ Gem::Specification.new do |s|
     lib/fog/terremark/requests/shared/instantiate_vapp_template.rb
     lib/fog/terremark/requests/shared/power_off.rb
     lib/fog/terremark/requests/shared/power_on.rb
-    lib/fog/terremark/requests/shared/reset.rb
-    lib/fog/terremark/requests/shared/shutdown.rb
+    lib/fog/terremark/requests/shared/power_reset.rb
+    lib/fog/terremark/requests/shared/power_shutdown.rb
     lib/fog/terremark/shared.rb
     lib/fog/terremark/vcloud.rb
     spec/aws/models/ec2/address_spec.rb

data/lib/fog.rb

@@ -24,14 +24,18 @@ require 'fog/deprecation'
 require 'fog/model'
 require 'fog/parser'
 require 'fog/ssh'
+
 require 'fog/aws'
+require 'fog/local'
 require 'fog/rackspace'
 require 'fog/slicehost'
 require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.84'
+  unless VERSION
+    VERSION = '0.0.85'
+  end
 
   module Mock
     @delay = 1
@@ -55,4 +59,18 @@ module Fog
     !!@mocking
   end
 
+  def self.wait_for(timeout = 600, &block)
+    duration = 0
+    start = Time.now
+    until yield || duration > timeout
+      sleep(1)
+      duration = Time.now - start
+    end
+    if duration > timeout
+      false
+    else
+      { :duration => duration }
+    end
+  end
+
 end

data/lib/fog/aws.rb

@@ -1,4 +1,5 @@
 require 'fog/aws/ec2.rb'
+require 'fog/aws/elb.rb'
 require 'fog/aws/s3'
 require 'fog/aws/simpledb'
 
@@ -13,6 +14,28 @@ module Fog
       params
     end
 
+    def self.signed_params(params, options = {})
+      params.merge!({
+        'AWSAccessKeyId'    => options[:aws_access_key_id],
+        'SignatureMethod'   => 'HmacSHA256',
+        'SignatureVersion'  => '2',
+        'Timestamp'         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+        'Version'           => options[:version]
+      })
+
+      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#{options[:host]}\n/\n" << body.chop
+      hmac = options[:hmac].update(string_to_sign)
+      body << "Signature=#{CGI.escape(Base64.encode64(hmac.digest).chomp!).gsub(/\+/, '%20')}"
+
+      body
+    end
+
     class Mock
 
       def self.availability_zone

data/lib/fog/aws/bin.rb

@@ -15,6 +15,10 @@ module AWS
           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

data/lib/fog/aws/ec2.rb

@@ -176,15 +176,17 @@ module Fog
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @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
+            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
+              'ec2.amazonaws.com'
+            end
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
         end
@@ -197,24 +199,15 @@ module Fog
           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')}"
+          body = AWS.signed_params(
+            params,
+            {
+              :aws_access_key_id  => @aws_access_key_id,
+              :hmac               => @hmac,
+              :host               => @host,
+              :version            => '2009-11-30'
+            }
+          )
 
           response = @connection.request({
             :body       => body,

data/lib/fog/aws/elb.rb

@@ -0,0 +1,115 @@
+module Fog
+  module AWS
+    module ELB
+
+      def self.new(options={})
+
+        unless @required
+          require 'fog/aws/parsers/elb/deregister_instances_from_load_balancer'
+          require 'fog/aws/parsers/elb/describe_instance_health'
+          require 'fog/aws/parsers/elb/describe_load_balancers'
+          require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'
+          require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'
+          require 'fog/aws/parsers/elb/register_instances_with_load_balancer'
+          require 'fog/aws/requests/elb/deregister_instances_from_load_balancer'
+          require 'fog/aws/requests/elb/describe_instance_health'
+          require 'fog/aws/requests/elb/describe_load_balancers'
+          require 'fog/aws/requests/elb/disable_availability_zones_for_load_balancer'
+          require 'fog/aws/requests/elb/enable_availability_zones_for_load_balancer'
+          require 'fog/aws/requests/elb/register_instances_with_load_balancer'
+          @required = true
+        end
+
+        unless options[:aws_access_key_id]
+          raise ArgumentError.new('aws_access_key_id is required to access elb')
+        end
+        unless options[:aws_secret_access_key]
+          raise ArgumentError.new('aws_secret_access_key is required to access elb')
+        end
+        Fog::AWS::ELB::Real.new(options)
+      end
+
+      def self.indexed_param(key, values, idx_offset = 0)
+        params = {}
+        key.concat(".%") unless key.include?("%")
+        [*values].each_with_index do |value, index|
+          params["#{key.gsub("%", (index + idx_offset).to_s)}"] = value
+        end
+        return params
+      end
+
+      class Real
+
+        # Initialize connection to ELB
+        #
+        # ==== Notes
+        # options parameter must include values for :aws_access_key_id and
+        # :aws_secret_access_key in order to create a connection
+        #
+        # ==== Examples
+        #   elb = ELB.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'i, 'ap-southeast-1']
+        #
+        # ==== Returns
+        # * ELB 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 = HMAC::SHA256.new(@aws_secret_access_key)
+          @host = options[:host] || case options[:region]
+          when 'ap-southeast-1'
+            'elasticloadbalancing.ap-southeast-1.amazonaws.com'
+          when 'eu-west-1'
+            'elasticloadbalancing.eu-west-1.amazonaws.com'
+          when 'us-east-1'
+            'elasticloadbalancing.us-east-1.amazonaws.com'
+          when 'us-west-1'
+            'elasticloadbalancing.us-west-1.amazonaws.com'
+          else
+            'elasticloadbalancing.amazonaws.com'
+          end
+          @port       = options[:port]      || 443
+          @scheme     = options[:scheme]    || 'https'
+        end
+
+        private
+
+        def request(params)
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
+
+          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-25'
+            }
+          )
+
+          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