fog 1.0.0 → 1.5.0

data/docs/storage/index.markdown

@@ -5,13 +5,13 @@ title:  Storage
 
 Having Ruby experience makes you hirable; but how can you stand out? You need to demonstrate your abilities. What better way than using Ruby and "the cloud" to store and serve your resume!
 
-In this blog post you will learn to use <a href="http://github.com/geemus/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
+In this blog post you will learn to use <a href="http://github.com/fog/fog">fog</a> - the cloud computing library - to upload your resume to Amazon's <a href="http://aws.amazon.com/s3/">Simple Storage Service</a> (S3), Rackspace's <a href="http://www.rackspacecloud.com/cloud_hosting_products/files">CloudFiles</a> or Google's <a href="http://code.google.com/apis/storage/">Storage for Developers</a>.
 
 Here's my out of date resume stored on <a href="http://geemus.s3.amazonaws.com/resume.html">S3</a>, <a href="http://c0023559.cdn2.cloudfiles.rackspacecloud.com/resume.html">CloudFiles</a> and <a href="https://geemus.commondatastorage.googleapis.com/resume.html">Google Storage</a>; programmatically stored in the cloud using this tutorial. NOTE: my boss would like me to add that I'm not currently looking for a new gig ;)
 
 Check out those cloud-specific URLs! You could put all three in your job application, add the Ruby source for how you did it, and have your choice of Ruby jobs for being so awesome!
 
-How? The all-clouds-in-one library of choice is <a href="https://github.com/geemus/fog">fog</a>.
+How? The all-clouds-in-one library of choice is <a href="https://github.com/fog/fog">fog</a>.
 
 ## Installing fog
 
@@ -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_AWS_ACCESS_KEY_ID,
+      :aws_secret_access_key    => YOUR_AWS_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,10 +6,11 @@ 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.0.0'
-  s.date              = '2011-09-29'
+  s.version           = '1.5.0'
+  s.date              = '2012-07-28'
   s.rubyforge_project = 'fog'
 
+
   ## Make sure your summary is short. The description may be as long
   ## as you like.
   s.summary     = "brings clouds to you"
@@ -20,29 +21,33 @@ Gem::Specification.new do |s|
   ## a custom homepage, consider using your GitHub URL or the like.
   s.authors  = ["geemus (Wesley Beary)"]
   s.email    = 'geemus@gmail.com'
-  s.homepage = 'http://github.com/geemus/fog'
+  s.homepage = 'http://github.com/fog/fog'
 
   ## This sections is only necessary if you have C extensions.
   # s.require_paths << 'ext'
   # s.extensions = %w[ext/extconf.rb]
 
+  ## This gets added to the $LOAD_PATH so that 'lib/NAME.rb' can be required as
+  ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
+  s.require_paths = %w[lib]
+
   ## If your gem includes any executables, list them here.
   s.executables = ["fog"]
 
   ## Specify any RDoc options here. You'll want to add your README and
   ## LICENSE files to the extra_rdoc_files list.
   s.rdoc_options = ["--charset=UTF-8"]
-  s.extra_rdoc_files = %w[README.rdoc]
+  s.extra_rdoc_files = %w[README.md]
 
   ## 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.7.3')
+  s.add_dependency('excon', '~>0.14')
   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.4')
+  s.add_dependency('net-ssh', '>=2.1.3')
   s.add_dependency('nokogiri', '~>1.5.0')
   s.add_dependency('ruby-hmac')
 
@@ -50,10 +55,15 @@ Gem::Specification.new do |s|
   ## those that are only needed during development
   s.add_development_dependency('jekyll')
   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.11')
   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('pry')
 #  s.add_development_dependency('ruby-libvirt','~>0.4.0')
 
   s.files = `git ls-files`.split("\n")

data/lib/fog/aws/auto_scaling.rb

@@ -1,15 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class AutoScaling < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       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
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/auto_scaling'
       request :create_auto_scaling_group
@@ -32,6 +33,7 @@ module Fog
       request :execute_policy
       request :put_scaling_policy
       request :put_scheduled_update_group_action
+      request :put_notification_configuration
       request :resume_processes
       request :set_desired_capacity
       request :set_instance_health
@@ -48,9 +50,11 @@ module Fog
       collection :groups
       model      :instance
       collection :instances
+      model      :policy
+      collection :policies
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to AutoScaling
         #
         # ==== Notes
@@ -71,26 +75,12 @@ module Fog
         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)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           @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'
-          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
@@ -105,6 +95,8 @@ module Fog
         private
 
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -112,11 +104,12 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-08-01'
+              :version            => '2011-01-01'
             }
           )
 
@@ -151,13 +144,21 @@ module Fog
           response
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        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 => [
@@ -166,6 +167,7 @@ module Fog
                   'PercentChangeInCapacity'
                 ],
                 :auto_scaling_groups => {},
