Merge branch 'release-1.4.2'

* release-1.4.2: (25 commits)
  Bumping version to 1.4.2
  Updated the changelog for new features.
  Update changelog with latest changes.
  Update changelog with no sign request option
  Renamed the recently added classes.
  Fix completer test with new --no-sign-request arg
  Add a --no-sign-request argument
  More updates from the AWS doc team (elb)
  Rename "--filter" to "--filters"
  Add missing test for list-structure(list-scalar, scalar) docs
  Show syntax for specifying multiple shorthand pairs
  Fix describe-vpc-peering-connection with correct filter syntax
  Fixed describe-reserved-instances with correct --filter syntax
  Correct syntax for describe-volumes example
  Update example to quote entire Key value
  Fixed unwieldy description in s3/_concepts.rst and the related subcommand test.
  re-added lines from commit fb84aaf
  Small correction to get-metric-statistics example
  Synced changes with doc team sources.
  Add ``InfoSetter`` class.
  ...

Author: kyleknap

.coveragerc

@@ -0,0 +1,4 @@
+[run]
+branch = True
+include =
+    awscli/*

.travis.yml

@@ -4,7 +4,9 @@ python:
   - "2.7"
   - "3.3"
 install:
-  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
-  - pip install --use-mirrors -r requirements.txt
+  - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install unittest2; fi
+  - pip install -r requirements.txt
   - python setup.py develop
-script: nosetests tests/unit
+  - pip install coverage python-coveralls
+script: nosetests tests/unit --cover-erase --with-coverage --cover-package awscli
+after_success: coveralls

CHANGELOG.rst

@@ -2,6 +2,19 @@
 CHANGELOG
 =========
 
+1.4.2
+=====
+
+* feature:``aws cloudsearchdomain``: Added sigv4 support.
+* bugfix:Credentials: Raise an error if an incomplete profile is found
+  (`issue 690 <https://github.com/aws/aws-cli/issues/690>`__)
+* feature:Signing Requests: Add a ``--no-sign-request`` option that,
+  when specified, will not sign any requests.
+* bugfix:``aws s3``: Added ``-source-region`` argument to allow transfer
+  between non DNS compatible buckets that were located in different regions.
+  (`issue 872 <https://github.com/aws/aws-cli/pull/872>`__)
+
+
 1.4.1
 =====
 

README.rst

@@ -6,6 +6,11 @@ aws-cli
    :target: https://travis-ci.org/aws/aws-cli
    :alt: Build Status
 
+
+.. image:: https://coveralls.io/repos/aws/aws-cli/badge.png
+  :target: https://coveralls.io/r/aws/aws-cli
+
+
 This package provides a unified command line interface to many
 Amazon Web Services.
 

awscli/__init__.py

@@ -17,7 +17,7 @@
 """
 import os
 
-__version__ = '1.4.1'
+__version__ = '1.4.2'
 
 #
 # Get our data path to be added to botocore's search path

awscli/argprocess.py

@@ -326,19 +326,23 @@ def _create_name_to_params(self, param):
             return dict([(v, None) for v in param.keys.enum])
 
     def _docs_list_scalar_list_parse(self, param):
-        s = 'Key value pairs, where values are separated by commas.\n'
+        s = ('Key value pairs, where values are separated by commas, '
+             'and multiple pairs are separated by spaces.\n')
         s += '%s ' % param.cli_name
         inner_params = param.members.members
         scalar_params = [p for p in inner_params if p.type in SCALAR_TYPES]
         list_params = [p for p in inner_params if p.type == 'list']
+        pair = ''
         for param in scalar_params:
-            s += '%s=%s1,' % (param.name, param.type)
+            pair += '%s=%s1,' % (param.name, param.type)
         for param in list_params[:-1]:
             param_type = param.members.type
-            s += '%s=%s1,%s2,' % (param.name, param_type, param_type)
+            pair += '%s=%s1,%s2,' % (param.name, param_type, param_type)
         last_param = list_params[-1]
         param_type = last_param.members.type
-        s += '%s=%s1,%s2' % (last_param.name, param_type, param_type)
+        pair += '%s=%s1,%s2' % (last_param.name, param_type, param_type)
+        pair += ' %s' % pair
+        s += pair
         return s
 
     def _docs_list_scalar_parse(self, param):
@@ -348,8 +352,10 @@ def _docs_list_scalar_parse(self, param):
     def _docs_list_key_value_parse(self, param):
         s = "Key value pairs, with multiple values separated by a space.\n"
         s += '%s ' % param.cli_name
-        s += ','.join(['%s=%s' % (sub_param.name, sub_param.type)
-                       for sub_param in param.members.members])
+        pair = ','.join(['%s=%s' % (sub_param.name, sub_param.type)
+                         for sub_param in param.members.members])
+        pair += ' %s' % pair
+        s += pair
         return s
 
     def _docs_special_key_value_parse(self, param):

awscli/customizations/globalargs.py

@@ -18,6 +18,7 @@
 
 def register_parse_global_args(cli):
     cli.register('top-level-args-parsed', resolve_types)
+    cli.register('top-level-args-parsed', no_sign_request)
 
 
 def resolve_types(parsed_args, **kwargs):
@@ -48,3 +49,16 @@ def _resolve_verify_ssl(value):
     else:
         verify = os.environ.get('AWS_CA_BUNDLE')
     return verify
+
+
+def no_sign_request(parsed_args, session, **kwargs):
+    if not parsed_args.sign_request:
+        # In order to make signing disabled for all requests
+        # we need to set the signature_version to None for
+        # any service created.  This ensures that get_endpoint()
+        # will not look for auth.
+        session.register('service-created', disable_signing)
+
+
+def disable_signing(service, **kwargs):
+    service.signature_version = None

awscli/customizations/s3/filegenerator.py

@@ -17,7 +17,6 @@
 from dateutil.parser import parse
 from dateutil.tz import tzlocal
 
-from awscli.customizations.s3.fileinfo import FileInfo
 from awscli.customizations.s3.utils import find_bucket_key, get_file_stat
 from awscli.customizations.s3.utils import BucketLister
 from awscli.errorhandler import ClientError
@@ -46,6 +45,20 @@ def __init__(self, directory, filename):
         super(FileDecodingError, self).__init__(self.error_message)
 
 
+class FileStat(object):
+    def __init__(self, src, dest=None, compare_key=None, size=None,
+                 last_update=None, src_type=None, dest_type=None,
+                 operation_name=None):
+        self.src = src
+        self.dest = dest
+        self.compare_key = compare_key
+        self.size = size
+        self.last_update = last_update
+        self.src_type = src_type
+        self.dest_type = dest_type
+        self.operation_name = operation_name
+
+
 class FileGenerator(object):
     """
     This is a class the creates a generator to yield files based on information
@@ -54,7 +67,8 @@ class FileGenerator(object):
     under the same common prefix.  The generator yields corresponding
     ``FileInfo`` objects to send to a ``Comparator`` or ``S3Handler``.
     """
-    def __init__(self, service, endpoint, operation_name, follow_symlinks=True):
+    def __init__(self, service, endpoint, operation_name,
+                 follow_symlinks=True):
         self._service = service
         self._endpoint = endpoint
         self.operation_name = operation_name
@@ -86,10 +100,9 @@ def call(self, files):
                                               sep_table[dest_type])
             else:
                 dest_path = dest['path']
-            yield FileInfo(src=src_path, dest=dest_path,
+            yield FileStat(src=src_path, dest=dest_path,
                            compare_key=compare_key, size=size,
                            last_update=last_update, src_type=src_type,
-                           service=self._service, endpoint=self._endpoint,
                            dest_type=dest_type,
                            operation_name=self.operation_name)
 

awscli/customizations/s3/fileinfo.py

@@ -140,7 +140,7 @@ class FileInfo(TaskInfo):
     def __init__(self, src, dest=None, compare_key=None, size=None,
                  last_update=None, src_type=None, dest_type=None,
                  operation_name=None, service=None, endpoint=None,
-                 parameters=None):
+                 parameters=None, source_endpoint=None):
         super(FileInfo, self).__init__(src, src_type=src_type,
                                        operation_name=operation_name,
                                        service=service,
@@ -156,6 +156,7 @@ def __init__(self, src, dest=None, compare_key=None, size=None,
         else:
             self.parameters = {'acl': None,
                                'sse': None}
+        self.source_endpoint = source_endpoint
 
     def _permission_to_param(self, permission):
         if permission == 'read':
@@ -256,7 +257,8 @@ def delete(self):
         """
         if (self.src_type == 's3'):
             bucket, key = find_bucket_key(self.src)
-            params = {'endpoint': self.endpoint, 'bucket': bucket, 'key': key}
+            params = {'endpoint': self.source_endpoint, 'bucket': bucket,
+                      'key': key}
             response_data, http = operate(self.service, 'DeleteObject',
                                           params)
         else:

awscli/customizations/s3/fileinfobuilder.py

@@ -0,0 +1,49 @@
+# Copyright 2014 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.
+from awscli.customizations.s3.fileinfo import FileInfo
+
+
+class FileInfoBuilder(object):
+    """
+    This class takes a ``FileBase`` object's attributes and generates
+    a ``FileInfo`` object so that the operation can be performed.
+    """
+    def __init__(self, service, endpoint, source_endpoint=None,
+                 parameters = None):
+        self._service = service
+        self._endpoint = endpoint
+        self._source_endpoint = endpoint
+        if source_endpoint:
+            self._source_endpoint = source_endpoint
+        self._parameters = parameters 
+
+    def call(self, files):
+        for file_base in files:
+            file_info = self._inject_info(file_base)
+            yield file_info            
+
+    def _inject_info(self, file_base):
+        file_info_attr = {}
+        file_info_attr['src'] = file_base.src
+        file_info_attr['dest'] = file_base.dest
+        file_info_attr['compare_key'] = file_base.compare_key
+        file_info_attr['size'] = file_base.size
+        file_info_attr['last_update'] = file_base.last_update
+        file_info_attr['src_type'] = file_base.src_type
+        file_info_attr['dest_type'] = file_base.dest_type
+        file_info_attr['operation_name'] = file_base.operation_name
+        file_info_attr['service'] = self._service
+        file_info_attr['endpoint'] = self._endpoint
+        file_info_attr['source_endpoint'] = self._source_endpoint
+        file_info_attr['parameters'] = self._parameters
+        return FileInfo(**file_info_attr)