aws-sdk 1.5.7 → 1.5.8

data/lib/aws/emr/job_flow_collection.rb

@@ -0,0 +1,185 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+require 'date'
+require 'time'
+
+module AWS
+  class EMR
+
+    # = Creating a Job Flow
+    #
+    # Call {#create} to run a new job flow.
+    #
+    #   emr = AWS::EMR.new
+    #
+    #   job_flow = emr.job_flows.create('name',
+    #     :instances => {
+    #       :instance_count => 2,
+    #       :master_instance_type => 'm1.small',
+    #       :slave_instance_type => 'm1.small',
+    #     }
+    #   )
+    #
+    # = Getting a Job Flow
+    #
+    # You can get a job flow by its ID.
+    #
+    #   job_flow = emr.job_flows['j-123456678'] # makes no request
+    #   job_flow.exists? #=> true/false
+    #
+    # = Enumerating Job Flows
+    #
+    # You can enumerate all job flows, or filter them.
+    #
+    #   # all job flows
+    #   job_flows.each {|job_flow| ... }
+    #
+    #   # only job flows with a particular state
+    #   job_flows.with_state('ENDED').each {|job_flow| ... }
+    #
+    # The filtering methods include:
+    #
+    # * {#with_id}
+    # * {#with_state}
+    # * {#created_before}
+    # * {#created_after}
+    #
+    class JobFlowCollection
+
+      include Core::Collection::Simple
+
+      # @private
+      def initialize options = {}
+        @filters = options[:filters] || {}
+        super
+      end
+
+      # @param [String] job_flow_id
+      # @return [JobFlow] Returns a {JobFlow} with the given ID.
+      def [] job_flow_id
+        JobFlow.new(job_flow_id, :config => config)
+      end
+
+      # Runs a job flow.
+      #
+      #   job_flow = emr.job_flows.create('name',
+      #     :instances => {
+      #       :instance_count => 2,
+      #       :master_instance_type => 'm1.small',
+      #       :slave_instance_type => 'm1.small',
+      #     }
+      #   )
+      #
+      # See {Client#run_job_flow} for documentation on the complete
+      # list of accepted options.
+      # @param [String] name
+      # @param [Hash] options
+      # @see (Client#run_job_flow)
+      # @return [JobFlow]
+      def create name, options = {}
+
+        options[:name] = name
+        options[:ami_version] ||= 'latest'
+        options[:instances] ||= {}
+
+        resp = client.run_job_flow(options)
+
+        self[resp.data[:job_flow_id]]
+
+      end
+      alias_method :run, :create
+
+      # Returns a new collection that will only enumerate job flows that have
+      # one of the given ids.
+      #
+      #   emr.job_flows.with_id('id1', 'id2', 'id3').each do |job_flow|
+      #     # ...
+      #   end
+      #
+      # @param [String] ids One or more job flow ids to use as a filter.
+      # @return [JobFlowCollection]
+      def with_id *ids
+        filter(:job_flow_ids, ids.flatten)
+      end
+
+      # Returns a new collection that will only enumerate job flows that have
+      # one of the given job flow states.
+      #
+      #   emr.job_flows.with_state('SHUTTING_DOWN', 'TERMINATED').each do |job|
+      #     # ...
+      #   end
+      #
+      # @param [String] states One or more job flow states to use as a filter.
+      # @return [JobFlowCollection]
+      def with_state *states
+        filter(:job_flow_states, states.flatten)
+      end
+
+      # Returns a new collection that will only enumerate job flows that
+      # were created before the given time.
+      #
+      #   # enumerate jobs that are more than an hour old
+      #   emr.job_flows.created_before(Time.now - 3600).each{|job| ... }
+      #
+      # @param [Time,DateTime,Date] time
+      # @return [JobFlowCollection]
+      def created_before time
+        time = time.iso8601 if time.respond_to?(:iso8601)
+        filter(:created_before, time)
+      end
+
+      # Returns a new collection that will only enumerate job flows that
+      # were created after the given time.
+      #
+      #   # enumerate jobs that are at most 1 hour old
+      #   emr.job_flows.created_after(Time.now - 3600).each{|job| ... }
+      #
+      # @param [Time,DateTime,Date] time
+      # @return [JobFlowCollection]
+      def created_after time
+        time = time.iso8601 if time.respond_to?(:iso8601)
+        filter(:created_after, time)
+      end
+
+      # @param [String,Symbol] name
+      # @param [Mixed] value
+      # @return [JobFlowCollection]
+      def filter name, value
+        options = {}
+        options[:filters] = @filters.merge(name.to_s.to_sym => value)
+        options[:config] = config
+        JobFlowCollection.new(options)
+      end
+
+      protected
+
+      def _each_item options = {}, &block
+
+        resp = client.describe_job_flows(@filters.merge(options))
+        resp.data[:job_flows].each do |details|
+
+          job_flow = JobFlow.new_from(
+            :describe_job_flows,
+            details,
+            details[:job_flow_id],
+            :config => config)
+
+          yield(job_flow)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/emr/request.rb

@@ -0,0 +1,23 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class EMR
+
+    # @private
+    class Request < Core::Http::Request
+      include Core::Signature::Version2
+    end
+
+  end
+end

data/lib/aws/iam/access_key.rb

@@ -41,7 +41,7 @@ module AWS
 
       alias_method :access_key_id, :id
 
-      attribute :secret_value, :as => :secret_access_key, :static => true
+      attribute :secret_value, :from => :secret_access_key, :static => true
 
       protected :secret_value
 

data/lib/aws/iam/account_alias_collection.rb

@@ -39,7 +39,7 @@ module AWS
       #
       #   iam.account_aliases.create('myaccountalias')
       #
-      # For information about account alias restrictions and usage, 
+      # For information about account alias restrictions and usage,
       # see http://docs.amazonwebservices.com/IAM/latest/UserGuide/index.html?AccountAlias.html.
       #
       # @param [String] account_alias
@@ -69,7 +69,7 @@ module AWS
       # @private
       protected
       def each_item response, &block
-        response.account_aliases.each do |account_alias|
+        response.data[:account_aliases].each do |account_alias|
           yield(account_alias)
         end
       end

data/lib/aws/iam/client.rb

@@ -18,7 +18,7 @@ module AWS
     class Client < Core::Client
 
       API_VERSION = '2010-05-08'
-      
+
       extend Core::Client::QueryXML
 
       # @private

data/lib/aws/iam/group.rb

@@ -36,9 +36,9 @@ module AWS
         super
       end
 
-      mutable_attribute :name, :static => true, :as => :group_name
+      mutable_attribute :name, :static => true, :from => :group_name
 
-      attribute :id, :static => true, :as => :group_id
+      attribute :id, :static => true, :from => :group_id
 
       attribute :create_date, :static => true
 

data/lib/aws/iam/policy_collection.rb

@@ -179,7 +179,7 @@ module AWS
 
       protected
       def each_item(response, &block)
-        response.policy_names.each(&block)
+        response.data[:policy_names].each(&block)
       end
 
     end

data/lib/aws/iam/server_certificate.rb

@@ -32,11 +32,11 @@ module AWS
 
       # @attr [String] The name that identifies the server
       #   certificate.
-      mutable_attribute :name, :static => true, :as => :server_certificate_name
+      mutable_attribute :name, :static => true, :from => :server_certificate_name
 
       # @attr_reader [String] The stable and unique string identifying
       #   the server certificate.
-      attribute :id, :static => true, :as => :server_certificate_id
+      attribute :id, :static => true, :from => :server_certificate_id
 
       # @attr_reader [Time] The date when the server certificate was
       #   uploaded.

data/lib/aws/iam/signing_certificate.rb

@@ -71,7 +71,7 @@ module AWS
       #   then that user is the implied owner.
       attr_reader :user
 
-      attribute :contents, :as => :certificate_body, :static => true
+      attribute :contents, :from => :certificate_body, :static => true
 
       mutable_attribute :status, :to_sym => true
 

data/lib/aws/iam/user.rb

@@ -80,10 +80,10 @@ module AWS
       end
 
       # @attr [String] The IAM user name.
-      mutable_attribute :name, :static => true, :as => :user_name
+      mutable_attribute :name, :static => true, :from => :user_name
 
       # @attr_reader [String] The user's unique ID.
