wss_agent 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8191195b5796d173199be590828ba7dce4855b46
-  data.tar.gz: dc035cfa389f3822c3b6b02ad83c7ad7a7a3e3e1
+  metadata.gz: 37746ad31b6f21f4c7f708caa09fa025c3c7dfc2
+  data.tar.gz: 7296602265f771c66dfbda7d779609b28d8c0cbe
 SHA512:
-  metadata.gz: 191ca92f09a3b21a36d80d5a8f01f7c07a325c4b9941883b0b4434e4b8771ea9d5d5a62b90a061b77ba9e923390db40ceab70838b0e9d9ad56053fa8db500020
-  data.tar.gz: 90fa398623cddb7e79e6d1034e0478f06787ca8211e3604fd42a2ad3663233e411e08c4d340c871c7d2fc52696adf7007eeebd50f9395250aa57404169fdb575
+  metadata.gz: affacdbb4903237066485beed2500020fa2861196425ea2e79a19e8f1bcaab29842910b8e3530f8d06af24ae804de2896e0fee0fa778784b5f5e33385f484499
+  data.tar.gz: 393b302d06d46a81947a4c389896cb0414352c8d04742969ab245aeda6cc7f91c6edae2834cd3a0482830c033f0cf61f3e59033d95d0c75ee1484181d615168e

data/README.md

@@ -47,6 +47,13 @@ Commands:
 ```bash
 $ wss_agent update
 ```
+
+###### force update
+```bash
+$ wss_agent update --force-update
+```
+or add 'force_update: true' to 'wss_agent.yml'
+
 ### 5) checking dependencies that they conforms with company policy.
 ```bash
 $ wss_agent check_policies

data/lib/wss_agent.rb

@@ -1,7 +1,7 @@
 require 'thor'
 require 'net/http'
 require 'awesome_print'
-require 'yaml'
+require 'psych'
 require 'multi_json'
 require 'faraday'
 require 'faraday_middleware'
@@ -21,6 +21,12 @@ module WssAgent
   DEFAULT_CA_BUNDLE_PATH = File.dirname(__FILE__) + '/data/ca-certificates.crt'
 
   class WssAgentError < StandardError
+    URL_INVALID = 'Api url is invalid. Could you please check url in wss_agent.yml'.freeze
+    CANNOT_FIND_TOKEN = "Can't find Token, please add your Whitesource API token in the wss_agent.yml file".freeze
+    CANNOT_FIND_URL = "Can't find the url, please add your Whitesource url destination in the wss_agent.yml file.".freeze
+    INVALID_CONFIG_FORMAT = 'Problem reading wss_agent.yml, please check the file is a valid YAML'.freeze
+    NOT_FOUND_CONFIGFILE = "Config file isn't exist. Could you please run 'wss_agent config' before.".freeze
+
     def self.status_code(code)
       define_method(:status_code) { code }
     end
@@ -37,6 +43,8 @@ module WssAgent
   end
 
   def self.enable_debug!
-    @logger ||= Yell.new STDOUT, level: [:debug, :info, :warn, :error, :fatal, :unknown]
+    @logger ||= Yell.new(
+      STDOUT, level: [:debug, :info, :warn, :error, :fatal, :unknown]
+    )
   end
 end

data/lib/wss_agent/cli.rb

@@ -29,6 +29,7 @@ module WssAgent
     method_option :excludes, type: :string
     method_option :verbose, aliases: '-v', desc: 'Be verbose'
     method_option :force, type: :boolean, aliases: '-f', desc: 'Force Check All Dependencies'
+    method_option :'force-update', type: :boolean, desc: 'Force Update'
     def update
       WssAgent.enable_debug! if options['verbose']
       result = Specifications.update(options)

data/lib/wss_agent/client.rb

@@ -1,4 +1,6 @@
 module WssAgent
+  # Client class
+  #
   class Client
     attr_accessor :connection
     POLICY_TYPES = {
@@ -16,10 +18,8 @@ module WssAgent
         h.request :url_encoded
         h.adapter :excon
       end
+      Excon.defaults[:ciphers] = 'DEFAULT' if defined?(JRuby)
 
-      if defined?(JRuby)
-        Excon.defaults[:ciphers] = 'DEFAULT'
-      end
       @connection
     end
 
@@ -52,7 +52,7 @@ module WssAgent
 
     def check_policies(gem_list, options = {})
       request_options =
-        if WssAgent::Configure['force_check_all_dependencies'] || options['force']
+        if Configure['force_check_all_dependencies'] || options['force']
           { type: POLICY_TYPES[:compliance], forceCheckAllDependencies: true }
         else
           { type: POLICY_TYPES[:basic], forceCheckAllDependencies: false }
@@ -64,7 +64,7 @@ module WssAgent
     def request(gem_list, options = {})
       WssAgent.logger.debug "request params: #{payload(gem_list, options)}"
 
-      connection.post(WssAgent::Configure.api_path, payload(gem_list, options))
+      connection.post(Configure.api_path, payload(gem_list, options))
     rescue Faraday::Error::ClientError => ex
       ex
     end
@@ -74,18 +74,16 @@ module WssAgent
     def connection_options
       @connection_options ||
         begin
-
           @connection_options = {
-            url: Configure.url,
-            request: { timeout: REQUEST_TIMEOUT }
+            url: Configure.url, request: { timeout: REQUEST_TIMEOUT }
           }
-          if Configure.ssl?
-            @connection_options[:ssl] = {
-              ca_file: WssAgent::DEFAULT_CA_BUNDLE_PATH
-            }
-          end
+          @connection_options[:ssl] = ssl_options if Configure.ssl?
         end
       @connection_options
     end
+
+    def ssl_options
+      { ca_file: WssAgent::DEFAULT_CA_BUNDLE_PATH }
+    end
   end
 end

data/lib/wss_agent/configure.rb

@@ -10,11 +10,16 @@ module WssAgent
 
     class << self
       def default_path
-        File.join(File.expand_path('../..', __FILE__), 'config', DEFAULT_CONFIG_FILE)
+        File.join(
+          File.expand_path('../..', __FILE__), 'config', DEFAULT_CONFIG_FILE
+        )
       end
 
       def custom_default_path
-        File.join(File.expand_path('../..', __FILE__), 'config', CUSTOM_DEFAULT_CONFIG_FILE)
+        File.join(
+          File.expand_path('../..', __FILE__), 'config',
+          CUSTOM_DEFAULT_CONFIG_FILE
+        )
       end
 
       def exist_default_config?
@@ -22,7 +27,7 @@ module WssAgent
       end
 
       def default
-        exist_default_config? ? YAML.load(File.read(default_path)) : {}
+        exist_default_config? ? Psych.safe_load(File.read(default_path)) : {}
       end
 
       def current_path
@@ -31,13 +36,13 @@ module WssAgent
 
       def current
         unless File.exist?(current_path)
-          return raise NotFoundConfigFile, "Config file isn't exist. Could you please run 'wss_agent config' before."
+          return raise NotFoundConfigFile, WssAgentError::NOT_FOUND_CONFIGFILE
         end
 
-        @current_config = YAML.load(File.read(current_path))
+        @current_config = Psych.safe_load(File.read(current_path))
 
-        unless !!@current_config
-          return raise InvalidConfigFile, 'Problem reading wss_agent.yml, please check the file is a valid YAML'
+        unless @current_config
+          return raise InvalidConfigFile, WssAgentError::INVALID_CONFIG_FORMAT
         end
 
         default.merge(@current_config)
@@ -46,12 +51,12 @@ module WssAgent
       def uri
         @url = current['url']
         if @url.nil? || @url == ''
-          raise ApiUrlNotFound, "Can't find the url, please add your Whitesource url destination in the wss_agent.yml file."
+          raise ApiUrlNotFound, WssAgentError::CANNOT_FIND_URL
         end
         URI(@url)
 
       rescue URI::Error
-        raise ApiUrlInvalid, 'Api url is invalid. Could you please check url in wss_agent.yml'
+        raise ApiUrlInvalid, WssAgentError::URL_INVALID
       end
 
       def port
@@ -74,31 +79,29 @@ module WssAgent
       end
 
       def token
-        if current['token'].nil? || (current['token'] == '') || (current['token'] == default['token'])
-          raise TokenNotFound, "Can't find Token, please add your Whitesource API token in the wss_agent.yml file"
+        if current['token'].nil? || (current['token'] == '') ||
+           (current['token'] == default['token'])
+          raise TokenNotFound, WssAgentError::CANNOT_FIND_TOKEN
         else
           current['token']
         end
       end
 
+      def project_meta
+        @project_meta ||= WssAgent::Project.new
+      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.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
-        }
+        { 'artifactId' => coordinates_artifact_id,
+          'version' => coordinates_version }
       end
     end
   end

data/lib/wss_agent/project.rb

@@ -1,6 +1,5 @@
 module WssAgent
   class Project
-
     def project_name
       return gem.name if gem?
       return rails_app_name if rails?

data/lib/wss_agent/response_inventory.rb

@@ -16,7 +16,7 @@ module WssAgent
         if data['updatedProjects'].empty?
           @message << "\n  No projects were updated \n"
         else
-          @message << "  #{data['updatedProjects'].size}  existing projects were updated: "
+          @message << "  #{data['updatedProjects'].size} existing projects were updated: "
           @message << data['updatedProjects'].join(' ')
         end
 

data/lib/wss_agent/response_policies.rb

@@ -28,7 +28,7 @@ module WssAgent
             'List of violations:'
           ]
           @message << policy_violations.each_with_index.map { |j, i|
-            "#{i+1}. Package: #{j['resource']['displayName']} - #{j['policy']['displayName']}"
+            "#{i + 1}. Package: #{j['resource']['displayName']} - #{j['policy']['displayName']}"
           }.join("\n")
           @message.join("\n")
         else

data/lib/wss_agent/specifications.rb

@@ -42,24 +42,25 @@ module WssAgent
       end
       private :check_policy?
 
+      def force_update?(options = {})
+        options['force-update'] ||
+          WssAgent::Configure['force_update']
+      end
+
+      private :force_update?
+
       # Send gem list to server
       #
       # @param (see Specifications#specs)
       def update(options = {})
-        wss_client = WssAgent::Client.new
-
-        if check_policy?(options)
-          policy_results = wss_client.check_policies(
-            WssAgent::Specifications.list(options),
-            options
-          )
-          if policy_results.success? && policy_results.policy_violations?
-            puts policy_results.message
-            return Struct.new(:status) { def success?; status; end; }.new(false)
-          end
+        result = check_policies_for_update(options)
+        if !force_update?(options) && (result.status == :reject)
+          return Struct.new(:status) do
+            alias_method :success?, :status
+          end.new(false)
         end
 
-
+        wss_client = WssAgent::Client.new
         result = wss_client.update(WssAgent::Specifications.list(options))
         if result.success?
           WssAgent.logger.debug result.data
@@ -72,6 +73,22 @@ module WssAgent
         result
       end
 
+      # Check policies before update
+      #
+      # @param (see Specifications#specs)
+      def check_policies_for_update(options = {})
+        return Struct.new(:status).new(:ok) unless check_policy?(options)
+        wss_client = WssAgent::Client.new
+        policy_results = wss_client.check_policies(
+          WssAgent::Specifications.list(options), options
+        )
+        if policy_results.success? && policy_results.policy_violations?
+          puts policy_results.message
+          return Struct.new(:status, :msg).new(:reject, policy_results.message)
+        end
+        Struct.new(:status).new(:ok)
+      end
+
       # checking dependencies that they conforms with company policy.
       #
       # @param (see Specifications#specs)

data/lib/wss_agent/version.rb

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

data/spec/wss_agent/configure_spec.rb

@@ -67,6 +67,24 @@ describe WssAgent::Configure do
     end
   end
 
+  describe '.force_update' do
+    it 'set value to false' do
+      expect(WssAgent::Configure['force_update']).to be_falsey
+    end
+    it 'set value to true' do
+      allow(
+        WssAgent::Configure
+      ).to receive_messages(current: { 'force_update' => true })
+      expect(WssAgent::Configure['force_update']).to be_truthy
+    end
+
+    context 'default value' do
+      it 'should be false' do
+        expect(WssAgent::Configure['force_update']).to be_falsey
+      end
+    end
+  end
+
   describe '.url' do
     context 'when url is empty' do
       before do

data/spec/wss_agent/specifications_spec.rb

@@ -18,6 +18,7 @@ describe WssAgent::Specifications, vcr: true do
       }
     ]
   }
+  let(:default_config) { WssAgent::Configure.default }
 
   describe '.check_policies' do
     let(:success_response) {
@@ -67,12 +68,10 @@ describe WssAgent::Specifications, vcr: true do
     end
 
     context 'when check_policies is true' do
-
-      before {
+      before do
         allow(WssAgent::Client).to receive(:new).and_return(wss_client)
-        allow(WssAgent::Configure).to receive(:current)
-                                       .and_return(WssAgent::Configure.default.merge({'check_policies' => true}))
-      }
+        allow(WssAgent::Configure).to receive(:current).and_return(default_config.merge('check_policies' => true))
+      end
       context 'and check policies return a violation' do
         it 'should not update inventory' do
           allow(policy_success_response).to receive(:policy_violations?).and_return(true)
@@ -81,6 +80,25 @@ describe WssAgent::Specifications, vcr: true do
           res = WssAgent::Specifications.update
           expect(res.success?).to be false
         end
+        context 'and force_update set true' do
+          before do
+            allow(WssAgent::Client).to receive(:new).and_return(wss_client)
+            allow(WssAgent::Configure).to receive(:current).and_return(
+                                            default_config.merge(
+                                              'check_policies' => true,
+                                              'force_update' => true
+                                            )
+                                          )
+          end
+          it 'should be update if update_force is true' do
+            allow(WssAgent::Specifications).to receive(:list).and_return(gem_list)
+            allow(policy_success_response).to receive(:policy_violations?).and_return(true)
+            expect(wss_client).to receive(:check_policies).and_return(policy_success_response)
+            expect(wss_client).to receive(:update).and_return(success_response)
+            res = WssAgent::Specifications.update
+            expect(res.success?).to be_truthy
+          end
+        end
       end
 
       context 'and check policies returns without a violation' do
@@ -100,7 +118,7 @@ describe WssAgent::Specifications, vcr: true do
       before {
         allow(WssAgent::Client).to receive(:new).and_return(wss_client)
         allow(WssAgent::Configure).to receive(:current)
-                                       .and_return(WssAgent::Configure.default.merge({'check_policies' => false}))
+                                       .and_return(default_config.merge({'check_policies' => false}))
       }
       it 'should update inventory' do
         allow(WssAgent::Specifications).to receive(:list).and_return(gem_list)

data/wss_agent.gemspec

@@ -31,8 +31,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'thor', '~> 0.19', '>= 0.19.1'
   spec.add_dependency 'yell', '~> 2.0', '>= 2.0.5'
   spec.add_dependency 'excon', '~> 0.45'
-  spec.add_dependency 'faraday', '~> 0.9', '>= 0.9.1'
-  spec.add_dependency 'faraday_middleware', '~> 0.10'
+  spec.add_dependency 'faraday', '~> 0.12'
+  spec.add_dependency 'faraday_middleware', '~> 0.11.0.1'
   spec.add_dependency 'awesome_print', '~> 1.6', '>= 1.6.1'
   spec.add_dependency 'multi_json', '~> 1.12', '>= 1.12.1'
+  spec.add_dependency 'psych', '~> 2.2', '>= 2.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wss_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - Maxim Pechnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,34 +188,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: 0.11.0.1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -256,6 +250,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.12.1
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.4
 description: White Source agent to sync gems
 email:
 - parallel588@gmail.com