cxxproject 0.5.68 → 0.5.69

data/lib/cxxproject/errorparser/error_parser.rb

@@ -26,10 +26,8 @@ module Cxxproject
         SEVERITY_INFO
       elsif str.downcase == "warning"
         SEVERITY_WARNING
-      elsif str.downcase == "error" 
-        SEVERITY_ERROR
       else
-        raise "Unknown severity: #{str}"
+        SEVERITY_ERROR
       end
     end
     

data/lib/cxxproject/errorparser/keil_linker_error_parser.rb

@@ -4,26 +4,21 @@ module Cxxproject
   class KeilLinkerErrorParser < ErrorParser
 
     def initialize()
-      @error_exclude = /Finished: [0-9]+ information, [0-9]+ warning and [0-9]+ error messages./
+      @error_expression = /([^:]+): (L[0-9]+[A-Z]: .+)/
     end
 
     def scan_lines(consoleOutput, proj_dir)
       res = []
       consoleOutput.each_line do |l|
         l.rstrip!
-        scan_res = l.scan(@error_exclude)
         d = ErrorDesc.new
-        if scan_res.length == 0
+        scan_res = l.scan(@error_expression)
+        if scan_res.length > 0
           d.file_name = proj_dir
           d.line_number = 0
-          d.message = l
-          if l.length == 0
-            d.severity = SEVERITY_OK
-          elsif l.include?" Warning:" 
-            d.severity = SEVERITY_WARNING
-          else
-            d.severity = SEVERITY_ERROR
-          end
+          d.message = scan_res[0][1]
+          d.severity = get_severity(scan_res[0][0])
+          error_severity = d.severity
         end
         res << d
       end

data/lib/cxxproject/version.rb

@@ -1,7 +1,7 @@
 module Cxxproject
   class Version
     def self.cxxproject
-      "0.5.68"
+      "0.5.69"
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: cxxproject
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.68
+  version: 0.5.69
 platform: ruby
 authors: 
 - oliver mueller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-09-09 00:00:00 Z
+date: 2013-09-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: highline