buildlogparser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 849b9a478c2b1ca8fef07c1c69f206228a000529
-  data.tar.gz: c7392cdde7bf9e63177104e85cc04d2ac992f1cf
+  metadata.gz: 59cd5db3c32fbaa1661e52339556610ed8d2421b
+  data.tar.gz: 50684c3e7a2fa6581485d61a132b4a5f762a2efa
 SHA512:
-  metadata.gz: fc3679e532cc26b9e6dc4bf7489f4e6393c77bb0583bf5706ff3922dfca3e561a7c8f23f428c11eac8c22c9815a94353f515be546da8de84d9bb558923423397
-  data.tar.gz: bc50f3040d3beaaa33260c194d889755118876bfaeebaf4d9cb8759104fed548e7ab37b3a3beed6581ec9dcf96350ff70eb31aff8f48e8b193b454df5e576ef6
+  metadata.gz: ebd7d3882c3f94abc29485ede40d3a3f9c9c3d606c029f77b1dc0f51c08c0ac9d78a8196ed8e8284529767df4b6f538b5acd976972ed85053fc8883065985e9f
+  data.tar.gz: 5a820e1a61ee9d92148288e05aee4ac6c7971dc1d53e73c32f3a1318d445d7dc0a3b0d2c2b8ebb844d6764d9bc9f24621fd26ea4c2c5e2aaae49ff757c34da92

data/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+## v0.2.0 (28.10.2017)
+
+* Added support for parsing *coremark* command line output
+* Added support for parsing *dhrystone* command line output
+* [ctest] Fixed parsing of regex errors in the command line output
+* [cmake] Fixed parsing of non empty text which does not match
+* [size] Fixed parsing of non empty text which does not match
+
+## v0.1.0 (Unreleased)
+
+* Added support for parsing *cmake* generated makefile command line output
+* Added support for parsing *ctest* command line output
+* Added support for parsing *ctest* generated `LastTest.log` files
+* Added support for parsing *size* command line output in Berkeley format

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 Mario Werner
+Copyright (c) 2017 Mario Werner <nioshd@gmail.com>
 
 MIT License
 

data/README.md

@@ -1,3 +1,4 @@
+[![Gem Version](https://badge.fury.io/rb/buildlogparser.svg)](https://rubygems.org/gems/buildlogparser)
 [![Build Status](https://travis-ci.org/niosHD/buildlogparser.svg?branch=develop)](https://travis-ci.org/niosHD/buildlogparser)
 [![codecov](https://codecov.io/gh/niosHD/buildlogparser/branch/develop/graph/badge.svg)](https://codecov.io/gh/niosHD/buildlogparser)
 
@@ -8,4 +9,6 @@ Collection of various parsers for the extraction of information from build and e
 ## Tested Program Versions 
 
 * cmake/ctest 3.5.1
+* coremark 1.0
+* dhrystone (C Version) 2.1 and 2.2
 * size (GNU Binutils 2.26.1)

data/lib/buildlogparser.rb

@@ -1,6 +1,28 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require "buildlogparser/parser"
 require "buildlogparser/parsers/cmake"
+require "buildlogparser/parsers/coremark"
 require "buildlogparser/parsers/ctest"
+require "buildlogparser/parsers/dhrystone"
 require "buildlogparser/parsers/size"
 
 require "buildlogparser/version"

data/lib/buildlogparser/parser.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 module BuildLogParser
   class Parser
     attr_reader :logtext

data/lib/buildlogparser/parsers/cmake.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'parslet'
 
 module BuildLogParser
@@ -41,7 +61,7 @@ module BuildLogParser
         targetendline.as(:targetend)
       end
 
-      rule(:start) { (target | (restofline >> newline).as(:drop)).repeat.as(:array) }
+      rule(:start) { (target | (restofline >> newline | any).as(:drop)).repeat.as(:array) }
       root(:start)
     end # class Parser
 

data/lib/buildlogparser/parsers/coremark.rb

@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'parslet'
+
+module BuildLogParser
+  module Coremark
+    class Parser < Parslet::Parser
+      rule(:space)     { match['\s'] }
+      rule(:space?)    { space.repeat }
+
+      rule(:newline)   { str("\r").maybe >> str("\n") }
+      rule(:restofline){ ( newline.absent? >> any ).repeat }
+
+      rule(:integer)   { match['0-9'].repeat(1) }
+      rule(:float)     { integer >> (match['\.,'] >> integer).maybe }
+
+      rule(:event) do
+        str('CoreMark Size') >> space? >> str(':') >> space? >> integer.as(:coremark_size) >> newline >>
+        str('Total ticks') >> space? >> str(':') >> space? >> integer.as(:total_ticks) >> newline >>
+        str('Total time (secs)') >> space? >> str(':') >> space? >> float.as(:time_sec) >> newline >>
+        str('Iterations/Sec') >> space? >> str(':') >> space? >> float.as(:iterations_per_sec) >> newline >>
+        str('Iterations') >> space? >> str(':') >> space? >> integer.as(:iterations) >> newline >>
+        str('Compiler version') >> space? >> str(':') >> space? >> restofline.as(:compiler_version) >> newline >>
+        str('Compiler flags') >> space? >> str(':') >> space? >> restofline.as(:compiler_flags) >> newline >>
+        str('Memory location') >> space? >> str(':') >> space? >> restofline.as(:memory_location)
+      end
+
+      rule(:start) { (event | (restofline >> newline | any).as(:drop)).repeat.as(:array) }
+      root(:start)
+    end # class Parser
+
+    class Transform < Parslet::Transform
+      rule(:drop => subtree(:tree)) { }
+      rule(:coremark_size => simple(:coremark_size), :total_ticks => simple(:total_ticks), :time_sec => simple(:time_sec), :iterations_per_sec => simple(:iterations_per_sec), :iterations => simple(:iterations), :compiler_version => simple(:compiler_version), :compiler_flags => simple(:compiler_flags), :memory_location => simple(:memory_location)) do
+        { :coremark_size => Integer(coremark_size), :total_ticks => Integer(total_ticks), :time_sec => Float(time_sec), :iterations_per_sec => Float(iterations_per_sec), :iterations => Integer(iterations), :compiler_version => String(compiler_version), :compiler_flags => String(compiler_flags), :memory_location => String(memory_location) }
+      end
+      rule(:array => subtree(:tree)) { tree.compact.flatten }
+    end # class Transform
+  end # module Coremark
+
+  class CoremarkParser < BuildLogParser::Parser
+    attr_reader :data
+
+    def reset()
+      super()
+       @data = []
+    end
+
+    def parse(logtext)
+      reset()
+      @logtext = logtext
+      parser = Coremark::Parser.new
+      tree = parser.parse(logtext)
+      @data = Coremark::Transform.new.apply(tree)
+    end
+  end # class CMakeParser
+end # module BuildLogParser

data/lib/buildlogparser/parsers/ctest.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'parslet'
 
 module BuildLogParser
@@ -16,9 +36,11 @@ module BuildLogParser
       rule(:integer)   { match['0-9'].repeat(1) }
       rule(:float)     { integer >> (match['\.,'] >> integer).maybe }
 
+      rule(:regexError) { str('Required regular expression not found.Regex=[') >> match['^\]'].repeat(1) >> str(']') >> space? }
+
       rule(:event) do
         space? >> integer.as(:nr) >> str('/') >> integer.as(:total_nr) >> space? >> str('Test') >> space? >> str('#') >>
-        integer >> str(': ') >> letters.as(:name) >> match['\.*\s'].repeat(1) >> letters.as(:result) >> space? >>
+        integer >> str(': ') >> letters.as(:name) >> match['\.*\s'].repeat(1) >> letters.as(:result) >> space? >> regexError.maybe >>
         float.as(:time_sec) >> anyline
       end
 

data/lib/buildlogparser/parsers/dhrystone.rb

@@ -0,0 +1,82 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+require 'parslet'
+
+module BuildLogParser
+  module Dhrystone
+    class Parser < Parslet::Parser
+      rule(:space)     { match['\s'] }
+      rule(:space?)    { space.repeat }
+
+      rule(:newline)   { str("\r").maybe >> str("\n") }
+      rule(:restofline){ ( newline.absent? >> any ).repeat }
+
+      rule(:path)      { match['[:alnum:]0-9=\+\.\-_/'].repeat(1) }
+      rule(:integer)   { match['0-9'].repeat(1) }
+      rule(:float)     { integer >> (match['\.,'] >> integer).maybe }
+
+      rule(:version) { str('Version') >> space? >> float.as(:version) }
+      rule(:run)     { integer.as(:run) >> space? >> str('runs through Dhrystone') }
+      rule(:usec_per_run)       { str('Microseconds for one run through Dhrystone:') >> space? >> float.as(:usec_per_run) }
+      rule(:dhrystones_per_sec) { str('Dhrystones per Second:')  >> space? >> float.as(:dhrystones_per_sec) }
+      rule(:total_ticks)        { str('Total ticks:') >> space? >> integer.as(:total_ticks) }
+
+      rule(:target) do
+        str('Dhrystone Benchmark,') >>
+        ( version.absent? >> any ).repeat >> version >>
+        (( run.absent? >> any ).repeat >> run).repeat(1).as(:runs) >>
+          (( usec_per_run.absent? >> any ).repeat >> usec_per_run >> ( dhrystones_per_sec.absent? >> any ).repeat >> dhrystones_per_sec |
+           ( total_ticks.absent? >> any ).repeat >> total_ticks)
+      end
+
+      rule(:start) { (target | (restofline >> newline | any).as(:drop)).repeat.as(:array) }
+      root(:start)
+    end # class Parser
+
+    class Transform < Parslet::Transform
+      rule(:drop => subtree(:tree)) { }
+      rule(:version => simple(:version), :runs => subtree(:runs), :usec_per_run => simple(:usec_per_run), :dhrystones_per_sec => simple(:dhrystones_per_sec)) do
+        { :version => String(version), :runs => Integer(runs[-1][:run]), :usec_per_run => Float(usec_per_run), :dhrystones_per_sec => Float(dhrystones_per_sec) }
+      end
+      rule(:version => simple(:version), :runs => subtree(:runs), :total_ticks => simple(:total_ticks)) do
+        { :version => String(version), :runs => Integer(runs[-1][:run]), :total_ticks => Integer(total_ticks) }
+      end
+      rule(:array => subtree(:tree)) { tree.compact.flatten }
+    end # class Transform
+  end # module Dhrystone
+
+  class DhrystoneParser < BuildLogParser::Parser
+    attr_reader :data
+
+    def reset()
+      super()
+       @data = []
+    end
+
+    def parse(logtext)
+      reset()
+      @logtext = logtext
+      parser = Dhrystone::Parser.new
+      tree = parser.parse(logtext)
+      @data = Dhrystone::Transform.new.apply(tree)
+    end
+  end # class CMakeParser
+end # module BuildLogParser

data/lib/buildlogparser/parsers/size.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 require 'parslet'
 
 module BuildLogParser
@@ -25,7 +45,7 @@ module BuildLogParser
         hexnumber.as(:hex) >> space? >> path.as(:filename) >> newline
       end
 
-      rule(:start) { ((header >> event.repeat(1)).as(:array) | (restofline >> newline).as(:drop)).repeat.as(:array) }
+      rule(:start) { ((header >> event.repeat(1)).as(:array) | (restofline >> newline | any).as(:drop)).repeat.as(:array) }
       root(:start)
     end # class Parser
 

data/lib/buildlogparser/version.rb

@@ -1,7 +1,27 @@
+#
+# Copyright (C) 2017 Mario Werner <nioshd@gmail.com>
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 module BuildLogParser
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: buildlogparser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Mario Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -111,7 +112,9 @@ files:
 - lib/buildlogparser.rb
 - lib/buildlogparser/parser.rb
 - lib/buildlogparser/parsers/cmake.rb
+- lib/buildlogparser/parsers/coremark.rb
 - lib/buildlogparser/parsers/ctest.rb
+- lib/buildlogparser/parsers/dhrystone.rb
 - lib/buildlogparser/parsers/size.rb
 - lib/buildlogparser/version.rb
 homepage: https://github.com/niosHD/buildlogparser