fog 1.1.2 → 1.2.0

data/docs/_layouts/default.html

@@ -35,7 +35,7 @@
       <dl>
         <dt>version</dt><dd>vX.Y.Z</dd>
         <dt>install</dt><dd><code>gem install fog</code></dd>
-        <dt>source</dt><dd><a href="http://github.com/fog/fog">geemus/fog</a></dd>
+        <dt>source</dt><dd><a href="http://github.com/fog/fog">fog/fog</a></dd>
       </dl>
     </header>
 

data/docs/index.markdown

@@ -45,7 +45,7 @@ geemus says: "That should give you everything you need to get started, but let m
 * Find something you would like to work on. For suggestions look for the `easy`, `medium` and `hard` tags in the [issues](http://github.com/fog/fog/issues)
 * Fork the project and do your work in a topic branch.
 * Add shindo tests to prove your code works and run all the tests using `bundle exec rake`.
-* Rebase your branch against geemus/fog to make sure everything is up to date.
+* Rebase your branch against fog/fog to make sure everything is up to date.
 * Commit your changes and send a pull request.
 
 ## Resources
@@ -66,7 +66,7 @@ Enjoy, and let me know what I can do to continue improving fog!
 
 (The MIT License)
 
-Copyright (c) 2010 [geemus (Wesley Beary)](http://github.com/geemus)
+Copyright (c) 2012 [geemus (Wesley Beary)](http://github.com/geemus)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/docs/storage/index.markdown

@@ -35,8 +35,8 @@ First, create a connection with your new account:
     # create a connection
     connection = Fog::Storage.new({
       :provider                 => 'AWS',
-      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY,
-      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID
+      :aws_access_key_id        => YOUR_SECRET_ACCESS_KEY_ID,
+      :aws_secret_access_key    => YOUR_SECRET_ACCESS_KEY
     })
 
     # First, a place to contain the glorious details
@@ -131,8 +131,8 @@ Sign up <a href="http://gs-signup-redirect.appspot.com/">here</a> and get your c
 
     connection = Fog::Storage.new({
       :provider                         => 'Google',
-      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY,
-      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID
+      :google_storage_access_key_id     => YOUR_SECRET_ACCESS_KEY_ID,
+      :google_storage_secret_access_key => YOUR_SECRET_ACCESS_KEY
     })
 
 ## Rackspace CloudFiles

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           = '1.1.2'
-  s.date              = '2011-12-18'
+  s.version           = '1.2.0'
+  s.date              = '2012-03-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -37,9 +37,9 @@ 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.9.0')
+  s.add_dependency('excon', '~>0.12.0')
   s.add_dependency('formatador', '~>0.2.0')
-  s.add_dependency('multi_json', '~>1.0.3')
+  s.add_dependency('multi_json', '~>1.0')
   s.add_dependency('mime-types')
   s.add_dependency('net-scp', '~>1.0.4')
   s.add_dependency('net-ssh', '>=2.1.3')
@@ -52,9 +52,12 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rake')
   s.add_development_dependency('rbvmomi')
   s.add_development_dependency('rdoc')
+  s.add_development_dependency('thor')
   s.add_development_dependency('rspec', '~>1.3.1')
+  s.add_development_dependency('rbovirt', '>=0.0.8')
   s.add_development_dependency('shindo', '~>0.3.4')
   s.add_development_dependency('virtualbox', '~>0.9.1')
+  s.add_development_dependency('fission')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.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 = '1.1.2'
+    VERSION = '1.2.0'
   end
 
 end

data/lib/fog/aws.rb

@@ -6,10 +6,12 @@ module Fog
     extend Fog::Provider
 
     service(:auto_scaling,    'aws/auto_scaling',     'AutoScaling')
+    service(:beanstalk,       'aws/beanstalk',        'ElasticBeanstalk')
     service(:cdn,             'aws/cdn',              'CDN')
     service(:compute,         'aws/compute',          'Compute')
     service(:cloud_formation, 'aws/cloud_formation',  'CloudFormation')
     service(:cloud_watch,     'aws/cloud_watch',      'CloudWatch')
+    service(:dynamodb,        'aws/dynamodb',         'DynamoDB')
     service(:dns,             'aws/dns',              'DNS')
     service(:elasticache,     'aws/elasticache',      'Elasticache')
     service(:elb,             'aws/elb',              'ELB')
@@ -40,7 +42,7 @@ module Fog
       end
       params
     end
-    
+
     def self.serialize_keys(key, value, options = {})
       case value
       when Hash
@@ -130,10 +132,6 @@ module Fog
         "ip-#{ip_address.gsub('.','-')}.ec2.internal"
       end
 
-      def self.etag
-        Fog::Mock.random_hex(32)
-      end
-
       def self.image
         path = []
         (rand(3) + 2).times do
@@ -223,10 +221,38 @@ module Fog
       def self.volume_id
         "vol-#{Fog::Mock.random_hex(8)}"
       end
-      
+
+      def self.security_group_id
+        "sg-#{Fog::Mock.random_hex(8)}"
+      end
+
+      def self.key_id(length=21)
+        #Probably close enough
+        Fog::Mock.random_selection('ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789',length)
+      end
+
       def self.rds_address(db_name,region)
         "#{db_name}.#{Fog::Mock.random_letters(rand(12) + 4)}.#{region}.rds.amazonaws.com"
       end
     end
+
+    def self.parse_security_group_options(group_name, options)
+      if group_name.is_a?(Hash)
+        options = group_name
+      elsif group_name
+        if options.key?('GroupName')
+          raise Fog::Compute::AWS::Error, 'Arguments specified both group_name and GroupName in options'
+        end
+        options = options.clone
+        options['GroupName'] = group_name
+      end
+      if !options.key?('GroupName') && !options.key?('GroupId')
+        raise Fog::Compute::AWS::Error, 'Neither GroupName nor GroupId specified'
+      end
+      if options.key?('GroupName') && options.key?('GroupId')
+        raise Fog::Compute::AWS::Error, 'Both GroupName and GroupId specified'
+      end
+      options
+    end
   end
 end

data/lib/fog/aws/auto_scaling.rb

@@ -77,24 +77,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           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'
-          when 'us-west-2'
-            'autoscaling.us-west-2.amazonaws.com'
-          when 'sa-east-1'
-            'autoscaling.sa-east-1.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "autoscaling.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @port       = options[:port]        || 443
           @persistent = options[:persistent]  || false

data/lib/fog/aws/beanstalk.rb

@@ -0,0 +1,140 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+
+module Fog
+  module AWS
+    class ElasticBeanstalk < Fog::Service
+
+      class InvalidParameterError < Fog::Errors::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+
+      request_path 'fog/aws/requests/beanstalk'
+
+      request :check_dns_availability
+      request :create_application
+      request :create_application_version
+      request :create_configuration_template
+      request :create_environment
+      request :create_storage_location
+      request :delete_application
+      request :delete_application_version
+      request :delete_configuration_template
+      request :delete_environment_configuration
+      request :describe_applications
+      request :describe_application_versions
+      request :describe_configuration_options
+      request :describe_configuration_settings
+      request :describe_environment_resources
+      request :describe_environments
+      request :describe_events
+      request :list_available_solution_stacks
+      request :rebuild_environment
+      request :request_environment_info
+      request :restart_app_server
+      request :retrieve_environment_info
+      request :swap_environment_cnames
+      request :terminate_environment
+      request :update_application
+      request :update_application_version
+      request :update_configuration_template
+      request :update_environment
+      request :validate_configuration_settings
+
+      model_path 'fog/aws/models/beanstalk'
+
+      model       :application
+      collection  :applications
+      model       :environment
+      collection  :environments
+      model       :event
+      collection  :events
+      model       :template
+      collection  :templates
+      model       :version
+      collection  :versions
+
+      class Mock
+
+        def initialize(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          require 'fog/core/parser'
+          require 'multi_json'
+
+          @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)
+
+          @connection_options = options[:connection_options] || {}
+          options[:region] ||= 'us-east-1'
+          @host = options[:host] || "elasticbeanstalk.#{options[:region]}.amazonaws.com"
+          @path       = options[:path]        || '/'
+          @persistent = options[:persistent]  || false
+          @port       = options[:port]        || 443
+          @scheme     = options[:scheme]      || 'https'
+          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+        end
+
+        def reload
+          @connection.reset
+        end
+
+        # Returns an array of available solutions stack details
+        def solution_stacks
+          list_available_solution_stacks.body['ListAvailableSolutionStacksResult']['SolutionStackDetails']
+        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-12-01'
+              }
+          )
+
+          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.response.body.match(/<Code>(.*)<\/Code>[ \t\n]*<Message>(.*)<\/Message>/)
+              raise case match[1].split('.').last
+                      when 'InvalidParameterValue'
+                        Fog::AWS::ElasticBeanstalk::InvalidParameterError.slurp(error, match[2])
+                      else
+                        Fog::AWS::ElasticBeanstalk::Error.slurp(error, "#{match[1]} => #{match[2]}")
+                    end
+            else
+              raise error
+            end
+          end
+
+        end
+      end
+
+
+    end
+  end
+end

