dpl 1.7.21.travis.958.4 → 1.7.21.travis.959.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDhjMWZjMzcyY2UxMGI3ZGYyMmI0ZGE0ZGY4NDNiYTQ1OWVmMzdmZA==
+    YjhmZWQ2ODY1NjlkNTc3YjRhZWExNDczY2Q5ZjJlYjM0ZDJlMDU4Yg==
   data.tar.gz: !binary |-
-    NjA0ZWY0Nzg5OGIwZjRlODYyYTVjOThhNTRhNzZiY2UyMTU2OGRlYg==
+    Y2UyMTU2ZGM5ZmEzMjg5OGY2Y2FkNTJjMjhhYjFiMjIxN2ExMTczNw==
 SHA512:
   metadata.gz: !binary |-
-    NDVmMGVkYzExY2U5MWQxZjM0ZWNhM2IyYzY2MDc5MmM5OTEyZThhOGY3MzY5
-    ZmMyMWIzYjhjMmE3MzA4YjVjOWU2MzllNDAxMWMzMmE2ZmIwMTViZmU1ZTlk
-    ZjdjNzA0ZDUwZWVlYzhmY2MzYzBiM2RmMmIxZWQxOTIxNTcxNzI=
+    YTE5ZmViNzA2MmJkN2RlYTJhZjMzNTRiMTU4MzNmZTZiZjUyNzE4OGU5OWQ2
+    NTE0NDVjZGVjZjg0Y2E1OWQwZTQ2NmM2MjUyZmQ5MTk3ZTFjZDNiOGNlMzA3
+    Y2RhOGM1OGJiYWY0NjEzYjYzNGIyOGZkODg0Y2Y0NmEwNTIwOTE=
   data.tar.gz: !binary |-
-    NDAzMmNlYzBmMzAxMjAwZTUyZjE2ZmZjM2Q1YjczZjA5YjUxMGU4YTRlNGQ5
-    NDQ1NTZmMzVlMWE5MzEwNDJkMzZkZDUwMDQ1NzQ3ZjRjNmNiMzkzMzZhZGQ3
-    NDkwOWFiNWViNjFlNDkzZmZhYTk5MDJlOWVhZTZlZjlmN2Y0OWY=
+    OTFiMGY3MmU2NWVlMDU4Njk1NDc3NDEwMmJjYzFlZjhmNmY1ODVmMzIzZjJh
+    Nzg4MGQ5ZGZjMGVlODc1MjE0MTBjNDIwYzAyMmFmMDgzY2NiN2VkNTNlOWEx
+    NGNjZDg4MmI2OGY0MjY2M2EyZDI2YzZjYzg2MmM3MTQ3ZWY0Y2E=

data/lib/dpl/provider/npm.rb

@@ -15,7 +15,7 @@ module DPL
 
       def setup_auth
         file = File.open(File.expand_path(NPMRC_FILE), 'w')
-        file.puts("//#{package_registry}/:_authToken=${NPM_API_KEY}")
+        file.puts(npmrc_file_content)
         file.flush
       end
 
@@ -41,6 +41,18 @@ module DPL
 
         DEFAULT_NPM_REGISTRY
       end
+
+      def npmrc_file_content
+        if npm_version =~ /^1/
+          "_auth = ${NPM_API_KEY}\nemail = #{option(:email)}\nregistry = #{package_registry}"
+        else
+          "//#{package_registry}/:_authToken=${NPM_API_KEY}"
+        end
+      end
+
+      def npm_version
+        `npm --version`
+      end
     end
   end
 end

data/spec/provider/npm_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 require 'dpl/provider/npm'
 
 describe DPL::Provider::NPM do
+  before :each do
+    allow(subject).to receive(:npm_version).and_return('2.11.3')
+  end
+
   subject :provider do
     described_class.new(DummyContext.new, :email => 'foo@blah.com', :api_key => 'test')
   end
@@ -28,6 +32,18 @@ describe DPL::Provider::NPM do
     end
   end
 
+  context 'when NPM is version 1.x' do
+    before :each do
+      allow(subject).to receive(:npm_version).and_return('1.4.28')
+    end
+
+    describe "#setup_auth" do
+      example do
+        test_setup_auth(DPL::Provider::NPM::DEFAULT_NPM_REGISTRY, "_auth = ${NPM_API_KEY}\nemail = foo@blah.com\nregistry = #{DPL::Provider::NPM::DEFAULT_NPM_REGISTRY}")
+      end
+    end
+  end
+
   context 'when package.json exists' do
     let(:custom_rpm_registry) { 'npm.example.com' }
     before :each do
@@ -56,10 +72,10 @@ describe DPL::Provider::NPM do
   end
 end
 
-def test_setup_auth(registry=DPL::Provider::NPM::DEFAULT_NPM_REGISTRY)
+def test_setup_auth(registry = DPL::Provider::NPM::DEFAULT_NPM_REGISTRY, content = "//#{registry}/:_authToken=${NPM_API_KEY}")
   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}")
+  expect(f).to receive(:puts).with(content)
   allow(f).to receive(:flush)
   provider.setup_auth
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dpl
 version: !ruby/object:Gem::Version
-  version: 1.7.21.travis.958.4
+  version: 1.7.21.travis.959.4
 platform: ruby
 authors:
 - Konstantin Haase