trainer 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17bd8a4623eb7d2bf4906d4409e641c06f7da5ba
-  data.tar.gz: 53d445c6312f5fa550ee91c43bef5bcbc675e082
+  metadata.gz: 0e3f70b7df496d9fabd93521f0570b31c8246c65
+  data.tar.gz: 5b905c28029b08d09b4c76784669b422c971843c
 SHA512:
-  metadata.gz: 02bcab0a2e30632941f6dab76f649bed6d32f735636394ff79df6c856e861375942baa120c61b058b60b6f9dcbb555c1e41b8800a0e2898a8cf78cd5120be064
-  data.tar.gz: 338d462b8b2394765a3d077f970197822d4a54becb33b505525ab26a8972ce9226632f0e0d73b599c103e44ab3db91c518ec9c222877407bf7dd50e72316443f
+  metadata.gz: 6f99d9bc8d6c6cd851d40d576edb4bebb5d1aa8928642c78ac66981b928e6fd6e8f9d2a404109344dfa205ef03aae389ce18e46240a79e36f760a2d52e2f46ad
+  data.tar.gz: e4b784d44beedac35cb637e08bebf9e674f8f91f19b4afaed9d2cb81b1d53c3d89ed8525d70e12365b7375d3f3fe28ba567f8a2edfad29adff88913e78d2bf27

data/lib/trainer/options.rb

@@ -33,7 +33,13 @@ module Trainer
                                      env_name: "TRAINER_FAIL_BUILD",
                                      description: "Should this step stop the build if the tests fail? Set this to false if you're handling this with a test reporter",
                                      is_string: false,
-                                     default_value: true)
+                                     default_value: true),
+        FastlaneCore::ConfigItem.new(key: :xcpretty_naming,
+                                     short_option: "-x",
+                                     env_name: "TRAINER_XCPRETTY_NAMING",
+                                     description: "Produces class name and test name identical to xcpretty naming in junit file",
+                                     is_string: false,
+                                     default_value: false)
       ]
     end
   end

data/lib/trainer/test_parser.rb

@@ -37,7 +37,7 @@ module Trainer
           to_path = path.gsub(".plist", config[:extension])
         end
 
-        tp = Trainer::TestParser.new(path)
+        tp = Trainer::TestParser.new(path, config)
         File.write(to_path, tp.to_junit)
         puts "Successfully generated '#{to_path}'"
 
@@ -46,7 +46,7 @@ module Trainer
       return_hash
     end
 
-    def initialize(path)
+    def initialize(path, config = {})
       path = File.expand_path(path)
       UI.user_error!("File not found at path '#{path}'") unless File.exist?(path)
 
@@ -55,7 +55,7 @@ module Trainer
       return if self.raw_json["FormatVersion"].to_s.length.zero? # maybe that's a useless plist file
 
       ensure_file_valid!
-      parse_content
+      parse_content(config[:xcpretty_naming])
     end
 
     # Returns the JUnit report as String
@@ -107,8 +107,21 @@ module Trainer
       return tests
     end
 
+    # Returns the test group and test name from the passed summary and test
+    # Pass xcpretty_naming = true to get the test naming aligned with xcpretty
+    def test_group_and_name(testable_summary, test, xcpretty_naming)
+      if xcpretty_naming
+        group = testable_summary["TargetName"] + "." + test["TestIdentifier"].split("/")[0..-2].join(".")
+        name = test["TestName"][0..-3]
+      else
+        group = test["TestIdentifier"].split("/")[0..-2].join(".")
+        name = test["TestName"]
+      end
+      return group, name
+    end
+
     # Convert the Hashes and Arrays in something more useful
-    def parse_content
+    def parse_content(xcpretty_naming)
       self.data = self.raw_json["TestableSummaries"].collect do |testable_summary|
         summary_row = {
           project_path: testable_summary["ProjectPath"],
@@ -116,10 +129,11 @@ module Trainer
           test_name: testable_summary["TestName"],
           duration: testable_summary["Tests"].map { |current_test| current_test["Duration"] }.inject(:+),
           tests: unfold_tests(testable_summary["Tests"]).collect do |current_test|
+            test_group, test_name = test_group_and_name(testable_summary, current_test, xcpretty_naming)
             current_row = {
               identifier: current_test["TestIdentifier"],
-              test_group: current_test["TestIdentifier"].split("/")[0..-2].join("."),
-              name: current_test["TestName"],
+                 test_group: test_group,
+                 name: test_name,
               object_class: current_test["TestObjectClass"],
               status: current_test["TestStatus"],
               guid: current_test["TestSummaryGUID"],

data/lib/trainer/version.rb

@@ -1,4 +1,4 @@
 module Trainer
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
   DESCRIPTION = "Convert xcodebuild plist files to JUnit reports"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trainer
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Felix Krause
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Convert xcodebuild plist files to JUnit reports