dpl 1.8.12.travis.1282.4 → 1.8.12.travis.1283.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTdlZTI5OWZmODY4NWJhY2Y0NDdhZjYwNWZiMmY4MTlkNzA3OGEzNg==
+    ODNhNWY3YTJlNGE0Mjk3ZjdlMmNmZGJhOWM0NmJkNjQ0ZDc4Zjg0NQ==
   data.tar.gz: !binary |-
-    M2Y4MjNiNDZiMTEzNzhkYzUwMGEwNTY5M2ZkMzg0YTk2MWZiODUwMw==
+    MTc2MGZiM2U0ZmY3YjViNDMwZjIwM2ZhOGI2ZWUwN2JiYzI4MTZlNg==
 SHA512:
   metadata.gz: !binary |-
-    YjU3M2VjNzdiMjY4N2UyNWRkMjI1ZTliNTNjZjE3MzgyMWQ5NzAyZmYzNzU1
-    OTU5NGJmMmZhY2QwMzBhMzdjZWY3ZTYwOWMyMWVhZmFjZjZhMGZmMWIyMTZh
-    OTYxN2RmYTY0MmRjN2EzYWFmYzg2Mzk5YTNlZDkwNjcwMGI1YTM=
+    NmU3ZTM5OGYyZDJmM2M2NjRkY2VlMzFiYjc0MjBhMThhNjZkZjEzZjBhY2E4
+    Mjg2YjgwMWY2YjllMDUzOTUzMTBiNTc0ZDc0M2I1YzI1NzJiNmMzZjNlOTRh
+    ZGFkMGViM2EyZjA5MzgyODgxYTNmNjZjMTg3MzcyNmE5NDk5MjQ=
   data.tar.gz: !binary |-
-    ZWZmYmFhM2UyMzYxZTlmODg3OGE2OTcxZGM5MTQzZTc0MzZkMWUyNDQwNzNm
-    YTRjZGExNDkzMzRiMmViMGU0ZGJkZjkzZDcwZmQxYTNjMTc0NGM3NjA5NWM2
-    MjIwYTI5N2FjNDYyZGE0YmFmOTRhZmY1Mzk1MTIzNTYzNjE4Yjk=
+    NWM4NmQ1NjA4NmY0YTNmZDM4OTdiNjFmNWFlYTczOWUxYTk3YTY2MTUwOWYw
+    MTA5NTM4YWQ1YmRjNzY5ZDMyZDM5ZTUyOThlODRhNTRiZTk3NjI4YjU1N2Rh
+    MzljNDU0MzcxMDRmOTE3YmJiNGZjNmQ0NGZmYjQxMDU1ODIwOGE=

data/README.md

@@ -291,9 +291,17 @@ For authentication you can also use Travis CI secure environment variable:
 
 * **user**: PyPI Username.
 * **password**: PyPI Password.
-* **server**: Optional. Only required if you want to release to a different index. Follows the form of "https://mypackageindex.com/index".
-* **distributions**: A space-separated list of distributions to be uploaded to PyPI. Defaults to 'sdist'.
-* **docs_dir**: A path to the directory to upload documentation from. Defaults to 'build/docs'
+* **server**: Optional. Only required if you want to release to a different index. Follows the form of 'https://mypackageindex.com/index'. Defaults to 'https://pypi.python.org/pypi'.
+* **distributions**: Optional. A space-separated list of distributions to be uploaded to PyPI. Defaults to 'sdist'.
+* **docs_dir**: Optional. A path to the directory to upload documentation from. Defaults to 'build/docs'
+
+#### Environment variables:
+
+ * **PYPI_USER**: PyPI Username. Used if the `user` option is omitted.
+ * **PYPI_PASSWORD**: PyPI Password. Used if the `password` option is omitted.
+ * **PYPI_SERVER** Optional. Only required if you want to release to a different index. Used if the `server` option is omitted.
+ * **PYPI_DISTRIBUTIONS** Optional. A space-separated list of distributions to be uploaded to PyPI. Used if the `distributions` option is omitted.
+ * **PYPI_DOCS_DIR** Optional. A path to the directory to upload documentation from. Used if the `docs_dir` option is omitted.
 
 #### Examples:
 

