dpl 1.4.7.travis.135.2 → 1.4.7.travis.140.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8fff797463257453d5adca079243739356b324a
-  data.tar.gz: 6750a6902c88209e9297c622db3d6cdf36c92039
+  metadata.gz: ca7a08d634d9f07c6dfe2e383ababbea2326d1da
+  data.tar.gz: e93c0baf30853ef4a2110cefcf1b9fc55f1bb429
 SHA512:
-  metadata.gz: 46a1cb4624e51cb4ca6edc4dd8c5b292b342c9a0419184da2b250a1e685b783dd3b242c0aabca1fec62e88baf905da84aea95ddc3b1d847789a000fccb873ebc
-  data.tar.gz: 044ad1b2626e10ce71329bab80887ed989186aa5533c63a501e82e3c470b247abfea794a846add093c0e59242fecee8c03855212743bc9e18af8a9e0bf33a52c
+  metadata.gz: 0c55a68c8c1793776298a0e4a9527b0552b46ca666910a08c99a4c7786e01ce377f54e40053c7809404598f4760b720e067bcf893f16ebbd8df774c2d58bfafd
+  data.tar.gz: ae35d9a5b2ddc60be9ea9cb3c054f34846a7fde772dd2f7ec4a17c1639e545ec487490cd81f66e2fe5b34f50719276e2a89a3eb164a0f75ceb747f9ab26b2fe3

data/lib/dpl/provider.rb

@@ -13,6 +13,7 @@ module DPL
     autoload :RubyGems,     'dpl/provider/rubygems'
     autoload :CloudControl, 'dpl/provider/cloudcontrol'
     autoload :CloudFoundry, 'dpl/provider/cloud_foundry'
+    autoload :PyPI,         'dpl/provider/pypi'
 
     def self.new(context, options)
       return super if self < Provider

data/lib/dpl/provider/pypi.rb

@@ -0,0 +1,66 @@
+module DPL
+  class Provider
+    class PyPI < Provider
+      DEFAULT_SERVER = 'http://www.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'
+      end
+
+      install_setuptools
+
+      def config
+        {
+          :header => '[distutils]',
+          :servers_line => 'index-servers =',
+          :servers => {
+            'pypi' => [
+                         "repository: #{options[:server] || DEFAULT_SERVER}",
+                         "username: #{option(:user)}",
+                         "password: #{option(:password)}",
+                      ]
+          }
+        }
+      end
+
+      def write_servers(f)
+        config[:servers].each do |key, val|
+          f.puts " " * 4 + key
+        end
+
+        config[:servers].each do |key, val|
+          f.puts "[#{key}]"
+          f.puts val
+        end
+      end
+
+      def write_config
+        File.open(File.expand_path(PYPIRC_FILE), 'w') do |f|
+          config.each do |key, val|
+            f.puts(val) if val.is_a? String or val.is_a? Array
+          end
+          write_servers(f)
+        end
+      end
+
+      def check_auth
+        write_config
+        log "Authenticated as #{option(:user)}"
+      end
+
+      def check_app
+      end
+
+      def needs_key?
+        false
+      end
+
+      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 upload_docs --upload-dir #{options[:docs_dir] || 'build/docs'}"
+      end
+    end
+  end
+end

data/spec/provider/pypi_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+require 'dpl/provider/pypi'
+
+describe DPL::Provider::PyPI do
+  subject :provider do
+    described_class.new(DummyContext.new, :user => 'foo', :password => 'bar')
+  end
+
+  describe :config do
+    it 'accepts a user and a password' do
+      provider.config[:servers]['pypi'].should include 'username: foo'
+      provider.config[:servers]['pypi'].should include 'password: bar'
+    end
+  end
+
+  describe :check_auth do
+    example do
+      provider.should_receive(:log).with("Authenticated as foo")
+      provider.check_auth
+    end
+  end
+
+  describe :push_app do
+    example do
+      provider.context.should_receive(:shell).with("python setup.py register -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py sdist upload -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py upload_docs --upload-dir build/docs")
+      provider.push_app
+    end
+
+    example "with :distributions option" do
+      provider.options.update(:distributions => 'sdist bdist')
+      provider.context.should_receive(:shell).with("python setup.py register -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py sdist bdist upload -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py upload_docs --upload-dir build/docs")
+      provider.push_app
+    end
+
+    example "with :server option" do
+      provider.options.update(:server => 'http://blah.com')
+      provider.context.should_receive(:shell).with("python setup.py register -r http://blah.com")
+      provider.context.should_receive(:shell).with("python setup.py sdist upload -r http://blah.com")
+      provider.context.should_receive(:shell).with("python setup.py upload_docs --upload-dir build/docs")
+      provider.push_app
+    end
+
+    example "with :docs_dir option" do
+      provider.options.update(:docs_dir => 'some/dir')
+      provider.context.should_receive(:shell).with("python setup.py register -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py sdist upload -r pypi")
+      provider.context.should_receive(:shell).with("python setup.py upload_docs --upload-dir some/dir")
+      provider.push_app
+    end
+  end
+
+  describe :write_servers do
+    example do
+      f = double(:f)
+      f.should_receive(:puts).with("    pypi")
+      f.should_receive(:puts).with("[pypi]")
+      f.should_receive(:puts).with(["repository: http://www.python.org/pypi",
+                                    "username: foo",
+                                    "password: bar"
+                                   ])
+      provider.write_servers(f)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.4.7.travis.135.2
+  version: 1.4.7.travis.140.2
 platform: ruby
 authors:
 - Konstantin Haase
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-07 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,6 +94,7 @@ files:
 - lib/dpl/provider/heroku/git.rb
 - lib/dpl/provider/nodejitsu.rb
 - lib/dpl/provider/openshift.rb
+- lib/dpl/provider/pypi.rb
 - lib/dpl/provider/rubygems.rb
 - lib/dpl/version.rb
 - notes/dotcloud.md
@@ -105,6 +106,7 @@ files:
 - spec/provider/heroku_anvil_spec.rb
 - spec/provider/heroku_git_spec.rb
 - spec/provider/openshift_spec.rb
+- spec/provider/pypi_spec.rb
 - spec/provider/rubygems_spec.rb
 - spec/provider_spec.rb
 - spec/spec_helper.rb