allure-ruby-commons 2.21.0 → 2.21.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66e09f6d14fc5e93508a0d861d0df40b93b76e86a9b89a1ab8d6a5f72a0e036a
-  data.tar.gz: d81cc78375aac9293ffa6f23a35a9ae3dfb8a4a923b20dfddcbae74ce5f8d0be
+  metadata.gz: bd98c6464edda2d8f2095866f00cb567c6f3daeb4d591a4e742fbf814b365ded
+  data.tar.gz: 0f01fffeda2b9957de193a23070864070cc7ee7adddcbdcfbd8d238db1739567
 SHA512:
-  metadata.gz: c37fb24ee8dde0d460a3bcef86c2e515421d09ca22579f249320662542ceaa6cc506c8db017c5e1808dd1b24f428db0e4a258c7be20132c2044f271208959cb2
-  data.tar.gz: dff9c7508de915a8e834d6715bb25883e5607279e3716d73aa42d502801dde3c1cb274c21d8d7a4081298de5896e74055253c7f6b70460bb36dce992dabc68cf
+  metadata.gz: 157cee12a334d96847540fc49096d2d34f2f41e64a38e285f43fee9beb8751a0c7f751d5b13ec99ae02e9dffa4edf68c40af9877fc177ac105d89a050b633c87
+  data.tar.gz: 372b8b2cade3f8d461b989087c56fea808e049d272f007aacea695b5e8319b3e0c128170c1dd2d27b3866697e3a1a67387f0b5a7d84f3b3751a99ec914fd7d66

data/lib/allure_ruby_commons/_json_helper.rb

@@ -28,9 +28,12 @@ module Allure
       define_method(:load_json) do |json|
         Oj.load_file(json, symbol_keys: true)
       rescue Oj::ParseError
+        Allure.configuration.logger.error("Failed to parse json: #{json}")
         nil
       end
     rescue LoadError
+      require "json"
+
       define_method(:dump_json) do |obj|
         JSON.generate(obj)
       end
@@ -38,6 +41,7 @@ module Allure
       define_method(:load_json) do |json|
         JSON.parse(File.read(json), symbolize_names: true)
       rescue JSON::ParserError
+        Allure.configuration.logger.error("Failed to parse json: #{json}")
         nil
       end
     end

data/lib/allure_ruby_commons/testplan.rb

@@ -28,7 +28,25 @@ module Allure
       #
       # @return [Array<Hash>]
       def tests
-        @tests ||= load_json(ENV[TESTPLAN_PATH])&.fetch(:tests) if ENV[TESTPLAN_PATH]
+        @tests ||= load_json(test_plan_path)&.fetch(:tests) if test_plan_path
+      end
+
+      # Fetch test plan path
+      #
+      # @return [<String, nil>]
+      def test_plan_path
+        return @test_plan_path if defined?(@test_plan_path)
+
+        @test_plan_path = ENV[TESTPLAN_PATH].then do |path|
+          next unless path
+          next path if File.file?(path)
+
+          json = File.join(path, "testplan.json")
+          next json if File.exist?(json)
+
+          Allure.configuration.logger.warn("'ALLURE_TESTPLAN_PATH' env var is set, but no testplan.json found!")
+          nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-ruby-commons
 version: !ruby/object:Gem::Version
-  version: 2.21.0
+  version: 2.21.2
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-27 00:00:00.000000000 Z
+date: 2023-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types