allure-report-publisher 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818cdc599b432cb8484e95662881253a9f0df4265eb742f3f56f459ecbe57dfd
-  data.tar.gz: a261391b7851b0305883c6cd15a9789854051b30d39184728235641f881fe3fa
+  metadata.gz: 9bb81eada76c7024e4a570187d02e2383677552daef81b14e1e1457ca2fbc6be
+  data.tar.gz: 27db25caad167473b073a6057f82981d648889d800c3fddb879c3c046d5dc951
 SHA512:
-  metadata.gz: 9e8ea6e47d729b8e484c660a5add949546662deb3d339caf6d95b4e45c5970db7137375cf3dd67764f5dcb7e9b78859eb52f8dfc3da0e5dedbcb7d346a5f5e26
-  data.tar.gz: dec6eec389f65663b7b6f7531796e0e7c0a39a2137e5f94c0dd881e87284ca31b6a268462a7dca99909250b91b911f250e378319dcb3b97930078eaa22b858c9
+  metadata.gz: 5b3d2e2a7faa93ad323cb24ea892aeb3601c904e30c4fdadaf78732bd903945c7ba2e488440bb5a1d834e0ec62a1616c83aea48e697596edd02d271fcf8d0719
+  data.tar.gz: 400d890b0e1b315d1aab1a246482a31849a38c3a78b231310ffc285b5fd14d677ee3b3badfcf098f9f15d982091f7d85dac6642f5e6b0d0bd2f7e1b5f1509510

data/README.md

