res 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9de4ed8f0de1b609819a546d41a75519667ccb8
-  data.tar.gz: a2be68478e937ff44dfdde6f525bebe2d85666e9
+  metadata.gz: b986b0f17b7b9aad06b6e35f9418670af1bbdb11
+  data.tar.gz: 8a5332a148de9511660da0b0a9455bbb14e5727d
 SHA512:
-  metadata.gz: 75889fec1660375681a80fffe8490cb9c03b9d6fe3e0fb9ab40b3da852cbe79b896a1079bcb0a9ba1b938d827ab1615beff3ee64be53a0d0d19fdbd2df217ec0
-  data.tar.gz: ab54551c0fc918f84e4740d14d629305c21f475a466e4d1726785d475833b6944a71910ba0a11109d1e79b7f89a150421a1c3c5f79000b55fe0d1fb82ca990cd
+  metadata.gz: 69894b149c73ac34a736452fe3ef8c2e16b8d9f1f9858fd4b05c793a4ce7303ad98525f89c8095011255a947c71c6e84b05fc53955c55fb494f5db93c3298ca1
+  data.tar.gz: 1121aa1fc81a2795f19e600426b389447647853aa9af49efa4e4c1aabe8277429da32b76477ad2b58904452f69bd5c9a53b58ab6f648b08b3ee2f380c4ce4adb

data/lib/res/ir.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Res
   class IR
-    attr_accessor :hash, :results, :type, :start_time, :end_time, :world
+    attr_accessor :hash, :results, :type, :start_time, :end_time, :world, :values
     attr_accessor :project, :suite, :target, :hive_job_id
  
     def self.load(file)
@@ -21,8 +21,28 @@ module Res
       @type        = options[:type]        or raise "No type provided (e.g. 'Cucumber')"
       @started     = options[:started]     or raise "Need to provide a start time"
       @finished    = options[:finished]    or raise "Need to provide an end time"
+      @values      = initialize_values( options[:values], options[:results] )
     end
-
+    
+    def initialize_values( initial_values, results_hash )
+      h = {}
+      if initial_values && !initial_values.empty?
+        initial_values.each do |k,v|
+          h[k.to_s] = v
+        end
+      end
+      
+      IR.find_values( results_hash ).each do |i|
+        if !i.empty?
+          i.each do |k,v|
+            h[k.to_s] = v
+          end           
+        end
+      end
+      
+      h
+    end
+    
     # Dump as json
     def json
       hash = {
@@ -60,6 +80,20 @@ module Res
     
     private
     
+    # Recursive function for retrieving values in nodes
+    def self.find_values(nodes)
+      value_hashes = []
+      nodes.each do |n|
+        if n[:values]
+          value_hashes << n[:values]
+        end
+        if n[:children]
+          value_hashes += IR.find_values(n[:children])
+        end
+      end
+      value_hashes
+    end
+    
     # Recursive function for retrieving test nodes
     def self.find_tests(nodes)
       tests = []

data/lib/res/reporters/lion.rb

@@ -18,22 +18,6 @@ module Res
         status = "failed"
         status = "passed" if ir.tests.count == ir.count(:passed)
 
-        count = 0
-        values = Array.new
-        while count < ir.tests.count
-          values[count] = ir.tests[count][:values]
-          count += 1
-        end
-       
-        perf_values = {}
-        ir.tests.collect do |t|
-          if values = t[:values]
-            values.each do |k,v|
-              perf_values[k] = v if v.is_a? Numeric
-            end
-          end
-        end
-
         # Set Lion Data
         lion_data = {
           :app_name => config.app_name,
@@ -44,7 +28,7 @@ module Res
           :started => ir.results.first[:started],
           :finished => ir.results.last[:finished],
           :status => status,
-          :measures => perf_values
+          :measures => ir.values
         }
         
         

data/lib/res/version.rb

@@ -1,3 +1,3 @@
 module Res
-  VERSION = '1.2.9'
+  VERSION = '1.2.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - BBC