dpl 2.0.0.alpha.8 → 2.0.0.alpha.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8626f9f9647e9b3dd0b9398323d8a3b2a89e017d
-  data.tar.gz: b23f6733a4989c87abf3e8c01812e686698e0ced
+  metadata.gz: 0ffe98f5b9f3ce0ca191cf682cef66a9ce40d9ca
+  data.tar.gz: c6f078c0327bdc898dacce86ba58146d40b1c59e
 SHA512:
-  metadata.gz: f2d6e4649834d5108f1bd01e8e42cd920c40b4e295099407989ec1919503a863dd3551bd5b8302419ba0a24b8e119ea30218d45d8c0fb2f4f258df245b3faa89
-  data.tar.gz: 2ceda8a5f92878c9913c337d53f4e8622e8d042155a228f0cb9c17b57ea32cb768f3fd2818a544c399844751c81cdcc4b505b610277216ffeaa452a4787032ab
+  metadata.gz: 6ea460e362dc45fde1bc1c6bf2b4712e3e1b33d78720323cbaac8a5168b0bfc69c7fdbc3ae723441ee7f61f881f19d5baadff123da9ea0c1561a572c8a847ad6
+  data.tar.gz: '097250f7c7aae96be417e826b5b50ac724b3046dd3cbc5ad38bf4ca7c2e74a8458de1bf8a397696ffc6b5953e0bb2e2265cd922f417c9225dd3e3f56e17b1532'

data/Gemfile.lock

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

data/lib/dpl/providers/npm.rb

@@ -21,7 +21,7 @@ module Dpl
       opt '--tag TAGS', 'distribution tags to add'
       opt '--auth_method METHOD', 'Authentication method', enum: %w(auth)
 
-      REGISTRY = 'registry.npmjs.org'
+      REGISTRY = 'https://registry.npmjs.org'
       NPMRC = '~/.npmrc'
 
       msgs version:  'npm version: %{npm_version}',
@@ -71,15 +71,32 @@ module Dpl
           if npm_version =~ /^1/ || auth_method == 'auth'
             "_auth = #{api_token}\nemail = #{email}"
           else
-            "//#{host(registry).sub('https://', '').sub(%r(/$), '')}/:_authToken=#{api_token}"
+            "//#{auth_endpoint}/:_authToken=#{api_token}"
           end
         end
 
+        def auth_endpoint
+          str = registry
+          str = strip_path(str) if str.include?('npm.pkg.github.com')
+          str = strip_protocol(str).sub(%r(/$), '')
+          str
+        end
+
         def registry
-          return super if super
-          data = package_json
-          url = data && data.fetch('publishConfig', {})['registry']
-          url ? host(url) : REGISTRY
+          super || registry_from_package_json || REGISTRY
+        end
+
+        def registry_from_package_json
+          return unless data = package_json
+          data && data.fetch('publishConfig', {})['registry']
+        end
+
+        def strip_path(url)
+          url.sub(URI(url).path, '')
+        end
+
+        def strip_protocol(url)
+          url.sub("#{URI(url).scheme}://", '')
         end
 
         def host(url)

data/lib/dpl/version.rb

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

metadata

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