res 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1faaf3f83f2032befcd21d325961900df987b67d
-  data.tar.gz: c346637e360267722da74951ba8b97574933bc8a
+  metadata.gz: 57a6d7960a73b04fc8fbd1ceabc329dcea135f17
+  data.tar.gz: d8fbb6204ef84a204298eef60bfa39601491bcd3
 SHA512:
-  metadata.gz: f6b8b77d0267f8682c050db1251959e594e3225f0b31bfa20ad600e657861a5106d5b2ca4c960569de4195d185e48c5bb67a0b7566905b69d990bfc9dfee418d
-  data.tar.gz: eb60be622904ec78521e5680f5ff66448fb968937d9efd8c6edd485b9297e5630232523143a0a9590a63300ac9e6b10d815d3071fa0fb5f4efb31a24508b8638
+  metadata.gz: e387461aeb1c6c9d5d5cdad5c5477bd8ccd6d9200bd6c083f05f32a10c63d7492acdd3fa0596f00a862a15e57c5cdeef057ece8b2cb6f7657d59b0121dbaf7ee
+  data.tar.gz: b25530ad6a38fa06450909365de8ceb8d58ca6385473918cc34f3a6660c27f4978839f973db2cd79ccd024a6eff5337dd1da374c30b05404062f629cfde16a00

data/README.md

@@ -35,13 +35,11 @@ You can dump a Res IR results file using a cucumber formatter or parse xunit out
 
     rspec -f Res::Formatters::Rspec -o ./rspec.res
     
-## Junit
+## Android Junit (output from Instruments test), Junit and Casper
 
-    res.rb --junit '/path/to/xunit_result.xml'
-Note: The Res output of the xunit parser is saved in the current directory
-
-## Casper
-    res.rb --junitcasper '/path/to/xunit_result.xml'
+    res --android_junit '/path/to/instruments.out'
+    res --junit '/path/to/xunit_result.xml'
+    res --junitcasper '/path/to/xunit_result.xml'
 Note: The Res output of the xunit parser is saved in the current directory
 
 ## Reporters
@@ -52,7 +50,7 @@ tool.
 
 If you have a Res IR file, you can submit using a reporter: 
 
-    res.rb --res '/path/to/file.res' --submit REPORTER [... options]
+    res --res '/path/to/file.res' --submit REPORTER [... options]
 
 ### Hive
 
@@ -67,7 +65,7 @@ Hive CI uses a Res reporter for result submission, the api arguments look like t
 
 ### TestRail
 
-    res.rb --res '/path/to/file.res' --submit testrail --config-file '/path/to/.test_rail.yaml'
+    res --res '/path/to/file.res' --submit testrail --config-file '/path/to/.test_rail.yaml'
 
 Our TestRail reporter currently be used to sync a suite with TestRail, and
 to submit test results against a test run. You will need to create a

data/bin/res

@@ -6,6 +6,7 @@ require 'res/ir'
 require 'res/reporters/testmine'
 require 'res/reporters/test_rail'
 require 'res/reporters/hive'
+require 'res/reporters/lion'
 require 'res/parsers/junit'
 require 'res/parsers/android_junit'
 require 'res/parsers/junitcasper'
@@ -89,6 +90,11 @@ class CLIParser
         options.target = target
       end
 
+      opts.on_tail("-V", "--res_version", "Display the version of Res") do
+        puts Res::VERSION
+        exit
+      end
+
       opts.on_tail("-h", "--help", "Display help") do
         puts opts
         exit
@@ -158,6 +164,15 @@ if options.reporter
           :ir          => ir
       )
 
+      output = reporter.submit_results(ir)
+      puts output
+    when 'lion'
+      reporter = Res::Reporters::Lion.new(
+          :config_file => options.config_file,
+          :url         => options.url,
+          :ir          => ir
+      )
+
       output = reporter.submit_results(ir)
       puts output
     else

data/lib/res.rb

@@ -26,6 +26,11 @@ module Res
       when :testmine
         require 'res/reporters/testmine'
         Res::Reporters::Testmine
+      when :lion
+        require 'res/reporters/lion'
+        Res::Reporters::Lion
+      else 
+        raise "Invalid Reporter type"
     end
   end
 

data/lib/res/formatters/rspec.rb

@@ -65,11 +65,11 @@ module Res
         set_status(result, test.metadata[:location], status)
       end
 
-        def add_result(test)
-       return { 
-          "type": "Rspec::Test",
-          "name": test[:description],
-          "urn": test[:location],
+      def add_result(test)
+        {
+          type: "Rspec::Test",
+          name: test[:description],
+          urn: test[:location]
         }
       end
 
@@ -123,7 +123,7 @@ module Res
         @ir = ::Res::IR.new( :type        => 'Rspec',
                             :started     => @start_time,
                             :results     => result,
-                            :finished    => Time.now(),
+                            :finished    => Time.now()
                             )
       end
 

data/lib/res/parsers/junitcasper.rb

@@ -20,7 +20,7 @@ module Res
           create_multiple_test_suite(test_suites)
         end
         ir = ::Res::IR.new(:type => 'Casper',
-                           :started => "",
+                           :started => Time.now(),
                            :finished => Time.now(),
                            :results => @test_suites
         )

data/lib/res/reporters/lion.rb

@@ -0,0 +1,56 @@
+require 'res/config'
+
+module Res
+  module Reporters
+    class Lion
+
+      attr_accessor :url, :config
+
+      def initialize(args)
+        @url = args[:url]
+        @config = Res::Config.new([:url, :tag, :description, :app_name],
+                                  :optional => [:hive_job_id, :queue],
+                                  :pre_env  => 'LION_')
+        config.process(args)
+      end
+
+      def submit_results(ir, args = nil)
+        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
+ 
+        # Set Lion Data
+        lion_data = {
+          :app_name => config.app_name,
+          :tag => config.tag,
+          :description => config.description,
+          :queue_name => ENV["HIVE_QUEUE_NAME"] || config.queue,
+          :type => ir.type,
+          :started => ir.results.first[:started],
+          :finished => ir.results.last[:finished],
+          :status => status,
+          :perf_values => values.compact!
+        }
+        uri = URI.parse(config.url)
+        net = Net::HTTP.new(uri.host, uri.port)
+        request = Net::HTTP::Post.new("/import")
+        request.set_form_data(lion_data)
+
+        net.read_timeout = 60
+        net.open_timeout = 10
+
+        response = net.start do |http|
+          http.request(request)
+        end
+      end
+
+    end
+  end
+end
+

data/lib/res/version.rb

@@ -0,0 +1,3 @@
+module Res
+  VERSION = '1.2.3'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -104,8 +104,10 @@ files:
 - lib/res/parsers/junit.rb
 - lib/res/parsers/junitcasper.rb
 - lib/res/reporters/hive.rb
+- lib/res/reporters/lion.rb
 - lib/res/reporters/test_rail.rb
 - lib/res/reporters/testmine.rb
+- lib/res/version.rb
 homepage: https://github.com/bbc/res
 licenses:
 - MIT
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries