benchcc 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac43c2d0f69a588cc946b3b4694369b8557e6d2b
-  data.tar.gz: 0ffb3562be2ed2a3376c5b595c8df9bf726142d3
+  metadata.gz: e1265188ac7addbc5b64c2333c04a01188169fd1
+  data.tar.gz: a4c62779f8f2cbe87e18de0dd3bf9ac3f965be3b
 SHA512:
-  metadata.gz: 9d10754cb8c6c499c9125b8e015e6baebc7edbd9cd9a68bb9eacbd369cbd0e1d954756ad27f6cb6b55c099ec3fc1dc9b1daad85cdc96b94b97aee995cc3b4cf4
-  data.tar.gz: 93bb0a5d5d111dc4ff88e9689a71f89556986b880eeb2a3608c46783bffc8761b46eede21fe0d6284df13e0d5d489c8a9a875f90a9dbcd3325e7c3f1b264552d
+  metadata.gz: 82fb539a1f350af27c819e0fc6446b7b45a49e4a8e0e3cf5a5ba349ccf60981c97d3c9ffcdd7812b209f757f7f08da458d461f6d86731da136dcedd5e53fc4b9
+  data.tar.gz: 8c5e23eeb3468af278b08a88d3454123ea96b9f477d211b2ab11fe993c7ccb010abcac750e7837f66406a3c1448a5741e344652278b4a94dce808f0783194385

data/lib/benchcc/compiler.rb

@@ -24,20 +24,12 @@ module Benchcc
   ) do
     def to_s
       <<-EOS
-command line: #{command_line}
-compilation time: #{wall_time}
-peak memory usage: #{peak_memusg}
-#{'=' * 30} [begin code] #{'=' * 30}
-#{code}
-#{'=' * 30} [end code] #{'=' * 30}
-
-#{'=' * 30} [begin stdout] #{'=' * 30}
-#{stdout}
-#{'=' * 30} [end stdout] #{'=' * 30}
-
-#{'=' * 30} [begin stderr] #{'=' * 30}
+> #{command_line}
 #{stderr}
-#{'=' * 30} [end stderr] #{'=' * 30}
+
+[compiling:
+#{code}
+]
 EOS
     end
   end
@@ -110,7 +102,23 @@ EOS
       raise CompilationError.new(result) unless status.success?
 
       result.peak_memusg = stderr.match(/(\d+)\s+maximum/)[1].to_i
-      result.wall_time = stderr.match(/.+Total/).to_s.split[-3].to_f
+
+      section = -> (title) {
+        title.gsub!(' ', '\s')
+        /(
+            ===-+===\n
+            .*#{title}.*\n
+            ===-+===\n
+            (.|\n)+?(?====)
+        )|(
+            ===-+===\n
+            .*#{title}.*\n
+            ===-+===\n
+            (.|\n)+
+        )/x
+      }
+      result.wall_time = stderr.match(section["Miscellaneous Ungrouped Timers"])
+                               .to_s.match(/(\d+\.?\d+).+?Total/)[1]
       return result
     end
 

data/lib/benchcc/version.rb

@@ -1,3 +1,3 @@
 module Benchcc
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/spec/compiler_spec.rb

@@ -30,16 +30,22 @@ describe Benchcc::Compiler do
 
   describe :guess_from_binary do
     it('can guess clang') {
-      expect(Benchcc::Compiler.guess_from_binary(`which clang`.strip)).to be_instance_of(Benchcc::Clang)
+      expect(
+        Benchcc::Compiler.guess_from_binary(`which clang`.strip)
+      ).to be_instance_of(Benchcc::Clang)
     }
 
     # GCC is aliased to clang on OSX, so this test fails.
     # it('can guess gcc') {
-    #   expect(Benchcc::Compiler.guess_from_binary(`which gcc`.strip)).to be_instance_of(Benchcc::GCC)
+    #   expect(
+    #     Benchcc::Compiler.guess_from_binary(`which gcc`.strip)
+    #   ).to be_instance_of(Benchcc::GCC)
     # }
 
     it('fails otherwise') {
-      expect { Benchcc::Compiler.guess_from_binary('not_a_compiler') }.to raise_error
+      expect {
+        Benchcc::Compiler.guess_from_binary('not_a_compiler')
+      }.to raise_error
     }
   end
 end
@@ -60,7 +66,9 @@ end
       }
 
       it('returns statistics on valid input') {
-        expect(@cc.compile_file(@valid, '-o /dev/null')).to be_instance_of(Benchcc::CompilationResult)
+        expect(
+          @cc.compile_file(@valid, '-o /dev/null')
+        ).to be_instance_of(Benchcc::CompilationResult)
       }
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchcc
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Louis Dionne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gnuplot