dpl 2.0.0.alpha.7 → 2.0.0.alpha.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66cc8adc7935d0da254391ac5135aba535446c14
-  data.tar.gz: 49af677f55e86c5eb07f79d89d94157687be879b
+  metadata.gz: 8626f9f9647e9b3dd0b9398323d8a3b2a89e017d
+  data.tar.gz: b23f6733a4989c87abf3e8c01812e686698e0ced
 SHA512:
-  metadata.gz: 437f05d515c4b2fb0dbabf7f5b048b25a34db045d3cfba265f7172d45f1d2a9e95ed2a6056c7240da9db72ee722a67a8c7090bc25442039c7bc28b7ad26cda86
-  data.tar.gz: 8e9b20a8e55fab270d90d674f1356effeac52a714f379a30951d01eff5680980c0d4d86d8cc81c4965bf425da99c9b1bfc22c192c356df6a1583c8f0aa1d9959
+  metadata.gz: f2d6e4649834d5108f1bd01e8e42cd920c40b4e295099407989ec1919503a863dd3551bd5b8302419ba0a24b8e119ea30218d45d8c0fb2f4f258df245b3faa89
+  data.tar.gz: 2ceda8a5f92878c9913c337d53f4e8622e8d042155a228f0cb9c17b57ea32cb768f3fd2818a544c399844751c81cdcc4b505b610277216ffeaa452a4787032ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dpl (2.0.0.alpha.6)
+    dpl (2.0.0.alpha.7)
       cl (~> 1.0)
 
 GEM

data/README.md

@@ -571,7 +571,7 @@ given as `AZURE_WA_PASSWORD=<password>`.
 
 ### Bintray
 
-Support for deployments to Bintray is in **alpha**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
+Support for deployments to Bintray is in **beta**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
 
 ```
 Usage: dpl bintray [options]
@@ -696,7 +696,7 @@ given as `BOXFUSE_SECRET=<secret>`.
 
 ### Cargo
 
-Support for deployments to Cargo is in **alpha**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
+Support for deployments to Cargo is in **beta**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
 
 ```
 Usage: dpl cargo [options]
@@ -1599,7 +1599,7 @@ as `NETLIFY_AUTH=<auth>`.
 
 ### npm
 
-Support for deployments to npm is in **alpha**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
+Support for deployments to npm is in **beta**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
 
 ```
 Usage: dpl npm [options]
@@ -1764,7 +1764,7 @@ be given as `PUPPETFORGE_PASSWORD=<password>`.
 
 ### PyPI
 
-Support for deployments to PyPI is in **alpha**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
+Support for deployments to PyPI is in **beta**. Please see [Maturity Levels](https://github.com/travis-ci/dpl/#maturity-levels) for details.
 
 ```
 Usage: dpl pypi [options]

data/lib/dpl/providers/bintray.rb

@@ -5,7 +5,7 @@ require 'find'
 module Dpl
   module Providers
     class Bintray < Provider
-      status :alpha
+      status :beta
 
       description sq(<<-str)
         tbd

data/lib/dpl/providers/cargo.rb

@@ -1,7 +1,7 @@
 module Dpl
   module Providers
     class Cargo < Provider
-      status :alpha
+      status :beta
 
       description sq(<<-str)
         tbd

data/lib/dpl/providers/gcs.rb

@@ -29,10 +29,12 @@ module Dpl
       opt '--acl ACL', 'Access control to set for uploaded objects', default: 'private', enum: %w(private public-read public-read-write authenticated-read bucket-owner-read bucket-owner-full-control), see: 'https://cloud.google.com/storage/docs/reference-headers#xgoogacl'
       opt '--detect_encoding', 'HTTP header Content-Encoding to set for files compressed with gzip and compress utilities.'
       opt '--cache_control HEADER', 'HTTP header Cache-Control to suggest that the browser cache the file.', see: 'https://cloud.google.com/storage/docs/xml-api/reference-headers#cachecontrol'
+      opt '--glob GLOB', default: '**/*'
 
       cmds install:   'curl -L %{URL} | tar xz -C ~ && ~/google-cloud-sdk/install.sh --path-update false --usage-reporting false --command-completion false',
            login_key: 'gcloud auth activate-service-account --key-file=%{key_file}',
-           copy:      'gsutil %{gs_opts}cp %{copy_opts}-r %{source} %{target}'
+           rsync:     'gsutil %{gs_opts} rsync %{rsync_opts} %{glob} %{target}',
+           copy:      'gsutil %{gs_opts} cp %{copy_opts} -r %{source} %{target}'
 
       msgs login_key:   'Authenticating with service account key file %{key_file}',
            login_creds: 'Authenticating with access key: %{access_key_id}'
@@ -60,7 +62,7 @@ module Dpl
 
       def deploy
         Dir.chdir(local_dir) do
-          source_files.each { |file| copy(file) }
+          files.each { |file| copy(file) }
         end
       end
 
@@ -79,12 +81,18 @@ module Dpl
           write_file '~/.boto', interpolate(BOTO, opts, secure: true), 0600
         end
 
-        def source_files
-          Dir.glob(*glob).select { |path| File.file?(path) }
+        def files
+          Dir.glob(*glob_args).select { |path| File.file?(path) }
         end
 
         def copy(source)
-          shell :copy, gs_opts: gs_opts(source), source: source
+          to = [target.sub(%r(/$), ''), source].join('/')
+          shell :copy, gs_opts: gs_opts(source), source: source, target: to
+        end
+
+        def dirname(path)
+          dir = File.dirname(path)
+          dir unless dir.empty? || dir == '.'
         end
 
         def gs_opts(path)
@@ -110,10 +118,10 @@ module Dpl
           type.to_s if type
         end
 
-        def glob
-          glob = ['**/*']
-          glob << File::FNM_DOTMATCH if dot_match?
-          glob
+        def glob_args
+          args = [glob]
+          args << File::FNM_DOTMATCH if dot_match?
+          args
         end
     end
   end

data/lib/dpl/providers/npm.rb

@@ -1,7 +1,7 @@
 module Dpl
   module Providers
     class Npm < Provider
-      status :alpha
+      status :beta
 
       full_name 'npm'
 
@@ -71,7 +71,7 @@ module Dpl
           if npm_version =~ /^1/ || auth_method == 'auth'
             "_auth = #{api_token}\nemail = #{email}"
           else
-            "//#{registry.sub('https://', '').sub(%r(/$), '')}/:_authToken=#{api_token}"
+            "//#{host(registry).sub('https://', '').sub(%r(/$), '')}/:_authToken=#{api_token}"
           end
         end
 
@@ -79,7 +79,11 @@ module Dpl
           return super if super
           data = package_json
           url = data && data.fetch('publishConfig', {})['registry']
-          url ? URI(url).host : REGISTRY
+          url ? host(url) : REGISTRY
+        end
+
+        def host(url)
+          URI(url).host
         end
 
         def package_json

data/lib/dpl/providers/pypi.rb

@@ -1,7 +1,7 @@
 module Dpl
   module Providers
     class Pypi < Provider
-      status :alpha
+      status :beta
 
       full_name 'PyPI'
 

data/lib/dpl/version.rb

@@ -1,3 +1,3 @@
 module Dpl
-  VERSION = '2.0.0.alpha.7'
+  VERSION = '2.0.0.alpha.8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.7
+  version: 2.0.0.alpha.8
 platform: ruby
 authors:
 - Konstantin Haase
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-26 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cl