dpl 1.7.19.travis.946.4 → 1.7.19.travis.947.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmFlYzk4NmNmMzg4NmUwNTM2MmE4NTljOTRjYWFiOWRiZmQzMTYzMg==
+    ZDM4ZjdjYTg1MTliZTk0YmY5YjA5ZGY3MzQyNmU4N2RhNzg1ZTRiZQ==
   data.tar.gz: !binary |-
-    YTc3MzIxMTEzMGNkNTAzMTk5MDI2NTZjYjZiNjFhOWQ5YjA4NmMyMQ==
+    YmMxYWRkMGNlYjA1YjdiOWU5YTQ0ZWE4ZDAwMWU4MjI0M2ZkYTAxYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjRlMjI4MDc2YTFjZjU5NGZlMzkyMGE0ZGE2ZGQ4YzcxODk2Y2UwNTY0N2Ew
-    OThjYjAxZTFjNThjNmIzZjk2MTczZGU5ZTE5NmVkOTFjZDc0OWQ5ZDA0Y2Ri
-    N2QxZjBlNTE5NjliNzY2NGQ0MDVjZmU1MDU4ZWExN2FmMzAzYzg=
+    NjhlMDFlNDI3NTI1MDNhMDk2ZDY0OWE1NjcxYTZlM2ZkY2EzMzE2ZjRjZTQw
+    YjA4NTRlYWI1ZjVkZjBhMWY5ZTFlZDNkMTdhM2ViYTk0MTdkNWRmMjIyODY5
+    OTE4MmEzYWZjMGQ0ZDlmYjU4NDA4OWY2OTBlZDNiYmY2ZTQ2NTY=
   data.tar.gz: !binary |-
-    N2E3ZjNlZDc5NWM5Yjg5OTAzNWRiZmU3OThmOGUzMWVjMDBmNGY4NmIyMDlk
-    MTNmYmY5ODc1OGU2M2RmZmViMDFjODk4Nzc4ODYwOWYxZmViMTEwM2JjYzA1
-    YzdjNjA3MDdiMDIyYTBjMWJiOTQyMjkwNTViNjJmNzQ2MDdlMDQ=
+    OWYxMTFmNmMyOTkwNTBhOTRmMTI4YmZlMTFkZmVmMDdjZjhlZjEzMWYxMmE1
+    MTIwZDg1MDQzYmEwNGJiZDQ5MThjY2RhOTk4OTAyZDVlZWIyMWE2MTkxNjNi
+    MjM3OGQwNzE1MDVhYWQ0YmZiMTFhNDFlNzY1OTY2MTQxZDY4MDQ=

data/lib/dpl/provider/npm.rb

@@ -1,7 +1,10 @@
+require 'json'
+
 module DPL
   class Provider
     class NPM < Provider
       NPMRC_FILE = '~/.npmrc'
+      DEFAULT_NPM_REGISTRY = 'registry.npmjs.org'
 
       def needs_key?
         false
@@ -12,7 +15,7 @@ module DPL
 
       def setup_auth
         f = File.open(File.expand_path(NPMRC_FILE), 'w')
-        f.puts("//registry.npmjs.org/:_authToken=${NPM_API_KEY}")
+        f.puts("//#{package_registry}/:_authToken=${NPM_API_KEY}")
       end
 
       def check_auth
@@ -26,6 +29,17 @@ module DPL
         context.shell "env NPM_API_KEY=#{option(:api_key)} npm publish"
         FileUtils.rm(File.expand_path(NPMRC_FILE))
       end
+
+      def package_registry
+        if File.exists?('package.json')
+          data = JSON.parse(File.read('package.json'))
+          if data['publishConfig'] && data['publishConfig']['registry']
+            return data['publishConfig']['registry']
+          end
+        end
+
+        DEFAULT_NPM_REGISTRY
+      end
     end
   end
 end

data/spec/provider/npm_spec.rb

@@ -24,10 +24,41 @@ describe DPL::Provider::NPM do
 
   describe "#setup_auth" do
     example do
-      f = double(:npmrc)
-      expect(File).to receive(:open).with(File.expand_path(DPL::Provider::NPM::NPMRC_FILE), 'w').and_return(f)
-      expect(f).to receive(:puts).with("//registry.npmjs.org/:_authToken=${NPM_API_KEY}")
-      provider.setup_auth
+      test_setup_auth
     end
   end
+
+  context 'when package.json exists' do
+    let(:custom_rpm_registry) { 'npm.example.com' }
+    before :each do
+      expect(File).to receive(:exists?).with('package.json').and_return(true)
+    end
+
+    context 'and it defines custom RPM registry' do
+      before { expect(File).to receive(:read).with('package.json').and_return("{\"publishConfig\":{\"registry\":\"#{custom_rpm_registry}\"}}") }
+
+      describe '#setup_auth' do
+        example do
+          test_setup_auth(custom_rpm_registry)
+        end
+      end
+    end
+
+    context 'and it does not define custom RPM registry' do
+      before { expect(File).to receive(:read).with('package.json').and_return("{}") }
+
+      describe '#setup_auth' do
+        example do
+          test_setup_auth
+        end
+      end
+    end
+  end
+end
+
+def test_setup_auth(registry=DPL::Provider::NPM::DEFAULT_NPM_REGISTRY)
+  f = double(:npmrc)
+  expect(File).to receive(:open).with(File.expand_path(DPL::Provider::NPM::NPMRC_FILE), 'w').and_return(f)
+  expect(f).to receive(:puts).with("//#{registry}/:_authToken=${NPM_API_KEY}")
+  provider.setup_auth
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.19.travis.946.4
+  version: 1.7.19.travis.947.4
 platform: ruby
 authors:
 - Konstantin Haase