data/lib/dpl/provider/pypi.rb

@@ -4,6 +4,29 @@ module DPL
       DEFAULT_SERVER = 'https://pypi.python.org/pypi'
       PYPIRC_FILE = '~/.pypirc'
 
+      def pypi_user
+        option(:username, :user) || context.env['PYPI_USER'] || context.env['PYPI_USERNAME']
+      end
+
+      def pypi_password
+        options[:password] || context.env['PYPI_PASSWORD']
+      end
+
+      def pypi_server
+        options[:server] || context.env['PYPI_SERVER'] || DEFAULT_SERVER
+      end
+
+      def pypi_distributions
+        options[:distributions] || context.env['PYPI_DISTRIBUTIONS'] || 'sdist'
+      end
+
+      def pypi_docs_dir_option
+        docs_dir = options[:docs_dir] || context.env['PYPI_DOCS_DIR'] || ''
+        if !docs_dir.empty?
+          '--upload-dir ' + docs_dir
+        end
+      end
+
       def self.install_setuptools
         shell 'wget https://bootstrap.pypa.io/ez_setup.py -O - | sudo python'
         shell 'rm -f setuptools-*.zip'
@@ -15,7 +38,7 @@ module DPL
 
       def initialize(*args)
         super(*args)
-        self.class.pip 'wheel' if options[:distributions].to_s.include? 'bdist_wheel'
+        self.class.pip 'wheel' if pypi_distributions.to_s.include? 'bdist_wheel'
       end
 
       install_setuptools
@@ -27,9 +50,9 @@ module DPL
           :servers_line => 'index-servers = pypi',
           :servers => {
             'pypi' => [
-                         "repository: #{options[:server] || DEFAULT_SERVER}",
-                         "username: #{option(:user)}",
-                         "password: #{option(:password)}",
+                         "repository: #{pypi_server}",
+                         "username: #{pypi_user}",
+                         "password: #{pypi_password}",
                       ]
           }
         }
@@ -56,8 +79,10 @@ module DPL
       end
 
       def check_auth
+        error "missing PyPI username" unless pypi_user
+        error "missing PyPI password" unless pypi_password
         write_config
-        log "Authenticated as #{option(:user)}"
+        log "Authenticated as #{pypi_user}"
       end
 
       def check_app
@@ -68,15 +93,10 @@ module DPL
       end
 
       def push_app
-        context.shell "python setup.py #{options[:distributions] || 'sdist'}"
+        context.shell "python setup.py #{pypi_distributions}"
         context.shell "twine upload -r pypi dist/*"
         context.shell "rm -rf dist/*"
-        if options[:docs_dir]
-          docs_dir_option = '--upload-dir ' + options[:docs_dir]
-        else
-          docs_dir_option = ''
-        end
-        context.shell "python setup.py upload_docs #{docs_dir_option} -r #{options[:server] || 'pypi'}"
+        context.shell "python setup.py upload_docs #{pypi_docs_dir_option} -r #{pypi_server}"
       end
     end
   end

data/spec/provider/pypi_spec.rb

@@ -32,7 +32,7 @@ describe DPL::Provider::PyPI do
       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")
+      expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r https://pypi.python.org/pypi")
       provider.push_app
     end
 
@@ -41,7 +41,7 @@ describe DPL::Provider::PyPI do
       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")
+      expect(provider.context).to receive(:shell).with("python setup.py upload_docs  -r https://pypi.python.org/pypi")
       provider.push_app
     end
 
@@ -59,7 +59,7 @@ describe DPL::Provider::PyPI do
       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")
+      expect(provider.context).to receive(:shell).with("python setup.py upload_docs --upload-dir some/dir -r https://pypi.python.org/pypi")
       provider.push_app
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.12.travis.1282.4
+  version: 1.8.12.travis.1283.4
 platform: ruby
 authors:
 - Konstantin Haase