data/lib/fog/aws/cloud_formation.rb

@@ -54,24 +54,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-          when 'ap-northeast-1'
-            'cloudformation.ap-northeast-1.amazonaws.com'
-          when 'ap-southeast-1'
-            'cloudformation.ap-southeast-1.amazonaws.com'
-          when 'eu-west-1'
-            'cloudformation.eu-west-1.amazonaws.com'
-          when 'us-east-1'
-            'cloudformation.us-east-1.amazonaws.com'
-          when 'us-west-1'
-            'cloudformation.us-west-1.amazonaws.com'
-          when 'us-west-2'
-            'cloudformation.us-west-2.amazonaws.com'
-          when 'sa-east-1'
-            'cloudformation.sa-east-1.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "cloudformation.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/fog/aws/cloud_watch.rb

@@ -57,7 +57,7 @@ module Fog
         #
         # ==== 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', 'us-west-2', 'ap-southeast-1', 'ap-northeast-1']
+        #   * region<~String> - optional region to use. For instance, 'eu-west-1', 'us-east-1', etc.
         #
         # ==== Returns
         # * CloudWatch object with connection to AWS.
@@ -68,24 +68,7 @@ module Fog
 
           @connection_options = options[:connection_options] || {}
           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'
-          when 'us-west-2'
-            'monitoring.us-west-2.amazonaws.com'
-          when 'sa-east-1'
-            'monitoring.sa-east-1.amazonaws.com'
-          else
-            raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-          end
+          @host = options[:host] || "monitoring.#{options[:region]}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443

data/lib/fog/aws/compute.rb

@@ -29,6 +29,10 @@ module Fog
       collection  :volumes
       model       :spot_request
       collection  :spot_requests
+      model       :subnet
+      collection  :subnets
+      model       :vpc
+      collection  :vpcs
 
       request_path 'fog/aws/requests/compute'
       request :allocate_address
@@ -42,15 +46,19 @@ module Fog
       request :create_security_group
       request :create_snapshot
       request :create_spot_datafeed_subscription
+      request :create_subnet
       request :create_tags
       request :create_volume
+      request :create_vpc
       request :delete_key_pair
       request :delete_security_group
       request :delete_placement_group
       request :delete_snapshot
       request :delete_spot_datafeed_subscription
+      request :delete_subnet
       request :delete_tags
       request :delete_volume
+      request :delete_vpc
       request :deregister_image
       request :describe_addresses
       request :describe_availability_zones
@@ -67,8 +75,11 @@ module Fog
       request :describe_spot_datafeed_subscription
       request :describe_spot_instance_requests
       request :describe_spot_price_history
+      request :describe_subnets
       request :describe_tags
       request :describe_volumes
+      request :describe_volume_status
+      request :describe_vpcs
       request :detach_volume
       request :disassociate_address
       request :get_console_output
@@ -124,6 +135,7 @@ module Fog
                   'default' => {
                     'groupDescription'    => 'default group',
                     'groupName'           => 'default',
+                    'groupId'             => 'sg-11223344',
                     'ipPermissionsEgress' => [],
                     'ipPermissions'       => [
                       {
@@ -248,8 +260,8 @@ module Fog
         #
         # ==== 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', 'us-west-2', 'ap-northeast-1', 'ap-southeast-1']
+        #   * region<~String> - optional region to use. For instance,
+        #     'eu-west-1', 'us-east-1', and etc.
         #   * aws_session_token<~String> - when using Session Tokens or Federated Users, a session_token must be presented
         #
         # ==== Returns
@@ -271,24 +283,7 @@ module Fog
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
-            @host = options[:host] || case options[:region]
-            when 'ap-northeast-1'
-              'ec2.ap-northeast-1.amazonaws.com'
-            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'
-            when 'us-west-2'
-              'ec2.us-west-2.amazonaws.com'
-            when 'sa-east-1'
-              'ec2.sa-east-1.amazonaws.com'
-            else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-            end
+            @host = options[:host] || "ec2.#{options[:region]}.amazonaws.com"
             @path       = options[:path]        || '/'
             @persistent = options[:persistent]  || false
             @port       = options[:port]        || 443
@@ -316,7 +311,7 @@ module Fog
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2011-11-01'
+              :version            => '2012-03-01'
             }
           )