-      attribute :id, :static => true, :as => :user_id
+      attribute :id, :static => true, :from => :user_id
 
       # @attr_reader [Time] When the user was created.
       attribute :create_date, :static => true

data/lib/aws/iam/virtual_mfa_device.rb

@@ -49,7 +49,7 @@ module AWS
 
       attribute :enable_date, :static => true
 
-      attribute :user_details, :as => :user
+      attribute :user_details, :from => :user
 
       protected :user_details
 

data/lib/aws/s3/client.rb

@@ -67,7 +67,7 @@ module AWS
               header_options.each do |(opt, header)|
                 if value = options[opt]
                   # for backwards compatability we translate canned acls
-                  # header values from symbols to strings (e.g. 
+                  # header values from symbols to strings (e.g.
                   # :public_read translates to 'public-read')
                   value = (opt == :acl ? value.to_s.tr('_', '-') : value)
                   req.headers[header] = value
@@ -82,17 +82,17 @@ module AWS
           if xml_grammar
 
             parser = Core::XML::Parser.new(xml_grammar.rules)
-    
+
             process_response do |resp|
               resp.data = parser.parse(resp.http_response.body)
               super(resp)
             end
-    
+
             simulate_response do |resp|
               resp.data = parser.simulate
               super(resp)
             end
-    
+
           end
 
         end
@@ -116,8 +116,8 @@ module AWS
       # @overload create_bucket(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -140,7 +140,7 @@ module AWS
             xmlns = "http://s3.amazonaws.com/doc/#{API_VERSION}/"
             req.body = <<-XML
               <CreateBucketConfiguration xmlns="#{xmlns}">
-                <LocationConstraint>#{location}</LocationConstraint> 
+                <LocationConstraint>#{location}</LocationConstraint>
               </CreateBucketConfiguration>
             XML
           end
@@ -198,7 +198,7 @@ module AWS
       #   @option options [required,String] :bucket_name
       #   @return [Core::Response]
       bucket_method(:delete_bucket_lifecycle_configuration, :delete) do
-        
+
         configure_request do |req, options|
           req.add_param('lifecycle')
           super(req, options)
@@ -286,7 +286,7 @@ module AWS
 
       end
 
-      # Gets the bucket's location constraint.  
+      # Gets the bucket's location constraint.
       # @overload get_bucket_location(options = {})
       #   @param [Hash] options
       #   @option options [required,String] :bucket_name
@@ -341,12 +341,12 @@ module AWS
       #
       # @example Using a canned acl
       #   s3_client.put_bucket_acl(
-      #     :bucket_name => 'bucket-name', 
+      #     :bucket_name => 'bucket-name',
       #     :acl => 'public-read')
       #
       # @example Using grants
       #   s3_client.put_bucket_acl(
-      #     :bucket_name => 'bucket-name', 
+      #     :bucket_name => 'bucket-name',
       #     :grant_read => 'uri="http://acs.amazonaws.com/groups/global/AllUsers"',
       #     :grant_full_control => 'emailAddress="xyz@amazon.com", id="8a9...fa7"')
       #
@@ -385,8 +385,8 @@ module AWS
       #   @option options [String] :access_control_policy An access control
       #     policy description as a string of XML.  See the S3 API
       #     documentation for a description.
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -404,10 +404,10 @@ module AWS
       }) do
 
         configure_request do |req, options|
-          move_access_control_policy(options) 
+          move_access_control_policy(options)
           require_acl!(options)
           super(req, options)
-          req.body = options[:access_control_policy] if 
+          req.body = options[:access_control_policy] if
              options[:access_control_policy]
         end
 
@@ -430,7 +430,7 @@ module AWS
       #
       # @example Using a canned acl
       #   s3_client.put_object_acl(
-      #     :bucket_name => 'bucket-name', 
+      #     :bucket_name => 'bucket-name',
       #     :key => 'object-key',
       #     :acl => 'public-read')
       #
@@ -478,8 +478,8 @@ module AWS
       #   @option options [String] :access_control_policy An access control
       #     policy description as a string of XML.  See the S3 API
       #     documentation for a description.
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -497,10 +497,10 @@ module AWS
       }) do
 
         configure_request do |req, options|
