allure-report-publisher 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f5c4eb0b467125c36d80b35b99f7ec44ff1561a21bcc305d78a9afc4eaace1d
-  data.tar.gz: a525a10cae5378628ebf74d0a128ae9561db9f13b0ed023b992a404376b8ea1e
+  metadata.gz: 95dbd5a6e6f9c26a3a2e3623be240fdd6946acd1be0bbab199ba17f764b7dab4
+  data.tar.gz: 1f59fb0652c77dfed7178cae2c6d44cbf7308471c545f17df421998398d5d939
 SHA512:
-  metadata.gz: c51b6b05861023942c761e80c0f777609dd0287f9f0724a4bc0246d7faa28a52ee05b394e85ddae66ea3441aa4a35372a88e2fe9b34c052776af3500570f19c1
-  data.tar.gz: bf3deb92f34c1899fc0c3bdce08cb6fa96652eac0493799b595894c3219baf200acf9a5f784a5ada92d24fe41ced54a9ac043678c82f850206a80d737e9a8909
+  metadata.gz: 72825f58185c1096d04c39733fb3292c87135681793fd9818e052dbe770204b6d9eb28b305a59df3b1d07536b723b48b2229993f1786eee279fb2c3bfc05e7a7
+  data.tar.gz: 43ef3a41b8f81f7d067dbba7602e37d9e8ed574ffc7e7d8dbd696a39fedc85e05c92ed90b4ee713c8c9619fd537bd3a062d6da662242aaefad7d377c28d34778

data/lib/allure_report_publisher/lib/providers/gitlab.rb

@@ -74,11 +74,11 @@ module Publisher
       # @return [Gitlab::Client]
       def client
         @client ||= begin
-          raise("Missing GITLAB_AUTH_TOKEN environment variable!") unless ENV["GITLAB_AUTH_TOKEN"]
+          raise("Missing GITLAB_AUTH_TOKEN environment variable!") unless env("GITLAB_AUTH_TOKEN")
 
           ::Gitlab::Client.new(
             endpoint: "#{server_url}/api/v4",
-            private_token: ENV["GITLAB_AUTH_TOKEN"]
+            private_token: env("GITLAB_AUTH_TOKEN")
           )
         end
       end
@@ -87,67 +87,77 @@ module Publisher
       #
       # @return [String]
       def allure_project
-        @allure_project ||= ENV["ALLURE_PROJECT_PATH"]
+        @allure_project ||= env("ALLURE_PROJECT_PATH")
       end
 
       # Custom mr iid name
       #
       # @return [String]
       def allure_mr_iid
-        @allure_mr_iid ||= ENV["ALLURE_MERGE_REQUEST_IID"]
+        @allure_mr_iid ||= env("ALLURE_MERGE_REQUEST_IID")
       end
 
       # Custom sha
       #
       # @return [String]
       def allure_sha
-        @allure_sha ||= ENV["ALLURE_COMMIT_SHA"]
+        @allure_sha ||= env("ALLURE_COMMIT_SHA")
       end
 
       # Gitlab project path
       #
       # @return [String]
       def project
-        @project ||= allure_project || ENV["CI_PROJECT_PATH"]
+        @project ||= allure_project || env("CI_PROJECT_PATH")
       end
 
       # Merge request iid
       #
       # @return [Integer]
       def mr_iid
-        @mr_iid ||= allure_mr_iid || ENV["CI_MERGE_REQUEST_IID"]
+        @mr_iid ||= allure_mr_iid || env("CI_MERGE_REQUEST_IID")
       end
 
       # Server url
       #
       # @return [String]
       def server_url
-        @server_url ||= ENV["CI_SERVER_URL"]
+        @server_url ||= env("CI_SERVER_URL")
       end
 
       # Build url
       #
       # @return [String]
       def build_url
-        @build_url ||= ENV["CI_PIPELINE_URL"]
+        @build_url ||= env("CI_PIPELINE_URL")
       end
 
       # Job name
       #
       # @return [String]
       def build_name
-        @build_name ||= ENV[ALLURE_JOB_NAME] || ENV["CI_JOB_NAME"]
+        @build_name ||= env(ALLURE_JOB_NAME) || env("CI_JOB_NAME")
       end
 
       # Commit sha url
       #
       # @return [String]
       def sha_url
-        sha = allure_sha || ENV["CI_MERGE_REQUEST_SOURCE_BRANCH_SHA"] || ENV["CI_COMMIT_SHA"]
+        sha = allure_sha || env("CI_MERGE_REQUEST_SOURCE_BRANCH_SHA") || env("CI_COMMIT_SHA")
         short_sha = sha[0..7]
 
         "[#{short_sha}](#{server_url}/#{project}/-/merge_requests/#{mr_iid}/diffs?commit_id=#{sha})"
       end
+
+      # Return non empty environment variable value
+      #
+      # @param [String] name
+      # @return [String, nil]
+      def env(name)
+        return unless ENV[name] && !ENV[name].empty?
+
+        ENV[name]
+      end
     end
   end
 end

data/lib/allure_report_publisher/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-report-publisher
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3