@@ -1,6 +1,9 @@
 [![Gem Version](https://img.shields.io/gem/v/allure-report-publisher?color=red)](https://rubygems.org/gems/allure-report-publisher)
+[![Gem Pulls](https://img.shields.io/gem/dt/allure-report-publisher)](https://rubygems.org/gems/allure-report-publisher)
 [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/andrcuns/allure-report-publisher?color=blue&label=docker&sort=semver)](https://hub.docker.com/r/andrcuns/allure-report-publisher)
+[![Docker Pulls](https://img.shields.io/docker/pulls/andrcuns/allure-report-publisher)](https://hub.docker.com/r/andrcuns/allure-report-publisher)
 ![Workflow status](https://github.com/andrcuns/allure-report-publisher/workflows/Test/badge.svg)
+[![Test Report](https://img.shields.io/badge/report-allure-blue.svg)](https://storage.googleapis.com/allure-test-reports/allure-report-publisher/refs/heads/main/index.html)
 [![Maintainability](https://api.codeclimate.com/v1/badges/210eaa4f74588fb08313/maintainability)](https://codeclimate.com/github/andrcuns/allure-report-publisher/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/210eaa4f74588fb08313/test_coverage)](https://codeclimate.com/github/andrcuns/allure-report-publisher/test_coverage)
 
@@ -28,35 +31,61 @@ docker pull andrcuns/allure-report-publisher:latest
 
 allure-report-publisher will automatically detect if used in CI environment and add relevant executor info and history
 
-### AWS S3
-
-- `AWS authentication`: requires environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` or credentials file `~/.aws/credentials`
 - `Allure report link`: requires `GITHUB_AUTH_TOKEN` or `GITLAB_AUTH_TOKEN` in order to update pull request description with link to latest report
 
 ```shell
-$ (allure-report-publisher|docker run --rm andrcuns/allure-report-publisher:latest) upload s3 --help
+$ (allure-report-publisher|docker run --rm andrcuns/allure-report-publisher:latest) upload --help
 Command:
-  allure-report-publisher upload s3
+  allure-report-publisher upload
 
 Usage:
-  allure-report-publisher upload s3
+  allure-report-publisher upload TYPE
 
 Description:
   Generate and upload allure report
 
+Arguments:
+  TYPE                              # REQUIRED Cloud storage type: (s3/gcs)
+
 Options:
-  --[no-]color                     # Toggle color output
-  --[no-]update-pr                 # Update pull request description with url to allure report, default: false
-  --result-files-glob=VALUE        # Allure results files glob. Required: true
-  --bucket=VALUE                   # Bucket name. Required: true
-  --prefix=VALUE                   # Optional prefix for report path. Required: false
-  --help, -h                       # Print this help
+  --results-glob=VALUE              # Allure results files glob. Required: true
+  --bucket=VALUE                    # Bucket name. Required: true
+  --prefix=VALUE                    # Optional prefix for report path. Required: false
+  --update-pr=VALUE                 # Add report url to PR via comment or description update. Required: false: (comment/description)
+  --[no-]copy-latest                # Keep copy of latest report at base prefix path, default: false
+  --[no-]color                      # Toggle color output, default: false
+  --help, -h                        # Print this help
 
 Examples:
-  allure-report-publisher upload s3 --result-files-glob='path/to/allure-result/**/*' --bucket=my-bucket
-  allure-report-publisher upload s3 --result-files-glob='path/to/allure-result/**/*' --bucket=my-bucket --project=my-project/prs
+  allure-report-publisher upload s3 --results-glob='path/to/allure-result/**/*' --bucket=my-bucket
+  allure-report-publisher upload gcs --results-glob='path/to/allure-result/**/*' --bucket=my-bucket --prefix=my-project/prs
 ```
 
+### AWS S3
+
+Requires environment variables `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY` or credentials file `~/.aws/credentials`
+
+### Google Cloud Storage
+
+Requires on of the following environment variables.
+
+credentials.json file location:
+
+- `STORAGE_CREDENTIALS`
+- `STORAGE_KEYFILE`
+- `GOOGLE_CLOUD_CREDENTIALS`
+- `GOOGLE_CLOUD_KEYFILE`
+- `GCLOUD_KEYFILE`
+
+credentials.json contents:
+
+- `GOOGLE_CLOUD_CREDENTIALS_JSON`
+- `STORAGE_CREDENTIALS_JSON`
+- `STORAGE_KEYFILE_JSON`
+- `GOOGLE_CLOUD_CREDENTIALS_JSON`
+- `GOOGLE_CLOUD_KEYFILE_JSON`
+- `GCLOUD_KEYFILE_JSON`
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/allure_report_publisher.rb

@@ -14,11 +14,8 @@ module Publisher
     extend Dry::CLI::Registry
 
     register "version", Version, aliases: ["-v", "--version"]
-
-    register "upload" do |prefix|
-      prefix.register "s3", UploadS3
-    end
+    register "upload", Upload, aliases: ["u"]
   end
 end
 
-Publisher::Commands.before("upload s3") { Publisher::Helpers.validate_allure_cli_present }
+Publisher::Commands.before("upload") { Publisher::Helpers.validate_allure_cli_present }

data/lib/allure_report_publisher/commands/upload.rb

@@ -0,0 +1,90 @@
+module Publisher
+  module Commands
+    # Upload allure report
+    #
+    class Upload < Dry::CLI::Command
+      include Helpers
+
+      desc "Generate and upload allure report"
+
+      argument :type,
+               type: :string,
+               required: true,
+               values: %w[s3 gcs],
+               desc: "Cloud storage type"
+
+      option :results_glob,
+             desc: "Allure results files glob. Required: true"
+      option :bucket,
+             desc: "Bucket name. Required: true"
+      option :prefix,
+             desc: "Optional prefix for report path. Required: false"
+      option :update_pr,
+             type: :string,
+             values: %w[comment description],
+             desc: "Add report url to PR via comment or description update. Required: false"
+      option :copy_latest,
+             type: :boolean,
+             default: false,
+             desc: "Keep copy of latest report at base prefix path"
+      option :color,
+             type: :boolean,
+             default: false,
+             desc: "Toggle color output"
+
+      example [
+        "s3 --results-glob='path/to/allure-result/**/*' --bucket=my-bucket",
+        "gcs --results-glob='path/to/allure-result/**/*' --bucket=my-bucket --prefix=my-project/prs"
+      ]
+
+      def call(**args)
+        validate_args(args)
+        validate_result_files(args[:results_glob])
+        Helpers.pastel(force_color: args[:color] || nil)
+
+        uploader = uploaders(args[:type]).new(**args.slice(:results_glob, :bucket, :prefix, :copy_latest, :update_pr))
+
+        log("Generating allure report")
+        Spinner.spin("generating") { uploader.generate_report }
+
+        log("Uploading allure report to #{args[:type]}")
+        Spinner.spin("uploading") { uploader.upload }
+        uploader.report_urls.each { |k, v| log("#{k}: #{v}", :green) }
+        return unless args[:update_pr] && uploader.pr?
+
+        log("Adding reports urls")
+        Spinner.spin("updating", exit_on_error: false) { uploader.add_url_to_pr }
+      end
+
+      private
+
+      # Uploader class
+      #
+      # @param [String] uploader
+      # @return [Publisher::Uploaders::Uploader]
+      def uploaders(uploader)
+        {
+          "s3" => Uploaders::S3,
+          "gcs" => Uploaders::GCS
+        }[uploader]
+      end
+
+      # Validate required args
+      #
+      # @param [Hash] args
+      # @return [void]
+      def validate_args(args)
+        error("Missing argument --results-glob!") unless args[:results_glob]
+        error("Missing argument --bucket!") unless args[:bucket]
+      end
+
+      # Check if allure results present
+      #
+      # @param [String] results_glob
+      # @return [void]
+      def validate_result_files(results_glob)
+        Dir.glob(results_glob).empty? && error("Glob '#{results_glob}' did not match any files!")
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module Publisher
     # @param [Boolean] force_color
     # @return [Pastel]
     def self.pastel(force_color: nil)
-      @pastel ||= Pastel.new(enabled: force_color)
+      @pastel ||= Pastel.new(enabled: force_color, eachline: "\n")
     end
 
     # Check allure cli is installed and executable

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

@@ -99,7 +99,7 @@ module Publisher
     # @param [String] error_message
     # @return [void]
     def spinner_error(error_message)
-      colored_message = colorize(error_message, error_color)
+      colored_message = colorize("failed\n#{error_message}", error_color)
       return spinner.error(colored_message) if tty?
 
       spinner.stop

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

@@ -0,0 +1,174 @@
+module Publisher
+  # Namespace for providers executing tests
+  #
+  module Providers
+    # Detect CI provider
+    #
+    # @return [Publisher::Providers::Base]
+    def self.provider
+      return Github if ENV["GITHUB_WORKFLOW"]
+      return Gitlab if ENV["GITLAB_CI"]
+    end
+
+    # Base class for CI executor info
+    #
+    class Provider
+      DESCRIPTION_PATTERN = /<!-- allure -->[\s\S]+<!-- allurestop -->/.freeze
+      ALLURE_JOB_NAME = "ALLURE_JOB_NAME".freeze
+
+      def initialize(report_url:, update_pr:)
+        @report_url = report_url
+        @update_pr = update_pr
+      end
+
+      # :nocov:
+
+      # Get ci run ID without creating instance of ci provider
+      #
+      # @return [String]
+      def self.run_id
+        raise("Not implemented!")
+      end
+
+      # Get executor info
+      #
+      # @return [Hash]
+      def executor_info
+        raise("Not implemented!")
+      end
+      # :nocov:
+
+      # Add report url to pull request description
+      #
+      # @return [void]
+      def add_report_url
+        raise("Not a pull request, skipped!") unless pr?
+        return add_comment if comment?
+
+        update_pr_description
+      end
+
+      # :nocov:
+
+      # Pull request run
+      #
+      # @return [Boolean]
+      def pr?
+        raise("Not implemented!")
+      end
+
+      private
+
+      attr_reader :report_url, :update_pr
+
+      # Current pull request description
+      #
+      # @return [String]
+      def pr_description
+        raise("Not implemented!")
+      end
+
+      # Update pull request description
+      #
+      # @return [void]
+      def update_pr_description
+        raise("Not implemented!")
+      end
+
+      # Add comment with report url
+      #
+      # @return [void]
+      def add_comment
+        raise("Not implemented!")
+      end
+
+      # Commit SHA url
+      #
+      # @return [String]
+      def sha_url
+        raise("Not implemented!")
+      end
+      # :nocov:
+
+      # Add report url as comment
+      #
+      # @return [Boolean]
+      def comment?
+        update_pr == "comment"
+      end
+
+      # CI run id
+      #
+      # @return [String]
+      def run_id
+        self.class.run_id
+      end
+
+      # Check if PR already has report urls
+      #
+      # @return [Boolean]
+      def reported?
+        @reported ||= pr_description.match?(DESCRIPTION_PATTERN)
+      end
+
+      # Full PR description
+      #
+      # @return [String]
+      def updated_pr_description
+        reported? ? existing_pr_description : initial_pr_descripion
+      end
+
+      # Updated PR description
+      #
+      # @return [String]
+      def existing_pr_description
+        pr_description.gsub(DESCRIPTION_PATTERN, pr_body).strip
+      end
+
+      # Initial PR description
+      #
+      # @return [String]
+      def initial_pr_descripion
+        "#{pr_description}\n\n#{pr_body}".strip
+      end
+
+      # Heading for report urls
+      #
+      # @return [String]
+      def heading
+        @heading ||= <<~HEADING.strip
+          # Allure report
+          `allure-report-publisher` generated allure report for #{sha_url}!
+        HEADING
+      end
+
+      # Allure report url pr description
+      #
+      # @return [String]
+      def pr_body
+        @pr_body ||= <<~DESC
+          <!-- allure -->
+          ---
+          #{heading}
+
+          #{job_entry}
+          <!-- allurestop -->
+        DESC
+      end
+
+      # Allure report url comment body
+      #
+      # @return [String]
+      def comment_body
+        @comment_body ||= pr_body.gsub("---\n", "")
+      end
+
+      # Single job report URL entry
+      #
+      # @return [String]
+      def job_entry
+        @job_entry ||= "**#{build_name}**: 📝 [allure report](#{report_url})"
+      end
+    end
+  end
+end

data/lib/allure_report_publisher/lib/providers/github.rb

@@ -4,7 +4,13 @@ module Publisher
   module Providers
     # Github implementation
     #
-    class Github < Base
+    class Github < Provider
+      # Set octokit to autopaginate
+      #
+      Octokit.configure do |config|
+        config.auto_paginate = true
+      end
+
       # Run id
       #
       # @return [String]
@@ -12,7 +18,12 @@ module Publisher
         @run_id ||= ENV["GITHUB_RUN_ID"]
       end
 
-      private
+      # Pull request run
+      #
+      # @return [Boolean]
+      def pr?
+        ENV["GITHUB_EVENT_NAME"] == "pull_request"
+      end
 
       # Executor info
       #
@@ -30,6 +41,8 @@ module Publisher
         }
       end
 
+      private
+
       # Github api client
       #
       # @return [Octokit::Client]
@@ -41,11 +54,36 @@ module Publisher
         end
       end
 
-      # Pull request run
+      # Update pull request description
       #
-      # @return [Boolean]
-      def pr?
-        ENV["GITHUB_EVENT_NAME"] == "pull_request"
+      # @return [void]
+      def update_pr_description
+        client.update_pull_request(repository, pr_id, body: updated_pr_description)
+      end
+
+      # Add comment with report url
+      #
+      # @return [void]
+      def add_comment
+        return client.add_comment(repository, pr_id, comment_body) unless comment
+
+        client.update_comment(repository, comment[:id], comment_body)
+      end
+
+      # Existing comment with allure urls
+      #
+      # @return [Sawyer::Resource]
+      def comment
+        @comment ||= client.issue_comments(repository, pr_id).detect do |comment|
+          comment[:body].match?(DESCRIPTION_PATTERN)
+        end
+      end
+
+      # Github event
+      #
+      # @return [Hash]
+      def github_event
+        @github_event ||= JSON.parse(File.read(ENV["GITHUB_EVENT_PATH"]), symbolize_names: true)
       end
 
       # Pull request description
@@ -55,19 +93,11 @@ module Publisher
         @pr_description ||= client.pull_request(repository, pr_id)[:body]
       end
 
-      # Update pull request description
-      #
-      # @param [String] _desc
-      # @return [void]
-      def update_pr_description(desc)
-        client.update_pull_request(repository, pr_id, body: desc)
-      end
-
       # Pull request id
       #
       # @return [Integer]
       def pr_id
-        @pr_id ||= JSON.parse(File.read(ENV["GITHUB_EVENT_PATH"]))["number"]
+        @pr_id ||= github_event[:number]
       end
 
       # Server url
@@ -88,7 +118,7 @@ module Publisher
       #
       # @return [String]
       def build_name
-        @build_name ||= ENV["GITHUB_JOB"]
+        @build_name ||= ENV[ALLURE_JOB_NAME] || ENV["GITHUB_JOB"]
       end
 
       # Github repository
@@ -97,6 +127,16 @@ module Publisher
       def repository
         @repository ||= ENV["GITHUB_REPOSITORY"]
       end
+
+      # Commit sha url
+      #
+      # @return [String]
+      def sha_url
+        sha = github_event.dig(:pull_request, :head, :sha)
+        short_sha = sha[0..7]
+
+        "[#{short_sha}](#{server_url}/#{repository}/pull/#{pr_id}/commits/#{sha})"
+      end
     end
   end
 end