brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -44,7 +44,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
 
-          load_balancer['Instances'] = instances.dup
+          load_balancer['Instances'] = load_balancer['Instances'] | instances.dup
 
           response.body = {
             'ResponseMetadata' => {

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/add_instance_groups.rb

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/add_instance_groups'
+
+        # adds an instance group to a running cluster
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_AddInstanceGroups.html
+        # ==== Parameters
+        # * JobFlowId <~String> - Job flow in which to add the instance groups
+        # * InstanceGroups<~Array> - Instance Groups to add
+        #   * 'BidPrice'<~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #   * 'InstanceCount'<~Integer> - Target number of instances for the instance group
+        #   * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #   * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #   * 'MarketType'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster node
+        #   * 'Name'<~String> - Friendly name given to the instance group.
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_instance_groups(job_flow_id, options={})
+          
+          if instance_groups = options.delete('InstanceGroups')
+            options.merge!(Fog::AWS.indexed_param('InstanceGroups.member.%d', [*instance_groups]))
+          end
+    
+          request({
+            'Action'  => 'AddInstanceGroups',
+            'JobFlowId' => job_flow_id,
+            :parser   => Fog::Parsers::AWS::EMR::AddInstanceGroups.new,
+          }.merge(options))
+        end
+
+      end
+
+      class Mock
+        def add_instance_groups(job_flow_id, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/add_job_flow_steps.rb

@@ -0,0 +1,49 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/add_job_flow_steps'
+
+        # adds new steps to a running job flow.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_AddJobFlowSteps.html
+        # ==== Parameters
+        # * JobFlowId <~String> - A string that uniquely identifies the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #   * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #     * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #     * 'Jar'<~String> - A path to a JAR file run during the step.
+        #     * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #     * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #       * 'Key'<~String> - The unique identifier of a key value pair
+        #       * 'Value'<~String> - The value part of the identified key
+        #   * 'Name'<~String> - The name of the job flow step
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_job_flow_steps(job_flow_id, options={})
+          
+          if steps = options.delete('Steps')
+            options.merge!(Fog::AWS.serialize_keys('Steps', steps))
+          end
+    
+          request({
+            'Action'  => 'AddJobFlowSteps',
+            'JobFlowId' => job_flow_id,
+            :parser   => Fog::Parsers::AWS::EMR::AddJobFlowSteps.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def add_job_flow_steps(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/describe_job_flows.rb

@@ -0,0 +1,108 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/describe_job_flows'
+
+        # returns a list of job flows that match all of the supplied parameters.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_DescribeJobFlows.html
+        # ==== Parameters
+        # * CreatedAfter <~DateTime> - Return only job flows created after this date and time
+        # * CreatedBefore <~DateTime> - Return only job flows created before this date and time
+        # * JobFlowIds <~String list> - Return only job flows whose job flow ID is contained in this list
+        # * JobFlowStates <~String list> - RUNNING | WAITING | SHUTTING_DOWN | STARTING Return only job flows whose state is contained in this list
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        # * JobFlows <~Array> - A list of job flows matching the parameters supplied.
+        #   * AmiVersion <~String> - A list of bootstrap actions that will be run before Hadoop is started on the cluster nodes.
+        #   * 'BootstrapActions'<~Array> - A list of the bootstrap actions run by the job flow
+        #     * 'BootstrapConfig <~Array> - A description of the bootstrap action
+        #       * 'Name' <~String> - The name of the bootstrap action
+        #       * 'ScriptBootstrapAction' <~Array> - The script run by the bootstrap action.
+        #         * 'Args' <~String list> - A list of command line arguments to pass to the bootstrap action script.
+        #         * 'Path' <~String> - Location of the script to run during a bootstrap action.
+        #   * 'ExecutionStatusDetail'<~Array> - Describes the execution status of the job flow
+        #     * 'CreationDateTime <~DateTime> - The creation date and time of the job flow.
+        #     * 'EndDateTime <~DateTime> - The completion date and time of the job flow.
+        #     * 'LastStateChangeReason <~String> - Description of the job flow last changed state.
+        #     * 'ReadyDateTime <~DateTime> - The date and time when the job flow was ready to start running bootstrap actions.
+        #     * 'StartDateTime <~DateTime> - The start date and time of the job flow.
+        #     * 'State <~DateTime> - COMPLETED | FAILED | TERMINATED | RUNNING | SHUTTING_DOWN | STARTING | WAITING | BOOTSTRAPPING The state of the job flow.
+        #   * Instances <~Array> - A specification of the number and type of Amazon EC2 instances on which to run the job flow.
+        #     * 'Ec2KeyName'<~String> - Specifies the name of the Amazon EC2 key pair that can be used to ssh to the master node as the user called "hadoop.
+        #     * 'HadoopVersion'<~String> - "0.18" | "0.20" Specifies the Hadoop version for the job flow
+        #     * 'InstanceCount'<~Integer> - The number of Amazon EC2 instances used to execute the job flow
+        #     * 'InstanceGroups'<~Array> - Configuration for the job flow's instance groups
+        #       * 'BidPrice' <~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #       * 'CreationDateTime' <~DateTime> - The date/time the instance group was created.
+        #       * 'EndDateTime' <~DateTime> - The date/time the instance group was terminated.
+        #       * 'InstanceGroupId' <~String> - Unique identifier for the instance group.
+        #       * 'InstanceRequestCount'<~Integer> - Target number of instances for the instance group
+        #       * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #       * 'InstanceRunningCount'<~Integer> - Actual count of running instances
+        #       * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #       * 'LastStateChangeReason'<~String> - Details regarding the state of the instance group
+        #       * 'Market'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster
+        #       * 'Name'<~String> - Friendly name for the instance group
+        #       * 'ReadyDateTime'<~DateTime> - The date/time the instance group was available to the cluster
+        #       * 'StartDateTime'<~DateTime> - The date/time the instance group was started
+        #       * 'State'<~String> - PROVISIONING | STARTING | BOOTSTRAPPING | RUNNING | RESIZING | ARRESTED | SHUTTING_DOWN | TERMINATED | FAILED | ENDED State of instance group
+        #   * 'KeepJobFlowAliveWhenNoSteps' <~Boolean> - Specifies whether the job flow should terminate after completing all steps
+        #   * 'MasterInstanceId'<~String> - The Amazon EC2 instance identifier of the master node
+        #   * 'MasterInstanceType'<~String> - The EC2 instance type of the master node
+        #   * 'MasterPublicDnsName'<~String> - The DNS name of the master node
+        #   * 'NormalizedInstanceHours'<~Integer> - An approximation of the cost of the job flow, represented in m1.small/hours.
+        #   * 'Placement'<~Array> - Specifies the Availability Zone the job flow will run in
+        #     * 'AvailabilityZone' <~String> - The Amazon EC2 Availability Zone for the job flow.
+        #   * 'SlaveInstanceType'<~String> - The EC2 instance type of the slave nodes
+        #   * 'TerminationProtected'<~Boolean> - Specifies whether to lock the job flow to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job flow error
+        # * LogUri <~String> - Specifies the location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created
+        # * Name <~String> - The name of the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ExecutionStatusDetail'<~Array> - Describes the execution status of the job flow
+        #     * 'CreationDateTime <~DateTime> - The creation date and time of the job flow.
+        #     * 'EndDateTime <~DateTime> - The completion date and time of the job flow.
+        #     * 'LastStateChangeReason <~String> - Description of the job flow last changed state.
+        #     * 'ReadyDateTime <~DateTime> - The date and time when the job flow was ready to start running bootstrap actions.
+        #     * 'StartDateTime <~DateTime> - The start date and time of the job flow.
+        #     * 'State <~DateTime> - COMPLETED | FAILED | TERMINATED | RUNNING | SHUTTING_DOWN | STARTING | WAITING | BOOTSTRAPPING The state of the job flow.
+        #   * StepConfig <~Array> - The step configuration
+        #     * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #     * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #       * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #       * 'Jar'<~String> - A path to a JAR file run during the step.
+        #       * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #       * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #         * 'Key'<~String> - The unique identifier of a key value pair
+        #         * 'Value'<~String> - The value part of the identified key
+        #     * 'Name'<~String> - The name of the job flow step
+        def describe_job_flows(options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          
+          if job_states = options.delete('JobFlowStates')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowStates', job_states))
+          end
+    
+          request({
+            'Action'  => 'DescribeJobFlows',
+            :parser   => Fog::Parsers::AWS::EMR::DescribeJobFlows.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def describe_job_flows(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/modify_instance_groups.rb

@@ -0,0 +1,40 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/modify_instance_groups'
+
+        # modifies the number of nodes and configuration settings of an instance group..
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_ModifyInstanceGroups.html
+        # ==== Parameters
+        # * InstanceGroups <~InstanceGroupModifyConfig list> - Instance groups to change
+        #   * InstanceCount <~Integer> - Target size for instance group
+        #   * InstanceGroupId <~String> - Unique ID of the instance group to expand or shrink
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def modify_instance_groups(options={})
+          
+          if job_ids = options.delete('InstanceGroups')
+            options.merge!(Fog::AWS.serialize_keys('InstanceGroups', job_ids))
+          end
+    
+          request({
+            'Action'  => 'ModifyInstanceGroups',
+            :parser   => Fog::Parsers::AWS::EMR::ModifyInstanceGroups.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def modify_instance_groups(options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/run_job_flow.rb

@@ -0,0 +1,106 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/run_job_flow'
+
+        # creates and starts running a new job flow
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_RunJobFlow.html
+        # ==== Parameters
+        # * AdditionalInfo <~String> - A JSON string for selecting additional features.
+        # * BootstrapActions <~Array> - A list of bootstrap actions that will be run before Hadoop is started on the cluster nodes.
+        #   * 'Name'<~String> - The name of the bootstrap action
+        #   * 'ScriptBootstrapAction'<~Array> - The script run by the bootstrap action
+        #     * 'Args' <~Array> - A list of command line arguments to pass to the bootstrap action script
+        #     * 'Path' <~String> - Location of the script to run during a bootstrap action. Can be either a location in Amazon S3 or on a local file system.
+        # * Instances <~Array> - A specification of the number and type of Amazon EC2 instances on which to run the job flow.
+        #   * 'Ec2KeyName'<~String> - Specifies the name of the Amazon EC2 key pair that can be used to ssh to the master node as the user called "hadoop.
+        #   * 'HadoopVersion'<~String> - "0.18" | "0.20" Specifies the Hadoop version for the job flow
+        #   * 'InstanceCount'<~Integer> - The number of Amazon EC2 instances used to execute the job flow
+        #   * 'InstanceGroups'<~Array> - Configuration for the job flow's instance groups
+        #     * 'BidPrice' <~String> - Bid price for each Amazon EC2 instance in the instance group when launching nodes as Spot Instances, expressed in USD.
+        #     * 'InstanceCount'<~Integer> - Target number of instances for the instance group
+        #     * 'InstanceRole'<~String> - MASTER | CORE | TASK The role of the instance group in the cluster
+        #     * 'InstanceType'<~String> - The Amazon EC2 instance type for all instances in the instance group
+        #     * 'MarketType'<~String> - ON_DEMAND | SPOT Market type of the Amazon EC2 instances used to create a cluster node
+        #     * 'Name'<~String> - Friendly name given to the instance group.
+        #   * 'KeepJobFlowAliveWhenNoSteps' <~Boolean> - Specifies whether the job flow should terminate after completing all steps
+        #   * 'MasterInstanceType'<~String> - The EC2 instance type of the master node
+        #   * 'Placement'<~Array> - Specifies the Availability Zone the job flow will run in
+        #     * 'AvailabilityZone' <~String> - The Amazon EC2 Availability Zone for the job flow.
+        #   * 'SlaveInstanceType'<~String> - The EC2 instance type of the slave nodes
+        #   * 'TerminationProtected'<~Boolean> - Specifies whether to lock the job flow to prevent the Amazon EC2 instances from being terminated by API call, user intervention, or in the event of a job flow error
+        # * LogUri <~String> - Specifies the location in Amazon S3 to write the log files of the job flow. If a value is not provided, logs are not created
+        # * Name <~String> - The name of the job flow
+        # * Steps <~Array> - A list of steps to be executed by the job flow
+        #   * 'ActionOnFailure'<~String> - TERMINATE_JOB_FLOW | CANCEL_AND_WAIT | CONTINUE Specifies the action to take if the job flow step fails
+        #   * 'HadoopJarStep'<~Array> - Specifies the JAR file used for the job flow step
+        #     * 'Args'<~String list> - A list of command line arguments passed to the JAR file's main function when executed.
+        #     * 'Jar'<~String> - A path to a JAR file run during the step.
+        #     * 'MainClass'<~String> - The name of the main class in the specified Java file. If not specified, the JAR file should specify a Main-Class in its manifest file
+        #     * 'Properties'<~Array> - A list of Java properties that are set when the step runs. You can use these properties to pass key value pairs to your main function
+        #       * 'Key'<~String> - The unique identifier of a key value pair
+        #       * 'Value'<~String> - The value part of the identified key
+        #   * 'Name'<~String> - The name of the job flow step
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def run_job_flow(name, options={})
+          
+          if bootstrap_actions = options.delete('BootstrapActions')
+            options.merge!(Fog::AWS.serialize_keys('BootstrapActions', bootstrap_actions))
+          end
+          
+          if instances = options.delete('Instances')
+            options.merge!(Fog::AWS.serialize_keys('Instances', instances))
+          end
+          
+          if steps = options.delete('Steps')
+            options.merge!(Fog::AWS.serialize_keys('Steps', steps))
+          end
+    
+          request({
+            'Action'  => 'RunJobFlow',
+            'Name' => name,
+            :parser   => Fog::Parsers::AWS::EMR::RunJobFlow.new,
+          }.merge(options))
+        end
+        
+        def run_hive(name, options={})
+          steps = []
+          steps << {
+            'Name' => 'Setup Hive',
+            'HadoopJarStep' => {
+              'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',
+              'Args' => ['s3://us-east-1.elasticmapreduce/libs/hive/hive-script', '--base-path', 's3://us-east-1.elasticmapreduce/libs/hive/', '--install-hive']},
+            'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
+          }
+          steps << {
+            'Name' => 'Install Hive Site Configuration',
+            'HadoopJarStep' => {
+              'Jar' => 's3://us-east-1.elasticmapreduce/libs/script-runner/script-runner.jar',
+              'Args' => ['s3://us-east-1.elasticmapreduce/libs/hive/hive-script', '--base-path',  's3://us-east-1.elasticmapreduce/libs/hive/', '--install-hive-site', '--hive-site=s3://raybeam.okl/prod/hive/hive-site.xml']},
+            'ActionOnFailure' => 'TERMINATE_JOB_FLOW'
+          }
+          options['Steps'] = steps
+          
+          if not options['Instances'].nil?
+            options['Instances']['KeepJobFlowAliveWhenNoSteps'] = true
+          end
+          
+          run_job_flow name, options
+        end
+      end
+
+      class Mock
+
+        def run_job_flow(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/set_termination_protection.rb

@@ -0,0 +1,39 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/set_termination_protection'
+
+        # locks a job flow so the Amazon EC2 instances in the cluster cannot be terminated by user intervention.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_SetTerminationProtection.html
+        # ==== Parameters
+        # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
+        # * TerminationProtected <~Boolean> - indicates whether to protect the job flow
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def set_termination_protection(is_protected, options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          request({
+            'Action'  => 'SetTerminationProtection',
+            'TerminationProtected' => is_protected,
+            :parser   => Fog::Parsers::AWS::EMR::SetTerminationProtection.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def set_termination_protection(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/emr/terminate_job_flows.rb

@@ -0,0 +1,37 @@
+module Fog
+  module AWS
+    class EMR
+      class Real
+
+        require 'fog/aws/parsers/emr/terminate_job_flows'
+
+        # shuts a list of job flows down.
+        # http://docs.amazonwebservices.com/ElasticMapReduce/latest/API/API_TerminateJobFlows.html
+        # ==== Parameters
+        # * JobFlowIds <~String list> - list of strings that uniquely identify the job flows to protect
+        # 
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>
+        def terminate_job_flows(options={})
+          
+          if job_ids = options.delete('JobFlowIds')
+            options.merge!(Fog::AWS.serialize_keys('JobFlowIds', job_ids))
+          end
+          request({
+            'Action'  => 'TerminateJobFlows',
+            :parser   => Fog::Parsers::AWS::EMR::TerminateJobFlows.new,
+          }.merge(options))
+        end
+      end
+
+      class Mock
+
+        def terminate_job_flows(db_name, options={})
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -29,7 +29,7 @@ module Fog
         #     * 'RequestId'
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'AttributeName' => options}
           end
           options['AttributeName'] ||= []
@@ -49,7 +49,7 @@ module Fog
 
         def get_attributes(domain_name, item_name, options = {})
           if options.is_a?(Array)
-            Fog::Logger.warning("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with array attributes param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options['AttributeName'] ||= options if options.is_a?(Array)
           end
           options['AttributeName'] ||= []

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/simpledb/select.rb

@@ -23,7 +23,7 @@ module Fog
         #     * 'NextToken'<~String> - offset to start with if there are are more domains to list
         def select(select_expression, options = {})
           if options.is_a?(String)
-            Fog::Logger.warning("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("get_attributes with string next_token param is deprecated, use 'AttributeName' => attributes) instead [light_black](#{caller.first})[/]")
             options = {'NextToken' => options}
           end
           options['NextToken'] ||= nil

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/acl_utils.rb

@@ -0,0 +1,62 @@
+module Fog
+  module Storage
+    class AWS
+
+      require 'fog/aws/parsers/storage/access_control_list'
+
+      private
+        def self.hash_to_acl(acl)
+          data =  "<AccessControlPolicy>\n"
+
+          if acl['Owner'] && (acl['Owner']['ID'] || acl['Owner']['DisplayName'])
+            data << "  <Owner>\n"
+            data << "    <ID>#{acl['Owner']['ID']}</ID>\n" if acl['Owner']['ID']
+            data << "    <DisplayName>#{acl['Owner']['DisplayName']}</DisplayName>\n" if acl['Owner']['DisplayName']
+            data << "  </Owner>\n"
+          end
+
+          grants = [acl['AccessControlList']].flatten.compact
+
+          data << "  <AccessControlList>\n" if grants.any?
+          grants.each do |grant|
+            data << "    <Grant>\n"
+            grantee = grant['Grantee']
+            type = case
+            when grantee.has_key?('ID')
+              'CanonicalUser'
+            when grantee.has_key?('EmailAddress')
+              'AmazonCustomerByEmail'
+            when grantee.has_key?('URI')
+              'Group'
+            end
+
+            data << "      <Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"#{type}\">\n"
+            case type
+            when 'CanonicalUser'
+              data << "        <ID>#{grantee['ID']}</ID>\n" if grantee['ID']
+              data << "        <DisplayName>#{grantee['DisplayName']}</DisplayName>\n" if grantee['DisplayName']
+            when 'AmazonCustomerByEmail'
+              data << "        <EmailAddress>#{grantee['EmailAddress']}</EmailAddress>\n" if grantee['EmailAddress']
+            when 'Group'
+              data << "        <URI>#{grantee['URI']}</URI>\n" if grantee['URI']
+            end
+            data << "      </Grantee>\n"
+            data << "      <Permission>#{grant['Permission']}</Permission>\n"
+            data << "    </Grant>\n"
+          end
+          data << "  </AccessControlList>\n" if grants.any?
+
+          data << "</AccessControlPolicy>"
+
+          data
+        end
+
+        def self.acl_to_hash(acl_xml)
+          parser = Fog::Parsers::Storage::AWS::AccessControlList.new
+          Nokogiri::XML::SAX::Parser.new(parser).parse(acl_xml)
+          parser.response
+        end
+
+    end
+  end
+end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/get_bucket_acl.rb

@@ -48,11 +48,17 @@ module Fog
 
       class Mock # :nodoc:all
 
+        require 'fog/aws/requests/storage/acl_utils'
+
         def get_bucket_acl(bucket_name)
           response = Excon::Response.new
           if acl = self.data[:acls][:bucket][bucket_name]
             response.status = 200
-            response.body = acl
+            if acl.is_a?(String)
+              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+            else
+              response.body = acl
+            end
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 200}, response))

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/get_object_acl.rb

@@ -59,11 +59,17 @@ module Fog
 
       class Mock # :nodoc:all
 
+        require 'fog/aws/requests/storage/acl_utils'
+
         def get_object_acl(bucket_name, object_name, options = {})
           response = Excon::Response.new
           if acl = self.data[:acls][:object][bucket_name] && self.data[:acls][:object][bucket_name][object_name]
             response.status = 200
-            response.body = acl
+            if acl.is_a?(String)
+              response.body = Fog::Storage::AWS.acl_to_hash(acl)
+            else
+              response.body = acl
+            end
           else
             response.status = 404
             raise(Excon::Errors.status_error({:expects => 200}, response))

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/get_object_url.rb

@@ -18,7 +18,7 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
           get_object_https_url(bucket_name, object_name, expires)
         end
 
@@ -27,7 +27,7 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          Fog::Logger.warning("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
+          Fog::Logger.deprecation("Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead [light_black](#{caller.first})[/]")
           get_object_https_url(bucket_name, object_name, expires)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/put_bucket_acl.rb

@@ -3,8 +3,8 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/aws/requests/storage/hash_to_acl'
-      
+        require 'fog/aws/requests/storage/acl_utils'
+
         # Change access control list for an S3 bucket
         #
         # ==== Parameters

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/storage/put_object_acl.rb

@@ -3,7 +3,7 @@ module Fog
     class AWS
       class Real
 
-        require 'fog/aws/requests/storage/hash_to_acl'
+        require 'fog/aws/requests/storage/acl_utils'
 
         # Change access control list for an S3 object
         #

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/ses.rb

@@ -40,7 +40,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'i, 'ap-southeast-1']
+        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'ap-southeast-1']
         #
         # ==== Returns
         # * SES object with connection to AWS.

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/simpledb.rb

@@ -86,6 +86,8 @@ module Fog
             'sdb.amazonaws.com'
           when 'us-west-1'
             'sdb.us-west-1.amazonaws.com'
+          when 'us-west-2'
+            'sdb.us-west-2.amazonaws.com'
           else
             raise ArgumentError, "Unknown region: #{options[:region].inspect}"
           end