-          move_access_control_policy(options) 
+          move_access_control_policy(options)
           require_acl!(options)
           super(req, options)
-          req.body = options[:access_control_policy] if 
+          req.body = options[:access_control_policy] if
              options[:access_control_policy]
         end
 
@@ -519,7 +519,7 @@ module AWS
       #
       #   s3_client.put_object({
       #     :bucket_name => 'bucket-name',
-      #     :key => 'readme.txt', 
+      #     :key => 'readme.txt',
       #     :data => 'This is the readme for ...',
       #   })
       #
@@ -529,12 +529,12 @@ module AWS
       # accepts data chunks.  For example:
       #
       #   s3_client.put_object(
-      #     :bucket_name => 'mybucket', 
+      #     :bucket_name => 'mybucket',
       #     :key => 'some/key'
       #     :content_length => File.size('myfile')
       #   ) do |buffer|
       #
-      #     File.open('myfile') do |io| 
+      #     File.open('myfile') do |io|
       #       buffer.write(io.read(length)) until io.eof?
       #     end
       #
@@ -556,15 +556,15 @@ module AWS
       #   @option options [required,String] :key
       #   @option options [required,String,Pathname,File,IO] :data
       #     The data to upload.  This can be provided as a string,
-      #     a Pathname object, or any object that responds to 
+      #     a Pathname object, or any object that responds to
       #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
       #   @option options [Integer] :content_length
-      #     Required if you are using block form to write data or if it is 
-      #     not possible to determine the size of +:data+.  A best effort 
-      #     is made to determine the content length of strings, files, 
+      #     Required if you are using block form to write data or if it is
+      #     not possible to determine the size of +:data+.  A best effort
+      #     is made to determine the content length of strings, files,
       #     tempfiles, io objects, and any object that responds
       #     to +#length+ or +#size+.
-      #   @option options [Hash] :metadata 
+      #   @option options [Hash] :metadata
       #     A hash of metadata to be included with the
       #     object.  These will be sent to S3 as headers prefixed with
       #     +x-amz-meta+.
@@ -573,9 +573,9 @@ module AWS
       #     * +:private+
       #     * +:public_read+
       #     * ...
-      #   @option options [Symbol] :storage_class+ (:standard) 
-      #     Controls whether Reduced Redundancy Storage is enabled for 
-      #     the object.  Valid values are +:standard+ and 
+      #   @option options [Symbol] :storage_class+ (:standard)
+      #     Controls whether Reduced Redundancy Storage is enabled for
+      #     the object.  Valid values are +:standard+ and
       #     +:reduced_redundancy+.
       #   @option options [String] :cache_control
       #     Can be used to specify caching behavior.
@@ -588,8 +588,8 @@ module AWS
       #   @option options [String] :content_type
       #     Specifies the content type.
       #   @option options [String] :expires
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -627,7 +627,7 @@ module AWS
 
         process_response do |response|
 
-          response.data[:version_id] = 
+          response.data[:version_id] =
             response.http_response.header('x-amz-version-id')
 
           response.data[:etag] = response.http_response.header('ETag')
@@ -661,13 +661,13 @@ module AWS
       #     that is true if the object was not modified after the
       #     given time.  If +:unmodified+ returns false, the +:data+
       #     value will be +nil+.
-      #   @option options [String] :if_match If specified, the response 
+      #   @option options [String] :if_match If specified, the response
       #     will contain an additional +:matches+ value that is true
       #     if the object ETag matches the value for this option.  If
       #     +:matches+ is false, the +:data+ value of the
       #     response will be +nil+.
-      #   @option options [String] :if_none_match If specified, the 
-      #     response will contain an additional +:matches+ value that 
+      #   @option options [String] :if_none_match If specified, the
+      #     response will contain an additional +:matches+ value that
       #     is true if and only if the object ETag matches the value for
       #     this option.  If +:matches+ is true, the +:data+ value
       #     of the response will be +nil+.
@@ -765,7 +765,7 @@ module AWS
             resp.data[:last_modified] = Time.parse(time)
           end
 
-          resp.data[:content_length] = 
+          resp.data[:content_length] =
             resp.http_response.header('content-length').to_i
 
           add_sse_to_response(resp)
@@ -829,8 +829,8 @@ module AWS
       #   @option options [String] :storage_class
       #   @option options [String] :server_side_encryption
       #   @option options [String] :expires
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -935,7 +935,7 @@ module AWS
       #   @option options [required,String] :key
       #   @option options [required,String,Pathname,File,IO] :data
       #     The data to upload.  This can be provided as a string,
-      #     a Pathname object, or any object that responds to 
+      #     a Pathname object, or any object that responds to
       #     +#read+ and +#eof?+ (e.g. IO, File, Tempfile, StringIO, etc).
       #   @option options [required,String] :upload_id
       #   @option options [required,Integer] :part_number
@@ -994,7 +994,7 @@ module AWS
 
         process_response do |response|
           add_sse_to_response(response)
-          response.data[:version_id] = 
+          response.data[:version_id] =
             response.http_response.header('x-amz-version-id')
         end
 
@@ -1048,8 +1048,8 @@ module AWS
       #     bucket name and key, joined by a forward slash ('/').
       #     This string must be URL-encoded. Additionally, you must
       #     have read access to the source object.
-      #   @option options [String] :acl A canned ACL (e.g. 'private', 
-      #     'public-read', etc).  See the S3 API documentation for 
+      #   @option options [String] :acl A canned ACL (e.g. 'private',
+      #     'public-read', etc).  See the S3 API documentation for
       #     a complete list of valid values.
       #   @option options [String] :grant_read
       #   @option options [String] :grant_write
@@ -1092,7 +1092,7 @@ module AWS
         end
 
         process_response do |response|
-          response.data[:version_id] = 
+          response.data[:version_id] =
             response.http_response.header('x-amz-version-id')
           response.data[:etag] = response.http_response.header('ETag')
           if time = response.http_response.header('Last-Modified')
@@ -1106,7 +1106,7 @@ module AWS
       protected
 
       def extract_error_details response
-        if 
+        if
           (response.http_response.status >= 300 ||
             response.request_type == :complete_multipart_upload) and
           body = response.http_response.body and
@@ -1134,7 +1134,7 @@ module AWS
         super or
           response.request_type == :complete_multipart_upload &&
           extract_error_details(response)
-          # complete multipart upload can return an error inside a 
+          # complete multipart upload can return an error inside a
           # 200 level response -- this forces us to parse the
           # response for errors every time
       end
@@ -1145,7 +1145,9 @@ module AWS
       end
 
       def new_request
-        S3::Request.new
+        req = S3::Request.new
+        req.force_path_style = config.s3_force_path_style?
+        req
       end
 
       def add_sse_to_response response
@@ -1169,7 +1171,7 @@ module AWS
       end
 
       # @param [String] possible_xml
-      # @return [Boolean] Returns +true+ if the given string is a valid xml 
+      # @return [Boolean] Returns +true+ if the given string is a valid xml
       #   document.
       def is_xml? possible_xml
         begin
@@ -1196,9 +1198,9 @@ module AWS
         # name in the url path, like:
         #
         #   http://s3.amazonaws.com/dns_incompat_bucket_name/
-        #   
+        #
         # @return [Boolean] Returns true if the given bucket name may be
-        #   is dns compatible.  
+        #   is dns compatible.
         #   this bucket n
         #
         def dns_compatible_bucket_name?(bucket_name)
@@ -1226,17 +1228,17 @@ module AWS
 
         # Returns true if the bucket name must be used in the request
         # path instead of as a sub-domain when making requests against
-        # S3.  
+        # S3.
         #
-        # This can be an issue if the bucket name is DNS compatible but 
+        # This can be an issue if the bucket name is DNS compatible but
         # contains '.' (periods).  These cause the SSL certificate to
         # become invalid when making authenticated requets over SSL to the
         # bucket name.  The solution is to send this as a path argument
         # instead.
-        # 
+        #
         # @return [Boolean] Returns true if the bucket name should be used
         #   as a path segement instead of dns prefix when making requests
-        #   against s3.  
+        #   against s3.
         #
         def path_style_bucket_name? bucket_name
           if dns_compatible_bucket_name?(bucket_name)