dpl 1.8.7.travis.1143.4 → 1.8.7.travis.1144.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDg5Mjk1MDRiZWJiZmU4NTc0M2MxNjA3MGY2NzU3OGRlY2YzYmQ5ZQ==
+    NjI5M2EyOGYyMzRmZGFhMzdiNWUwN2IyYWM3ZDFkNDY3MWU1YmI4Ng==
   data.tar.gz: !binary |-
-    ZmY4MDkxOGU0NTI4YzhiZmVlNzQwNWE2OGE1MmIyODJlNThmNjE5Yg==
+    YWM4MmVkMWExZTliNjdkMWRmZDBlM2EzNGQ2ZTNkMDI3NGZlMmExYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzgwMmQwNmJiOGJlMmNmYzA3ZDQ4MzdhNDUzNjc0Nzg1Zjk3ODMwOTM1MDQ2
-    YzgwMzIwOTNjYTI5NTA3NjgwMjBmOTNmMWY3ZmMyYzdhNGM1YTNmZmE1YjNm
-    ZmQyYTA2NGU5NzkzMTk0ODY1MDc4OWFkZTNjZGI5M2E0ZDFkZGU=
+    NjdkMjc4ZTVhNjczY2U2NjZlMmI4NTMxZDdiMWJjZDI4NzQ2OTMwZGFmYTI5
+    Y2YzYTM0YjliYWE5ZWMwNDQ2MDRmMTM0ZTEyNDU1ODJkOWFmNTA2ZDIwY2Q3
+    MjI0MmE2YWNkNDQ2MDVkZTUzMzAxNTRkYzcxZWI2MjA0YzAxYzQ=
   data.tar.gz: !binary |-
-    NDdmZDdiMDk5YTJmYmJmY2Y1MjYyYTk0ZDIyM2UzN2E1YWM2NDQxMGRkYjk3
-    NDEwMGE0NjFlNTA5NzhlNjhkMTZmNmRlM2Q2MmY5YzQ5MzZkNjhlZGI2NDVk
-    YTU2NmQwMTg2NmQxNjg1ODcyNTEzYzgxOGEyMWMyZWZkM2U4NzY=
+    MDYyNWQ3N2M5M2M1MzBhMjQwMzY2NTQ2NTAwNGYwNzYxZjdiYzZiZjEyM2Uz
+    Y2M0Zjc5Mzk1NDQxYzczNGQ2NzFmZmEzNjVhMmQ4N2UwNDA5Nzc1ZTViNzYy
+    MTRmZjFlOWZjNzE4MjgwOGZmYjdlMzFjMmRkMWNlMTBkZTZkYjA=

data/lib/dpl/provider/npm.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'uri'
 
 module DPL
   class Provider
@@ -36,7 +37,7 @@ module DPL
         if File.exists?('package.json')
           data = JSON.parse(File.read('package.json'))
           if data['publishConfig'] && data['publishConfig']['registry']
-            return data['publishConfig']['registry']
+            return URI(data['publishConfig']['registry']).host
           end
         end
 
@@ -48,7 +49,7 @@ module DPL
         if npm_version =~ /^1/
           "_auth = ${NPM_API_KEY}\nemail = #{option(:email)}"
         else
-          "//#{package_registry.gsub(/\/+$/,'')}/:_authToken=${NPM_API_KEY}"
+          "//#{package_registry}/:_authToken=${NPM_API_KEY}"
         end
       end
 

data/spec/provider/npm_spec.rb

@@ -46,7 +46,8 @@ describe DPL::Provider::NPM do
   end
 
   context 'when package.json exists' do
-    let(:custom_rpm_registry) { 'npm.example.com' }
+    let(:host) { 'npm.example.com' }
+    let(:custom_rpm_registry) { 'https://' + host }
     before :each do
       expect(File).to receive(:exists?).with('package.json').and_return(true)
     end
@@ -56,14 +57,14 @@ describe DPL::Provider::NPM do
 
       describe '#setup_auth' do
         example do
-          test_setup_auth(custom_rpm_registry)
+          test_setup_auth(host)
         end
       end
     end
 
     context 'and it defines custom RPM registry with trailing slash' do
-      let(:host) { 'npm.example.com'}
-      let(:custom_rpm_registry) { host + '/' }
+      let(:host) { 'npm.example.com' }
+      let(:custom_rpm_registry) { 'https://' + host + '/' }
       before { expect(File).to receive(:read).with('package.json').and_return("{\"publishConfig\":{\"registry\":\"#{custom_rpm_registry}\"}}") }
 
       describe '#setup_auth' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.8.7.travis.1143.4
+  version: 1.8.7.travis.1144.4
 platform: ruby
 authors:
 - Konstantin Haase