Add --skip-existing flag to upload command

This new flag allows users to force twine to skip existing files when
uploading to PyPI. For example:

    ~/s/gh3.py git:develop ❯❯❯ twine upload --skip-existing dist/*
    Uploading distributions to https://pypi.python.org/pypi
    Uploading github3.py-1.0.0a2-py2.py3-none-any.whl
      Skipping github3.py-1.0.0a2-py2.py3-none-any.whl because it
    appears to already exist
    Uploading github3.py-1.0.0a2.tar.gz
      Skipping github3.py-1.0.0a2.tar.gz because it appears to
    already exist

Closes #115

Author: sigmavirus24

tests/fixtures/twine-1.5.0-py2.py3-none-any.whl

@@ -16,12 +16,16 @@
 import os
 import textwrap
 
+import mock
 import pretend
 import pytest
 
 from twine.commands import upload
 
 
+WHEEL_FIXTURE = 'tests/fixtures/twine-1.5.0-py2.py3-none-any.whl'
+
+
 def test_ensure_wheel_files_uploaded_first():
     files = upload.group_wheel_files_first(["twine/foo.py",
                                             "twine/first.whl",
@@ -92,11 +96,36 @@ def test_get_config_old_format(tmpdir):
     try:
         upload.upload(dists="foo", repository="pypi", sign=None, identity=None,
                       username=None, password=None, comment=None,
-                      sign_with=None, config_file=pypirc)
+                      sign_with=None, config_file=pypirc, skip_existing=False)
     except KeyError as err:
         assert err.args[0] == (
             "Missing 'pypi' section from the configuration file.\n"
             "Maybe you have a out-dated '{0}' format?\n"
             "more info: "
             "https://docs.python.org/distutils/packageindex.html#pypirc\n"
         ).format(pypirc)
+
+
+def test_skip_existing_skips_files_already_on_PyPI(monkeypatch):
+    response = mock.Mock(spec=upload.requests.models.Response)
+    session = mock.Mock(spec=upload.requests.sessions.Session)
+
+    monkeypatch.setattr(upload.requests, 'session', lambda: session)
+    monkeypatch.setattr(upload.os.path, 'exists', lambda args: True)
+
+    session.post.return_value = response
+    response.status_code = 400
+    response.is_redirect = False
+
+    upload.upload(
+        dists=[WHEEL_FIXTURE],
+        repository="pypi",
+        sign=None,
+        identity=None,
+        username='username',
+        password='password',
+        comment=None,
+        sign_with=None,
+        config_file='',
+        skip_existing=True
+    )

tests/test_upload.py

@@ -4,6 +4,7 @@ envlist = py26,py27,pypy,py32,py33,py34,docs,pep8
 [testenv]
 deps =
     coverage
+    mock
     pretend
     pytest
 commands =

tox.ini

@@ -91,7 +91,7 @@ def sign_file(sign_with, filename, identity):
 
 
 def upload(dists, repository, sign, identity, username, password, comment,
-           sign_with, config_file):
+           sign_with, config_file, skip_existing):
     # Check that a nonsensical option wasn't given
     if not sign and identity:
         raise ValueError("sign must be given along with identity")
@@ -214,15 +214,16 @@ def upload(dists, repository, sign, identity, username, password, comment,
 
         data["md5_digest"] = md5_hash.hexdigest()
 
-        signed_name = os.path.basename(filename) + ".asc"
+        basefilename = os.path.basename(filename)
+        signed_name = basefilename + ".asc"
         if signed_name in signatures:
             with open(signatures[signed_name], "rb") as gpg:
                 data["gpg_signature"] = (signed_name, gpg.read())
         elif sign:
             with open(filename + ".asc", "rb") as gpg:
                 data["gpg_signature"] = (signed_name, gpg.read())
 
-        print("Uploading {0}".format(os.path.basename(filename)))
+        print("Uploading {0}".format(basefilename))
 
         data_to_send = []
         for key, value in data.items():
@@ -235,7 +236,7 @@ def upload(dists, repository, sign, identity, username, password, comment,
         with open(filename, "rb") as fp:
             data_to_send.append((
                 "content",
-                (os.path.basename(filename), fp, "application/octet-stream"),
+                (basefilename, fp, "application/octet-stream"),
             ))
             encoder = MultipartEncoder(data_to_send)
             resp = session.post(
@@ -257,10 +258,14 @@ def upload(dists, repository, sign, identity, username, password, comment,
         if resp.is_redirect:
             raise exc.RedirectDetected(
                 ('"{0}" attempted to redirect to "{1}" during upload.'
-                 ' Aborting...').format(config["respository"],
+                 ' Aborting...').format(config["repository"],
                                         resp.headers["location"]))
         # Otherwise, raise an HTTPError based on the status code.
-        resp.raise_for_status()
+        if resp.status_code == 400 and skip_existing:
+            print("  Skipping {0} because it appears to already exist".format(
+                basefilename))
+        else:
+            resp.raise_for_status()
 
 
 def main(args):
@@ -302,6 +307,12 @@ def main(args):
         default="~/.pypirc",
         help="The .pypirc config file to use",
     )
+    parser.add_argument(
+        "--skip-existing",
+        default=False,
+        action="store_true",
+        help="Continue uploading files if one already exists",
+    )
     parser.add_argument(
         "dists",
         nargs="+",