Merge pull request #122 from sigmavirus24/upload-refactor

Upload refactor

Author: sigmavirus24

setup.py

@@ -69,6 +69,7 @@
     entry_points={
         "twine.registered_commands": [
             "upload = twine.commands.upload:main",
+            "register = twine.commands.register:main",
         ],
         "console_scripts": [
             "twine = twine.__main__:main",

tests/test_package.py

@@ -0,0 +1,57 @@
+# Copyright 2015 Ian Cordasco
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License 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 __future__ import unicode_literals
+from twine import package
+
+import pretend
+
+
+def test_sign_file(monkeypatch):
+    replaced_check_call = pretend.call_recorder(lambda args: None)
+    monkeypatch.setattr(package.subprocess, 'check_call', replaced_check_call)
+    filename = 'tests/fixtures/deprecated-pypirc'
+
+    pkg = package.PackageFile(
+        filename=filename,
+        comment=None,
+        metadata=pretend.stub(name="deprecated-pypirc"),
+        python_version=None,
+        filetype=None
+    )
+    try:
+        pkg.sign('gpg2', None)
+    except IOError:
+        pass
+    args = ('gpg2', '--detach-sign', '-a', filename)
+    assert replaced_check_call.calls == [pretend.call(args)]
+
+
+def test_sign_file_with_identity(monkeypatch):
+    replaced_check_call = pretend.call_recorder(lambda args: None)
+    monkeypatch.setattr(package.subprocess, 'check_call', replaced_check_call)
+    filename = 'tests/fixtures/deprecated-pypirc'
+
+    pkg = package.PackageFile(
+        filename=filename,
+        comment=None,
+        metadata=pretend.stub(name="deprecated-pypirc"),
+        python_version=None,
+        filetype=None
+    )
+    try:
+        pkg.sign('gpg', 'identity')
+    except IOError:
+        pass
+    args = ('gpg', '--detach-sign', '-a', filename, '--local-user', 'identity')
+    assert replaced_check_call.calls == [pretend.call(args)]

tests/test_upload.py

@@ -16,7 +16,6 @@
 import os
 import textwrap
 
-import pretend
 import pytest
 
 from twine.commands import upload
@@ -60,25 +59,6 @@ def test_find_dists_handles_real_files():
     assert expected == files
 
 
-def test_sign_file(monkeypatch):
-    replaced_check_call = pretend.call_recorder(lambda args: None)
-    monkeypatch.setattr(upload.subprocess, 'check_call', replaced_check_call)
-
-    upload.sign_file('gpg2', 'my_file.tar.gz', None)
-    args = ['gpg2', '--detach-sign', '-a', 'my_file.tar.gz']
-    assert replaced_check_call.calls == [pretend.call(args)]
-
-
-def test_sign_file_with_identity(monkeypatch):
-    replaced_check_call = pretend.call_recorder(lambda args: None)
-    monkeypatch.setattr(upload.subprocess, 'check_call', replaced_check_call)
-
-    upload.sign_file('gpg', 'my_file.tar.gz', 'identity')
-    args = ['gpg', '--detach-sign', '--local-user', 'identity', '-a',
-            'my_file.tar.gz']
-    assert replaced_check_call.calls == [pretend.call(args)]
-
-
 def test_get_config_old_format(tmpdir):
     pypirc = os.path.join(str(tmpdir), ".pypirc")
 

twine/commands/register.py

@@ -0,0 +1,93 @@
+# Copyright 2015 Ian Cordasco
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License 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 __future__ import absolute_import, unicode_literals, print_function
+
+import argparse
+import os.path
+import sys
+
+from twine import exceptions as exc
+from twine.package import PackageFile
+from twine.repository import Repository
+from twine import utils
+
+
+def register(package, repository, username, password, comment, config_file):
+    config = utils.get_repository_from_config(config_file, repository)
+    config["repository"] = utils.normalize_repository_url(
+        config["repository"]
+    )
+
+    print("Registering package to {0}".format(config["repository"]))
+
+    username = utils.get_username(username, config)
+    password = utils.get_password(password, config)
+
+    repository = Repository(config["repository"], username, password)
+
+    if not os.path.exists(package):
+        raise exc.PackageNotFound(
+            '"{0}" does not exist on the file system.'.format(package)
+        )
+
+    resp = repository.register(PackageFile.from_filename(package, comment))
+    repository.close()
+
+    if resp.is_redirect:
+        raise exc.RedirectDetected(
+            ('"{0}" attempted to redirect to "{1}" during upload.'
+             ' Aborting...').format(config["respository"],
+                                    resp.headers["location"]))
+
+    resp.raise_for_status()
+
+
+def main(args):
+    parser = argparse.ArgumentParser(prog="twine register")
+    parser.add_argument(
+        "-r", "--repository",
+        default="pypi",
+        help="The repository to register the package to (default: "
+             "%(default)s)",
+    )
+    parser.add_argument(
+        "-u", "--username",
+        help="The username to authenticate to the repository as",
+    )
+    parser.add_argument(
+        "-p", "--password",
+        help="The password to authenticate to the repository with",
+    )
+    parser.add_argument(
+        "-c", "--comment",
+        help="The comment to include with the distribution file",
+    )
+    parser.add_argument(
+        "--config-file",
+        default="~/.pypirc",
+        help="The .pypirc config file to use",
+    )
+    parser.add_argument(
+        "package",
+        metavar="package",
+        help="File from which we read the package metadata",
+    )
+
+    args = parser.parse_args(args)
+
+    # Call the register function with the args from the command line
+    try:
+        register(**vars(args))
+    except Exception as exc:
+        sys.exit("{exc.__class__.__name__}: {exc}".format(exc=exc))