+                :scaling_policies => {},
                 :health_states => ['Healthy', 'Unhealthy'],
                 :launch_configurations => {},
                 :metric_collection_types => {
@@ -199,17 +201,20 @@ module Fog
         end
 
         def initialize(options={})
-
-          @aws_access_key_id = options[:aws_access_key_id]
-
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'us-east-1', 'us-west-1'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
 
         end
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+        end
+
         def data
           self.class.data[@region][@aws_access_key_id]
         end

data/lib/fog/aws/beanstalk.rb

@@ -0,0 +1,152 @@
+require 'fog/aws'
+
+module Fog
+  module AWS
+    class ElasticBeanstalk < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
+      
+      class InvalidParameterError < Fog::Errors::Error; end
+
+      requires :aws_access_key_id, :aws_secret_access_key
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+
+      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
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
+        def initialize(options={})
+          require 'fog/core/parser'
+
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
+
+          @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 setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
+        def request(params)
+          refresh_credentials_if_expired
+
+          idempotent  = params.delete(:idempotent)
+          parser      = params.delete(:parser)
+
+          body = AWS.signed_params(
+              params,
+              {
+                  :aws_access_key_id  => @aws_access_key_id,
+                  :aws_session_token  => @aws_session_token,
+                  :hmac               => @hmac,
+                  :host               => @host,
+                  :path               => @path,
+                  :port               => @port,
+                  :version            => '2010-12-01'
+              }
+          )
+
+          begin
+            @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/cdn.rb

@@ -1,12 +1,13 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 require 'fog/cdn'
 
 module Fog
   module CDN
     class AWS < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :version, :persistent
+      recognizes :host, :path, :port, :scheme, :version, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       model_path 'fog/aws/cdn/models'
 
@@ -42,7 +43,8 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
-          @aws_access_key_id  = options[:aws_access_key_id]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @region             = options[:region]
         end
 
@@ -58,10 +60,13 @@ module Fog
           "foo"
         end
 
+        def setup_credentials(options={})
+          @aws_access_key_id  = options[:aws_access_key_id]
+        end
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to Cloudfront
         #
         # ==== Notes
@@ -82,13 +87,12 @@ module Fog
         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]
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
           @connection_options = options[:connection_options] || {}
-          @hmac       = Fog::HMAC.new('sha1', @aws_secret_access_key)
           @host       = options[:host]      || 'cloudfront.amazonaws.com'
           @path       = options[:path]      || '/'
-          @persistent = options[:persistent] || true
+          @persistent = options.fetch(:persistent, true)
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
           @version    = options[:version]  || '2010-11-01'
@@ -101,9 +105,21 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id     = options[:aws_access_key_id]
+          @aws_secret_access_key = options[:aws_secret_access_key]
+          @aws_session_token     = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha1', @aws_secret_access_key)
+        end
+
         def request(params, &block)
+          refresh_credentials_if_expired
+
           params[:headers] ||= {}
           params[:headers]['Date'] = Fog::Time.now.to_date_header
+          params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
           params[:path] = "/#{@version}/#{params[:path]}" 
           @connection.request(params, &block)
@@ -112,7 +128,7 @@ module Fog
         def signature(params)
           string_to_sign = params[:headers]['Date']
           signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
+          Base64.encode64(signed_string).chomp!
         end
       end
     end

data/lib/fog/aws/cloud_formation.rb

@@ -1,14 +1,16 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'aws'))
+require 'fog/aws'
 
 module Fog
   module AWS
     class CloudFormation < Fog::Service
+      extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :host, :path, :port, :scheme, :persistent, :region
+      recognizes :host, :path, :port, :scheme, :persistent, :region, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
 
       request_path 'fog/aws/requests/cloud_formation'
       request :create_stack
+      request :update_stack
       request :delete_stack
       request :describe_stack_events
       request :describe_stack_resources
@@ -25,7 +27,7 @@ module Fog
       end
 
       class Real
-
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
         # Initialize connection to CloudFormation
         #
         # ==== Notes
@@ -45,28 +47,13 @@ module Fog
         # * CloudFormation object with connection to AWS.
         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)
+          @use_iam_profile = options[:use_iam_profile]
+          setup_credentials(options)
 
           @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'
-          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
@@ -80,7 +67,18 @@ module Fog
 
         private
 
+        def setup_credentials(options)
+          @aws_access_key_id      = options[:aws_access_key_id]
+          @aws_secret_access_key  = options[:aws_secret_access_key]
+          @aws_session_token      = options[:aws_session_token]
+          @aws_credentials_expire_at = options[:aws_credentials_expire_at]
+
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
+        end
+
         def request(params)
+          refresh_credentials_if_expired
+
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
@@ -88,6 +86,7 @@ module Fog
             params,
             {
               :aws_access_key_id  => @aws_access_key_id,
+              :aws_session_token  => @aws_session_token,
               :hmac               => @hmac,
               :host               => @host,
               :path               => @path,