dpl-pypi 1.9.1.travis.2689.5 → 1.9.1.travis.2705.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e8816d67beda7eb18addaf22782f911b618b7ce58cf2092ef90f6761556535
-  data.tar.gz: ab3e178ebaeaceeba6c98bca34186c04cab7cc111a08fb48abb2664e2d17f61a
+  metadata.gz: f9236ba14bd57c5cc3be7d6512ebd587c7c2da4a0b5851711760362241d9efc4
+  data.tar.gz: 6d7b45f053858f27e1cf99b1b6e7d89910c75e03ca76a7958463b913f49f1a02
 SHA512:
-  metadata.gz: a38a764c85a9560f2b76fd79eaf9eedd9cee29c7e1fdbbad4c666402cfbfb7ea1538a745d50afff87a24b2e0c40c046e01fa09fc3fa0d056c2f8c6212868bbbe
-  data.tar.gz: f4a4cfdec36c43b008c932686b0f047b742178d984968cfb6a55cfb7caa0261fe84b445081d29f157c5009d62c4bc8c4aaf7abeea12fdd270e6985200bef0ca7
+  metadata.gz: 35a0253dcc1ef8eaa2b4afeeb52b91e748e09c115c30aff8f6ea3814a791bb8be7a8f5b0b737c7755a2dde08c8a7ba3f83080e357466a6b354c5173be6549c88
+  data.tar.gz: 9a9cdccc1d52bbc29d94c71058a2ebc9e2476c0cf99ce252705a8608d04f0a3ef5f7c1980762272eb27cee52de886ef547dc7d72a2a0c14ac8b1fa150b050d82

data/lib/dpl/provider/pypi.rb

@@ -32,6 +32,12 @@ module DPL
           (options.has_key?(:skip_upload_docs) && options[:skip_upload_docs])
       end
 
+      def pypi_skip_existing_option
+          if options.fetch(:skip_existing, false)
+            ' --skip-existing'
+          end
+      end
+
       def install_deploy_dependencies
         unless context.shell "wget -O - https://bootstrap.pypa.io/get-pip.py | python - --no-setuptools --no-wheel && " \
                              "pip install --upgrade setuptools twine wheel"
@@ -89,7 +95,7 @@ module DPL
 
       def push_app
         context.shell "python setup.py #{pypi_distributions}"
-        unless context.shell "twine upload -r pypi dist/*"
+        unless context.shell "twine upload#{pypi_skip_existing_option} -r pypi dist/*"
           error 'PyPI upload failed.'
         end
         context.shell "rm -rf dist/*"

data/spec/provider/pypi_spec.rb

@@ -56,6 +56,24 @@ describe DPL::Provider::PyPI do
       provider.push_app
     end
 
+    example "with :skip_existing option being false" do
+      provider.options.update(:skip_existing => false)
+      expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
+      expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*").and_return(true)
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*").and_return(true)
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r https://upload.pypi.org/legacy/")
+      provider.push_app
+    end
+
+    example "with :skip_existing option being true" do
+      provider.options.update(:skip_existing => true)
+      expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)
+      expect(provider.context).to receive(:shell).with("twine upload --skip-existing -r pypi dist/*").and_return(true)
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*").and_return(true)
+      expect(provider.context).not_to receive(:shell).with("python setup.py upload_docs  -r https://upload.pypi.org/legacy/")
+      provider.push_app
+    end
+
     example "with :skip_upload_docs option" do
       provider.options.update(:skip_upload_docs => true)
       expect(provider.context).to receive(:shell).with("python setup.py sdist").and_return(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl-pypi
 version: !ruby/object:Gem::Version
-  version: 1.9.1.travis.2689.5
+  version: 1.9.1.travis.2705.5
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dpl
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1.travis.2689.5
+        version: 1.9.1.travis.2705.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.9.1.travis.2689.5
+        version: 1.9.1.travis.2705.5
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement