wss_agent 17.12.2 → 18.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3850a4fa85b6f3b808ed771c51ef43cb6c3d5e8b
-  data.tar.gz: 2af5c93f1d4b70db4a44344555d54681f306ab30
+SHA256:
+  metadata.gz: 6a168842e0686c32bc7165a9175e5be05470a161e88ab99f9adb37e80c60c2e9
+  data.tar.gz: 4d6b01926bc21b67eb0604aa4700398ca5de190c91434ebfee903aeda10a1bfd
 SHA512:
-  metadata.gz: 7b6797a4755d9c7a0fe86f91ee60d7c767a9ea9df58d8f71da1fa49c65b7c1a1b8904355a47fbed0ceed39a57373459923029ffaf75c9fc6a6b21f285849f3fb
-  data.tar.gz: 5d8ccf591d00bf5b1a2f28110e9b0019b8a50a54da9a48b14ada7ab696b3f3bebeffc636cbf5e0448a0be57c589b864d628429e00f29a2ec82e41988fdeb7811
+  metadata.gz: e1957d887f52a2c9bcc867f3d1ae5954fa00271f89f7184ad00ffc4a8d4aa981108f27bc4506d0ddb549d1a808683c0b99dec5a53051166789ac583be746658e
+  data.tar.gz: 39ff2e97b3d0858d3c05431bee93a18bc0eb7471884032fe5acbd240368c44dd714759d4e91e5dbaa496cd74c9afdbdf00b725f985b8907a900583bfe01107e9

data/lib/wss_agent/client.rb

@@ -35,7 +35,7 @@ module WssAgent
     end
 
     def payload(gem_list, options = {})
-      {
+      req_options = {
         agent: Configure['agent'],
         agentVersion: Configure['agent_version'],
         token: Configure.token,
@@ -43,7 +43,9 @@ module WssAgent
         productVersion: Configure['product_version'].to_s,
         timeStamp: Time.now.to_i,
         diff: diff(gem_list)
-      }.merge(options)
+      }
+      req_options[:userKey] = Configure.user_key if Configure.user_key?
+      req_options.merge(options)
     end
 
     def update(gem_list)

data/lib/wss_agent/configure.rb

@@ -86,6 +86,14 @@ module WssAgent
         end
       end
 
+      def user_key
+        current['user_key'].to_s.strip
+      end
+
+      def user_key?
+        !user_key.empty?
+      end
+
       def project_meta
         @project_meta ||= WssAgent::Project.new
       end

data/lib/wss_agent/version.rb

@@ -1,4 +1,4 @@
 module WssAgent
-  VERSION = '17.12.2'.freeze
+  VERSION = '18.5.2'.freeze
   NAME = 'wss_agent'.freeze
 end

data/spec/wss_agent/client_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe WssAgent::Client, vcr: true  do
+  let(:user_key){ '9ec685d4f32843c2b963e3556256489e273cb1a122f948ba93463ffba6f1ed8c' }
   let(:bad_request_response) {
     {"envelopeVersion"=>"2.1.0", "status"=>2, "message"=>"Illegal arguments", "data"=>"Unsupported agent: null"}
   }
@@ -19,20 +20,33 @@ describe WssAgent::Client, vcr: true  do
 
 
   describe '#payload' do
+    let(:payload) {
+      {
+        agent: "bundler-plugin",
+        agentVersion: "1.0",
+        token: "xxxxxx",
+        product: "",
+        productVersion: "",
+        diff: "[{\"coordinates\":{\"artifactId\":\"wss_agent\",\"version\":\"#{WssAgent::VERSION}\"},\"dependencies\":{}}]",
 
-    it 'should return request params' do
+      }
+
+    }
+    it 'should return request params with userKey' do
+      allow(WssAgent::Configure).to receive_messages(user_key: user_key)
       Timecop.freeze(Time.now) do
-        payload = {
-          agent: "bundler-plugin",
-          agentVersion: "1.0",
-          token: "xxxxxx",
-          product: "",
-          productVersion: "",
+        payload_params = payload.merge(
           timeStamp: Time.now.to_i,
-          diff: "[{\"coordinates\":{\"artifactId\":\"wss_agent\",\"version\":\"#{WssAgent::VERSION}\"},\"dependencies\":{}}]"
-        }
+          userKey: user_key
+        )
 
-        expect(wss_client.payload({})).to eq(payload)
+        expect(wss_client.payload({})).to eq(payload_params)
+      end
+    end
+    it 'should return request params without userKey' do
+      Timecop.freeze(Time.now) do
+        payload_params = payload.merge(timeStamp: Time.now.to_i)
+        expect(wss_client.payload({})).to eq(payload_params)
       end
     end
   end

data/spec/wss_agent/configure_spec.rb

@@ -124,6 +124,26 @@ describe WssAgent::Configure do
     end
   end
 
+  describe '.user_key' do
+    context 'when user_key is not exist' do
+      it 'should return empty string' do
+        expect(WssAgent::Configure.user_key).to eq('')
+      end
+      it { expect(WssAgent::Configure.user_key?).to be_falsey }
+    end
+    context 'when user_key is exist' do
+      before do
+        allow(WssAgent::Configure).to receive_messages(user_key: '11111111')
+      end
+
+      it 'should return user_key' do
+        expect(WssAgent::Configure.user_key).to eq('11111111')
+      end
+
+      it { expect(WssAgent::Configure.user_key?).to be_truthy }
+    end
+  end
+
   describe '.agent' do
     it 'should be "bundler-plugin"' do
       expect(WssAgent::Configure['agent']).to eq('bundler-plugin')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wss_agent
 version: !ruby/object:Gem::Version
-  version: 17.12.2
+  version: 18.5.2
 platform: ruby
 authors:
 - Maxim Pechnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-23 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -339,7 +339,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: White Source agent.