wss_agent 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30a45b25697365d6784786aa0822264980c096dc
-  data.tar.gz: f18c9d67fb7a17fc4cdd77a8d46d86ae8c97fed6
+  metadata.gz: 7a934aec4d6f03e152b8625b778c911f567a8f7c
+  data.tar.gz: c1d903609a3415acbbaa8ddb202385f8ce426290
 SHA512:
-  metadata.gz: ee7735d701b55b9893ea5e5041812ff3d833191a2c01211d2243f32f340096b93244e8dca145ce54e5f55f4577eed63db42621683652ae447bfbfbca360b49dd
-  data.tar.gz: dfa4e269e4c1e50dfaa115ba8ff01546fa496e1c7ec09b813b8bb3c9a0bfe42b730a40f598e74246a38a5b022a291bbc890d68b766f3206b835a919f48a08388
+  metadata.gz: 1e0b9642dcacfb3b7eb19704f9f5fd6fbadb6d295cabf2b640652f30579148857e032e24a865b561f07e3fddfbaaef93c29bccae53edbcfe0fb7439501467c45
+  data.tar.gz: ab6bfcd1880ac1e76f98e549ce17f24c3b08a37d9ed3f45bc558b372ac9a6e0f8720fe39c134cce543844ba15bdf8d618e80fcc0bde9851fe5fbb12bbe91e08a

data/Rakefile

@@ -1,10 +1,8 @@
-require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
 # Default directory to look in is `/specs`
 # Run with `rake spec`
-RSpec::Core::RakeTask.new(:spec) do |task|
-  task.rspec_opts = ['--color', '--format']
-end
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/lib/wss_agent/configure.rb

@@ -82,15 +82,19 @@ module WssAgent
       end
 
       def coordinates
+        return {} unless current['project_token'].to_s.strip.empty?
+
         project_meta = WssAgent::Project.new
+
         coordinates_config = current['coordinates']
         coordinates_artifact_id = coordinates_config['artifact_id']
         coordinates_version = coordinates_config['version']
 
-        if coordinates_artifact_id.nil? || coordinates_artifact_id == ''
+        if coordinates_artifact_id.to_s.strip.empty?
           coordinates_artifact_id = project_meta.project_name
           coordinates_version = project_meta.project_version
         end
+
         {
           'artifactId' => coordinates_artifact_id,
           'version' => coordinates_version

data/lib/wss_agent/version.rb

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

data/spec/spec_helper.rb

@@ -6,9 +6,10 @@ require 'webmock/rspec'
 require 'timecop'
 
 require 'vcr'
+require 'support/exit_code_matches'
 
 VCR.configure do |config|
-  config.cassette_library_dir = "spec/fixtures/vcr_cassettes"
+  config.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
   config.hook_into :webmock
   config.configure_rspec_metadata!
   config.allow_http_connections_when_no_cassette = false

data/spec/support/exit_code_matches.rb

@@ -0,0 +1,37 @@
+RSpec::Matchers.define :terminate do |code|
+  actual = nil
+
+  def supports_block_expectations?
+    true
+  end
+
+  match do |block|
+    begin
+      block.call
+    rescue SystemExit => e
+      actual = e.status
+    end
+    actual and actual == status_code
+  end
+
+  chain :with_code do |status_code|
+    @status_code = status_code
+  end
+
+  failure_message do |block|
+    "expected block to call exit(#{status_code}) but exit" +
+      (actual.nil? ? " not called" : "(#{actual}) was called")
+  end
+
+  failure_message_when_negated do |block|
+    "expected block not to call exit(#{status_code})"
+  end
+
+  description do
+    "expect block to call exit(#{status_code})"
+  end
+
+  def status_code
+    @status_code ||= 0
+  end
+end

data/spec/wss_agent/cli_spec.rb

@@ -28,23 +28,24 @@ describe WssAgent::CLI, vcr: true  do
   end
 
   context 'update' do
-    let(:output) { capture(:stdout) { subject.update } }
     context 'when not found token' do
-      it 'should display error message' do
-        expect(output).to eq("\e[1;31m\"Can't find Token, please add your Whitesource API token in the wss_agent.yml file\"\e[0m\n")
+      let(:output) { capture(:stdout) { subject.update } }
+      it 'should display results' do
+        expect(WssAgent::Specifications).to receive(:update).and_return(double('result', success?: true))
+        expect{ output }.to terminate.with_code(0)
       end
     end
-    it 'should display results' do
-      expect(WssAgent::Specifications).to receive(:update).and_return([])
-      expect(output).to eq("")
-    end
   end
 
   context 'check_policies' do
     let(:output) { capture(:stdout) { subject.check_policies } }
     it 'should display results' do
-      expect(WssAgent::Specifications).to receive(:check_policies).and_return([])
-      expect(output).to eq("")
+      expect(
+        WssAgent::Specifications
+      ).to receive(:check_policies).and_return(
+             double('result', success?: true, policy_violations?: true)
+           )
+      expect { output }.to terminate.with_code(1)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wss_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Maxim Pechnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -305,6 +305,7 @@ files:
 - spec/fixtures/vcr_cassettes/WssAgent_Specifications/_update/when_check_policies_is_true/and_check_policies_returns_without_a_violation/should_update_inventory.yml
 - spec/fixtures/wss_agent.yml
 - spec/spec_helper.rb
+- spec/support/exit_code_matches.rb
 - spec/wss_agent/cli_spec.rb
 - spec/wss_agent/client_spec.rb
 - spec/wss_agent/configure_spec.rb
@@ -354,8 +355,8 @@ test_files:
 - spec/fixtures/vcr_cassettes/WssAgent_Specifications/_update/when_check_policies_is_true/and_check_policies_returns_without_a_violation/should_update_inventory.yml
 - spec/fixtures/wss_agent.yml
 - spec/spec_helper.rb
+- spec/support/exit_code_matches.rb
 - spec/wss_agent/cli_spec.rb
 - spec/wss_agent/client_spec.rb
 - spec/wss_agent/configure_spec.rb
 - spec/wss_agent/specifications_spec.rb
-has_rdoc: