dpl 1.7.17.travis.882.4 → 1.7.17.travis.884.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWNkYjNhODZkODY5ZTA0MTRmYTdjZWIyYjNjNDc0ODkxYTQxN2NhZQ==
+    MWFhYTk0ODYwNjllN2YzOTkyMDdlZWU4NGIxODUwMTBkNDEyMTgxYQ==
   data.tar.gz: !binary |-
-    MjYxMjI1YjdiZTY0MGQzMjMwNGFlMWI3MDVkZjE0NDExYzRkMzRmMw==
+    YWM5OTdjY2ZmMjQ1YzNjNmZiZTNmOTNiMzk5MDkzZDM0Y2UzODJjYw==
 SHA512:
   metadata.gz: !binary |-
-    NGQ2YTE5MGM3YTJlYTUzM2JkZjAxMjZmOWQwZGNiZjhkMWI1MmQ4ZmU3MmUy
-    ZjRkNzgwZjI4NjUwZDhhOGRlZDE4MTIzZWI0YjNmYjAwOTYxNGJjNzZkMDAz
-    ZWRjNWI3ODgwODJkNzU0OGU2ZjQwMGJmMjAzMmUxMDQ0NzY1ZTg=
+    NTVmZTI3ZDcwOGJhZWZkNTYxZDFmZGQwNjE1OWZkNjg1MGIxMzcyZjg1Y2Iw
+    OTY2YjkyYWRiNGU3NGIxNTM3MzE0OTY3YWY3NmRmYjk1YTFhMmUzYjQwYzM0
+    YWIwOGRlZTVmMzRjYmQ0NGM0NDhlZDI5NWIwOGYxZmRkMTBhYTA=
   data.tar.gz: !binary |-
-    OTQ2ZGI4OWVlNGVlNWUzOWE3MDMzOGJmYWVhZjQ0MjI5NzUwNmJkMzI0YzZi
-    MTk3M2U5MmQwMzA1ZTFkZGQ5MzIxZWI0MTIxNjM4MjRkMzM1YjcyNWJmZTVj
-    ZWQ0ZjI3YTkxOGZiNjg3NzU0ZmFhOGY5NDkxMTc4NWM0MDhmMWU=
+    MzA5Y2MzZmIyYzM3YmRjMDFjNmUwZjVhYTJkMGQzNGQ5Y2U2OWE5YzZjODE3
+    OWUwM2Y0OTQ3ZGZmOWU2NWQ5MmMzODJkNTViODcwMTIwZThjNTU5ZGE5MmRl
+    NzVmNjQyY2YxMWJjNGYwYzVjYTc5ZWJmNGYxNTI5NTUyN2YwMjU=

data/lib/dpl/provider/pypi.rb

@@ -1,16 +1,17 @@
 module DPL
   class Provider
     class PyPI < Provider
-      DEFAULT_SERVER = 'http://pypi.python.org/pypi'
+      DEFAULT_SERVER = 'https://pypi.python.org/pypi'
       PYPIRC_FILE = '~/.pypirc'
 
       def self.install_setuptools
-        shell 'wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py -O - | sudo python'
+        shell 'wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python'
         shell 'rm -f setuptools-*.zip'
       end
 
       def initialize(*args)
         super(*args)
+        self.class.pip 'twine'
         self.class.pip 'wheel' if options[:distributions].to_s.include? 'bdist_wheel'
       end
 
@@ -64,7 +65,9 @@ module DPL
 
       def push_app
         context.shell "python setup.py register -r #{options[:server] || 'pypi'}"
-        context.shell "python setup.py #{options[:distributions] || 'sdist'} upload -r #{options[:server] || 'pypi'}"
+        context.shell "python setup.py #{options[:distributions] || 'sdist'}"
+        context.shell "twine upload -r #{options[:server] || 'pypi'} dist/*"
+        context.shell "rm -rf dist/*"
         if options[:docs_dir]
           docs_dir_option = '--upload-dir ' + options[:docs_dir]
         else

data/spec/provider/pypi_spec.rb

@@ -15,6 +15,7 @@ describe DPL::Provider::PyPI do
 
   describe "#initialize" do
     example "with :distributions option containing 'bdist_wheel'" do
+      expect(described_class).to receive(:pip).with("twine")
       expect(described_class).to receive(:pip).with("wheel")
       described_class.new(DummyContext.new, :user => 'foo', :password => 'bar', :distributions => 'bdist_wheel sdist')
     end
@@ -30,7 +31,9 @@ describe DPL::Provider::PyPI do
   describe "#push_app" do
     example do
       expect(provider.context).to receive(:shell).with("python setup.py register -r pypi")
-      expect(provider.context).to receive(:shell).with("python setup.py sdist upload -r pypi")
+      expect(provider.context).to receive(:shell).with("python setup.py sdist")
+      expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*")
       expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r pypi")
       provider.push_app
     end
@@ -38,7 +41,9 @@ describe DPL::Provider::PyPI do
     example "with :distributions option" do
       provider.options.update(:distributions => 'sdist bdist')
       expect(provider.context).to receive(:shell).with("python setup.py register -r pypi")
-      expect(provider.context).to receive(:shell).with("python setup.py sdist bdist upload -r pypi")
+      expect(provider.context).to receive(:shell).with("python setup.py sdist bdist")
+      expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*")
       expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r pypi")
       provider.push_app
     end
@@ -46,7 +51,9 @@ describe DPL::Provider::PyPI do
     example "with :server option" do
       provider.options.update(:server => 'http://blah.com')
       expect(provider.context).to receive(:shell).with("python setup.py register -r http://blah.com")
-      expect(provider.context).to receive(:shell).with("python setup.py sdist upload -r http://blah.com")
+      expect(provider.context).to receive(:shell).with("python setup.py sdist")
+      expect(provider.context).to receive(:shell).with("twine upload -r http://blah.com dist/*")
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*")
       expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r http://blah.com")
       provider.push_app
     end
@@ -54,7 +61,9 @@ describe DPL::Provider::PyPI do
     example "with :docs_dir option" do
       provider.options.update(:docs_dir => 'some/dir')
       expect(provider.context).to receive(:shell).with("python setup.py register -r pypi")
-      expect(provider.context).to receive(:shell).with("python setup.py sdist upload -r pypi")
+      expect(provider.context).to receive(:shell).with("python setup.py sdist")
+      expect(provider.context).to receive(:shell).with("twine upload -r pypi dist/*")
+      expect(provider.context).to receive(:shell).with("rm -rf dist/*")
       expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r pypi")
       provider.push_app
     end
@@ -65,7 +74,7 @@ describe DPL::Provider::PyPI do
       f = double(:f)
       expect(f).to receive(:puts).with("    pypi")
       expect(f).to receive(:puts).with("[pypi]")
-      expect(f).to receive(:puts).with(["repository: http://pypi.python.org/pypi",
+      expect(f).to receive(:puts).with(["repository: https://pypi.python.org/pypi",
                                     "username: foo",
                                     "password: bar"
                                    ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.17.travis.882.4
+  version: 1.7.17.travis.884.4
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec