wss_agent 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ad1e711f699f18be6a05b2a369ee188ea659c28
-  data.tar.gz: 735adf1d078320d844bd1e07cdb8652dd085ac2d
+  metadata.gz: 4aa441c8a0cc500e8e0ead1f0c09dbc01624581c
+  data.tar.gz: c2fe89302d7c099c0961ebd36969fe4da4cd8e9a
 SHA512:
-  metadata.gz: cea5bba0c253e28e9d5f18ab3a833cfe4c353df179b843675a1308a8cb58e1b3deccaf8af95855a443ea1f2661e1ed04b2b3f6f94c62dc6f69d95b3d5d59033b
-  data.tar.gz: 36b32524a8e165d596f28ad8243b4a0e0abcf92a5119136084bbde350aef87ba8358ec1a160233a60502e7e3f2ffabbcf3d6e9ed831cc390ae633d33e6571622
+  metadata.gz: bf27a14d2bd2c649e3986277fdf9d2310ae82a059c3f931da196cebb9a30852606b8598800c47340ddf26c152f4a58af7e2c6763a2dd3195cbc61ce7561a0d6d
+  data.tar.gz: 47c3fbe7778fd1335f705a9c490d33610c022ec43d33023ab49192920ad747fa99c5780bfac82232022de554f1ac07624ceb186f809ef64a7d5bcaa193101e8c

data/lib/wss_agent/cli.rb

@@ -17,10 +17,10 @@ module WssAgent
       results = Specifications.list(options)
       ap results
     rescue Bundler::GemfileNotFound => ex
-      ap ex.message
+      ap ex.message, color: { string: :red }
     rescue Bundler::GemNotFound => ex
-      ap ex.message
-      ap "Could you execute 'bundle install' before"
+      ap ex.message, color: { string: :red }
+      ap "Could you execute 'bundle install' before", color: { string: :red }
     end
 
     desc 'update', 'update open source inventory'
@@ -31,7 +31,7 @@ module WssAgent
       WssAgent.enable_debug! if options['verbose']
       Specifications.update(options)
     rescue => ex
-      ap ex.message
+      ap ex.message, color: { string: :red }
     end
 
     desc 'check_policies', 'checking dependencies that they conforms with company policy.'

data/lib/wss_agent/configure.rb

@@ -32,11 +32,17 @@ module WssAgent
       end
 
       def current
-        if defined?(Bundler) && File.exist?(current_path)
-          default.merge(YAML.load(File.read(current_path)))
-        else
-          default
+        unless File.exist?(current_path)
+          return raise NotFoundConfigFile, "Config file isn't exist. Could you please run 'wss_agent config' before."
+        end
+
+        @current_config = YAML.load(File.read(current_path))
+
+       unless !!@current_config
+          return raise InvalidConfigFile, "Problem reading wss_agent.yml, please check the file is a valid YAML"
         end
+
+        default.merge(@current_config)
       end
 
       def uri
@@ -45,6 +51,9 @@ module WssAgent
           raise ApiUrlNotFound, "Can't find the url, please add your Whitesource url destination in the wss_agent.yml file."
         end
         URI(@url)
+
+      rescue URI::Error
+        raise ApiUrlInvalid, "Api url is invalid. Could you please check url in wss_agent.yml"
       end
 
       def port

data/lib/wss_agent/project.rb

@@ -13,11 +13,10 @@ module WssAgent
     end
 
     def project_version
-      case
-      when is_gem?
+      if is_gem?
         gem.version.to_s
       else
-        '0.0.0'
+        ''
       end
     end
 

data/lib/wss_agent/specifications.rb

@@ -49,7 +49,8 @@ module WssAgent
           WssAgent.logger.debug result.data
           puts result.message
         else
-          ap "synchronization errors occur: status: #{result.status}, message: #{result.message}"
+          WssAgent.logger.debug "synchronization errors occur: status: #{result.status}, message: #{result.message}, data: #{result.data}"
+          ap "error: #{result.status}/#{result.data}", color: {string: :red }
         end
 
         result.success?
@@ -65,7 +66,8 @@ module WssAgent
           WssAgent.logger.debug result.data
           puts result.message
         else
-          ap "check policies errors occur: #{result.status}, message: #{result.message}, data: #{result.data}"
+          WssAgent.logger.debug "check policies errors occur: #{result.status}, message: #{result.message}, data: #{result.data}"
+          ap "error: #{result.status}/#{result.data}", color: {string: :red }
         end
       end
 

data/lib/wss_agent/version.rb

@@ -1,4 +1,4 @@
 module WssAgent
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
   NAME = 'wss_agent'
 end

data/lib/wss_agent.rb

@@ -27,8 +27,11 @@ module WssAgent
     end
   end
 
+  class NotFoundConfigFile  < WssAgentError; status_code(8) ; end
+  class InvalidConfigFile   < WssAgentError; status_code(9) ; end
   class TokenNotFound       < WssAgentError; status_code(10) ; end
   class ApiUrlNotFound      < WssAgentError; status_code(11) ; end
+  class ApiUrlInvalid       < WssAgentError; status_code(12) ; end
 
   def self.logger
     @logger ||= Yell.new STDOUT, level: [:info]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wss_agent
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Maxim Pechnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-27 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler