allure-report-publisher 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a1b01fffd526add66fad90f0b9361fbb267cbe0245f466b2593a0dd763491f9
-  data.tar.gz: c906896082cb17fc3bc79b2cfcf5725d01694a927dcd5b882403777c9d14d809
+  metadata.gz: 5cb9687cfe5fe4cacc4b499e4db1837f336013d2636af2d25e332c31d2ebd43c
+  data.tar.gz: 3f095d105ba5380a7be579a0497c3759e0eacc5097df618f5c7e891626c12b52
 SHA512:
-  metadata.gz: de9f9cb4037366f792d9a82c4390f4f749c212a740a515c2352ea10fecc1c566af47af6968d0717e9a1fd07281c9a6263bbd45be37b034367c3d5fa3b84b6172
-  data.tar.gz: 3731415da0b98f0de6667dbea3ae80898b3b68e9b49d521132605b8dece4126c15ce754495d117fe26e3d72a04f3f95a886824d0af9314859db4f29b74f16751
+  metadata.gz: ea513f8420524a5e4da5fcd1a1045d9111b64ad40ccf7d6d42e079855fbfa108ae97896159b8cff71d82a582b904122f7d9d74458707ada1ce21f982debc8607
+  data.tar.gz: f353025f1f65daa48427001d5126ad7aa8e2f5ed4a14293d2fc3a002d6565a1be6fb4244d462cd243b0718cc48123fa7c3fc15d4f63c46f45c915ef5e8555759

data/lib/allure_report_publisher/lib/helpers/helpers.rb

@@ -123,7 +123,7 @@ module Publisher
 
       unless status.success?
         err_msg = "Command '#{loggable_command}' failed!\n#{output}"
-        err_msg = mask ? err_msg.gsub(mask, "***") : err_msg
+        err_msg = err_msg.gsub(mask, "***") if mask
         raise(ShellCommandFailure, err_msg)
       end
 

data/lib/allure_report_publisher/lib/helpers/url_section_builder.rb

@@ -3,8 +3,8 @@ module Publisher
     # Urls section builder
     #
     class UrlSectionBuilder
-      DESCRIPTION_PATTERN = /<!-- allure -->[\s\S]+<!-- allurestop -->/.freeze
-      JOBS_PATTERN = /<!-- jobs -->\n([\s\S]+)\n<!-- jobs -->/.freeze
+      DESCRIPTION_PATTERN = /<!-- allure -->[\s\S]+<!-- allurestop -->/
+      JOBS_PATTERN = /<!-- jobs -->\n([\s\S]+)\n<!-- jobs -->/
 
       # Url section builder
       #

data/lib/allure_report_publisher/lib/providers/_provider.rb

@@ -7,7 +7,8 @@ module Publisher
     # @return [Publisher::Providers::Base]
     def self.provider
       return Github if ENV["GITHUB_WORKFLOW"]
-      return Gitlab if ENV["GITLAB_CI"]
+
+      Gitlab if ENV["GITLAB_CI"]
     end
 
     # Base class for CI executor info

data/lib/allure_report_publisher/lib/report_generator.rb

@@ -52,9 +52,25 @@ module Publisher
       log_debug("Generating allure report")
       cmd = "allure generate --clean --output #{report_path} #{common_info_path} #{result_paths}"
       out = execute_shell(cmd)
-      log_debug("Generated allure report. #{out}")
+      log_debug("Generated allure report. #{out}".strip)
+
+      deduplicate_executors
     rescue StandardError => e
       raise(AllureError, e.message)
     end
+
+    # Remove duplicate entries from executors widget
+    # This is a workaround for making history work with multiple result paths
+    # allure-report requires executors.json in every results folder but it will create duplicate entries
+    # in executors widget of the final report
+    #
+    # @return [void]
+    def deduplicate_executors
+      executors_file = File.join(report_path, "widgets", "executors.json")
+      executors_json = JSON.parse(File.read(executors_file)).uniq
+
+      log_debug("Removing duplicate entries in '#{executors_file}'")
+      File.write(executors_file, JSON.generate(executors_json))
+    end
   end
 end

data/lib/allure_report_publisher/lib/uploaders/_uploader.rb

@@ -238,11 +238,16 @@ module Publisher
       def add_executor_info
         return unless ci_provider
 
-        json_path = "#{common_info_path}/#{EXECUTOR_JSON}"
         json = ci_provider.executor_info.to_json
-        log_debug("Saving ci executor info")
-        File.write(json_path, json)
-        log_debug("Saved '#{EXECUTOR_JSON}' as '#{json_path}'\n#{JSON.pretty_generate(ci_provider.executor_info)}")
+        log_debug("Saving ci executor info:\n#{JSON.pretty_generate(ci_provider.executor_info)}")
+        # allure-report will fail to pick up reportUrl in history tab if executor.json is not present alongside results
+        [common_info_path, *result_paths].each do |path|
+          file = File.join(path, EXECUTOR_JSON)
+          next log_debug("Skipping '#{file}', executor info already exists") if File.exist?(file)
+
+          File.write(File.join(path, EXECUTOR_JSON), json)
+          log_debug("Saved ci executor info to '#{file}'")
+        end
       end
 
       # Fetch allure report history

data/lib/allure_report_publisher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Publisher
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-report-publisher
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -19,7 +19,7 @@ dependencies:
         version: 1.93.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.124.0
+        version: 1.137.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 1.93.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.124.0
+        version: 1.137.0
 - !ruby/object:Gem::Dependency
   name: dry-cli
   requirement: !ruby/object:Gem::Requirement
@@ -121,7 +121,7 @@ dependencies:
         version: '4.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -131,7 +131,7 @@ dependencies:
         version: '4.21'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -245,7 +245,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="