res 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 586b95c6c851fd4eb20f8dda032cde17cc10d992
-  data.tar.gz: 0bfdce187a31989b5eb2985dff449ac431f3d870
+  metadata.gz: 1faaf3f83f2032befcd21d325961900df987b67d
+  data.tar.gz: c346637e360267722da74951ba8b97574933bc8a
 SHA512:
-  metadata.gz: e0d1ef191b529f9fe9a4232d9593d2c7b433149fcf359341017ddf0e035cb817fe241ed4650cff63b7eda3b4c6c8e7379b010c5c0ea81eda2287c654ba4c4017
-  data.tar.gz: 7af1bf45c75d51d8a92fc2f44f73fac3f99f73e2197e64e623898b3073eb0b938f0f61513b4df207f336c98e85b058b90906c359dcf6a3ed079e9a8a09aa409c
+  metadata.gz: f6b8b77d0267f8682c050db1251959e594e3225f0b31bfa20ad600e657861a5106d5b2ca4c960569de4195d185e48c5bb67a0b7566905b69d990bfc9dfee418d
+  data.tar.gz: eb60be622904ec78521e5680f5ff66448fb968937d9efd8c6edd485b9297e5630232523143a0a9590a63300ac9e6b10d815d3071fa0fb5f4efb31a24508b8638

data/README.md

@@ -28,8 +28,8 @@ You can dump a Res IR results file using a cucumber formatter or parse xunit out
 
 ## Cucumber
 
-    cucumber -f pretty -f Res::Formatters::RubyCucumber -o './cucumber.res'
-Note: This cucumber formatter works for cucumber version < 2.0 
+    cucumber -f pretty -f Res::Formatters::RubyCucumber -o './cucumber.res'  (cucumber version < 2.0)
+    cucumber -f pretty -f Res::Formatters::RubyCucumber2 -o './cucumber.res' (cucumber version >= 2.0)
 
 ## Rspec
 

data/bin/res

@@ -7,6 +7,7 @@ require 'res/reporters/testmine'
 require 'res/reporters/test_rail'
 require 'res/reporters/hive'
 require 'res/parsers/junit'
+require 'res/parsers/android_junit'
 require 'res/parsers/junitcasper'
 require 'openssl'
 
@@ -38,6 +39,11 @@ class CLIParser
         options.junit = junit
       end
 
+      opts.on("--android_junit android_junit_output",
+              "Parse Android Junit output to res type") do |android_junit|
+        options.android_junit = android_junit
+      end
+
       opts.on("--junitcasper junit_xml",
               "Parse junit xml to res type") do |junitcasper|
         options.junitcasper = junitcasper
@@ -112,6 +118,11 @@ if options.junitcasper
   ir = Res::IR.load(junit_output.io)
 end
 
+if options.android_junit
+    android_junit_output = Res::Parsers::AndroidJunit.new(options.android_junit)
+    ir = Res::IR.load(android_junit_output.io)
+end 
+
 raise "No results loaded" if !ir
 
 if options.reporter

data/lib/res/parsers/android_junit.rb

@@ -0,0 +1,62 @@
+require 'res/ir'
+
+module Res
+  module Parsers
+    class AndroidJunit
+      attr_accessor :io
+     
+      def initialize(instrument_output)
+        result = Array.new
+        result = parse(instrument_output)
+        ir = ::Res::IR.new( :type        => 'AndroidJUnitRunner', 
+                            :started     => "",
+                            :finished    => Time.now(),
+                            :results     => result
+                            )
+        @io = File.open("./instruments.res", "w")
+        @io.puts ir.json
+        @io.close
+      end
+
+      def parse(output)
+        class_name = Array.new
+        test = Array.new
+        result = Array.new
+        test = {
+          type: "AndroidJUnit::Test",
+          name: 'UNKNOWN',
+          status: "passed"
+        }
+        File.open(output) do |f|
+          f.each_line do |line|
+            if line.include?("INSTRUMENTATION_STATUS_CODE")
+              result.last[:children] << test
+              test = {
+                type: "AndroidJUnit::Test",
+                name: 'UNKNOWN',
+                status: "passed"
+              }
+            end
+
+            if line.include?("class")
+              line = line.gsub("INSTRUMENTATION_STATUS: class=", "").strip
+              if !class_name.include? line
+                class_name.push(line) 
+                result << {
+                  type: "AndroidJUnit::Class",
+                  name: class_name.last,
+                  children: Array.new
+                }
+              end
+            elsif line.include?("test=")
+              test[:name] = line.gsub("INSTRUMENTATION_STATUS: test=", "").strip
+            elsif line.include?("Error in ")
+              test[:status] = 'failed'
+            end
+          end
+        end
+        result
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: res
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - BBC
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -100,6 +100,7 @@ files:
 - lib/res/formatters/ruby_cucumber2.rb
 - lib/res/ir.rb
 - lib/res/mappings.rb
+- lib/res/parsers/android_junit.rb
 - lib/res/parsers/junit.rb
 - lib/res/parsers/junitcasper.rb
 - lib/res/reporters/hive.rb
@@ -125,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Test Result report libraries
 test_files: []
-has_rdoc: