cucumber-ci-environment 13.0.0 → 15.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d93d298eb820ffd2ae7f5ac4340055ecac345a8fa5b323bd326ca5a1d525dc5
-  data.tar.gz: c2c84999d1a4b6c2699fcfdcb0d9c60ea4c4a4ce119cc02e4438482a4b6e28c9
+  metadata.gz: d1eb9401654c3a895cca3d223c13fba2d1bcc793055ead345ec8d7f1a30d915b
+  data.tar.gz: 336b262755adce5d100e7ae34dbab438e0c2767b282e3d725c55d200d653b365
 SHA512:
-  metadata.gz: cd7a594071b9daeed169db5539ac90b3ffba85222664f148ae17d27b9ae7bd6dabd74ebc55c9a53422adae7eaa08f3dc4f37da92e9501f646c8bd224b9917c29
-  data.tar.gz: ad45b5d985598d9eb75e0074962274fbda1a034d352129abd59006eb39b878aac0ec9e065877e439b86432092af35c9d81ecfa1d617d9acffdef25ef77fce814
+  metadata.gz: 126232b081f3e37017af8f77c4d1b78c2b991b495d4b2127e7862c8d70f8834733b0c8393c38c77e133690800110ef37ccb3a8ca3722f4370243389cfc3edf88
+  data.tar.gz: b7dfacb179c958e123f18e0136907a5cd34446d5d13e62153e1e0a8fe50e9d8e0b6a4044823cbce4efa88e87a95c8d66751a690072981ae31ed99c39ef494152

data/lib/cucumber/{ci_environment/CiEnvironments.json → CiEnvironments.json}

@@ -1,160 +1,160 @@
 [
   {
-    "name": "Azure Pipelines",
-    "url": "${BUILD_BUILDURI}",
     "buildNumber": "${BUILD_BUILDNUMBER}",
     "git": {
+      "branch": "${BUILD_SOURCEBRANCH/refs/heads/(.*)/\\1}",
       "remote": "${BUILD_REPOSITORY_URI}",
       "revision": "${BUILD_SOURCEVERSION}",
-      "branch": "${BUILD_SOURCEBRANCH/refs\/heads\/(.*)/\\1}",
-      "tag": "${BUILD_SOURCEBRANCH/refs\/tags\/(.*)/\\1}"
-    }
+      "tag": "${BUILD_SOURCEBRANCH/refs/tags/(.*)/\\1}"
+    },
+    "name": "Azure Pipelines",
+    "url": "${BUILD_BUILDURI}"
   },
   {
-    "name": "Bamboo",
-    "url": "${bamboo_buildResultsUrl}",
     "buildNumber": "${bamboo_buildNumber}",
     "git": {
+      "branch": "${bamboo_planRepository_branch}",
       "remote": "${bamboo_planRepository_repositoryUrl}",
-      "revision": "${bamboo_planRepository_revision}",
-      "branch": "${bamboo_planRepository_branch}"
-    }
+      "revision": "${bamboo_planRepository_revision}"
+    },
+    "name": "Bamboo",
+    "url": "${bamboo_buildResultsUrl}"
   },
   {
-    "name": "Buddy",
-    "url": "${BUDDY_EXECUTION_URL}",
     "buildNumber": "${BUDDY_EXECUTION_ID}",
     "git": {
+      "branch": "${BUDDY_EXECUTION_BRANCH}",
       "remote": "${BUDDY_SCM_URL}",
       "revision": "${BUDDY_EXECUTION_REVISION}",
-      "branch": "${BUDDY_EXECUTION_BRANCH}",
       "tag": "${BUDDY_EXECUTION_TAG}"
-    }
+    },
+    "name": "Buddy",
+    "url": "${BUDDY_EXECUTION_URL}"
   },
   {
-    "name": "Bitrise",
-    "url": "${BITRISE_BUILD_URL}",
     "buildNumber": "${BITRISE_BUILD_NUMBER}",
     "git": {
+      "branch": "${BITRISE_GIT_BRANCH}",
       "remote": "${GIT_REPOSITORY_URL}",
       "revision": "${BITRISE_GIT_COMMIT}",
-      "branch": "${BITRISE_GIT_BRANCH}",
       "tag": "${BITRISE_GIT_TAG}"
-    }
+    },
+    "name": "Bitrise",
+    "url": "${BITRISE_BUILD_URL}"
   },
   {
-    "name": "CircleCI",
-    "url": "${CIRCLE_BUILD_URL}",
     "buildNumber": "${CIRCLE_BUILD_NUM}",
     "git": {
+      "branch": "${CIRCLE_BRANCH}",
       "remote": "${CIRCLE_REPOSITORY_URL}",
       "revision": "${CIRCLE_SHA1}",
-      "branch": "${CIRCLE_BRANCH}",
       "tag": "${CIRCLE_TAG}"
-    }
+    },
+    "name": "CircleCI",
+    "url": "${CIRCLE_BUILD_URL}"
   },
   {
-    "name": "CodeFresh",
-    "url": "${CF_BUILD_URL}",
     "buildNumber": "${CF_BUILD_ID}",
     "git": {
+      "branch": "${CF_BRANCH}",
       "remote": "${CF_COMMIT_URL/(.*)\\/commit.+$/\\1}.git",
-      "revision": "${CF_REVISION}",
-      "branch": "${CF_BRANCH}"
-    }
+      "revision": "${CF_REVISION}"
+    },
+    "name": "CodeFresh",
+    "url": "${CF_BUILD_URL}"
   },
   {
-    "name": "CodeShip",
-    "url": "${CI_BUILD_URL}",
     "buildNumber": "${CI_BUILD_NUMBER}",
     "git": {
+      "branch": "${CI_BRANCH}",
       "remote": "${CI_PULL_REQUEST/(.*)\\/pull\\/\\d+/\\1.git}",
-      "revision": "${CI_COMMIT_ID}",
-      "branch": "${CI_BRANCH}"
-    }
+      "revision": "${CI_COMMIT_ID}"
+    },
+    "name": "CodeShip",
+    "url": "${CI_BUILD_URL}"
   },
   {
-    "name": "GitHub Actions",
-    "url": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}",
     "buildNumber": "${GITHUB_RUN_ID}",
     "git": {
+      "branch": "${GITHUB_HEAD_REF}",
       "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
       "revision": "${GITHUB_SHA}",
-      "branch": "${GITHUB_HEAD_REF}",
-      "tag": "${GITHUB_REF/refs\/tags\/(.*)/\\1}"
-    }
+      "tag": "${GITHUB_REF/refs/tags/(.*)/\\1}"
+    },
+    "name": "GitHub Actions",
+    "url": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
   },
   {
-    "name": "GitLab",
-    "url": "${CI_JOB_URL}",
     "buildNumber": "${CI_JOB_ID}",
     "git": {
+      "branch": "${CI_COMMIT_BRANCH}",
       "remote": "${CI_REPOSITORY_URL}",
       "revision": "${CI_COMMIT_SHA}",
-      "branch": "${CI_COMMIT_BRANCH}",
       "tag": "${CI_COMMIT_TAG}"
-    }
+    },
+    "name": "GitLab",
+    "url": "${CI_JOB_URL}"
   },
   {
-    "name": "GoCD",
-    "url": "${GO_SERVER_URL}/pipelines/${GO_PIPELINE_NAME}/${GO_PIPELINE_COUNTER}/${GO_STAGE_NAME}/${GO_STAGE_COUNTER}",
     "buildNumber": "${GO_PIPELINE_NAME}/${GO_PIPELINE_COUNTER}/${GO_STAGE_NAME}/${GO_STAGE_COUNTER}",
     "git": {
+      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}",
       "remote": "${GO_SCM_*_PR_URL/(.*)\\/pull\\/\\d+/\\1.git}",
-      "revision": "${GO_REVISION}",
-      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}"
-    }
+      "revision": "${GO_REVISION}"
+    },
+    "name": "GoCD",
+    "url": "${GO_SERVER_URL}/pipelines/${GO_PIPELINE_NAME}/${GO_PIPELINE_COUNTER}/${GO_STAGE_NAME}/${GO_STAGE_COUNTER}"
   },
   {
-    "name": "Jenkins",
-    "url": "${BUILD_URL}",
     "buildNumber": "${BUILD_NUMBER}",
     "git": {
+      "branch": "${GIT_LOCAL_BRANCH}",
       "remote": "${GIT_URL}",
-      "revision": "${GIT_COMMIT}",
-      "branch": "${GIT_LOCAL_BRANCH}"
-    }
+      "revision": "${GIT_COMMIT}"
+    },
+    "name": "Jenkins",
+    "url": "${BUILD_URL}"
   },
   {
-    "name": "JetBrains Space",
-    "url": "${JB_SPACE_EXECUTION_URL}",
     "buildNumber": "${JB_SPACE_EXECUTION_NUMBER}",
     "git": {
+      "branch": "${JB_SPACE_GIT_BRANCH}",
       "remote": "https://${JB_SPACE_API_URL}/p/${JB_SPACE_PROJECT_KEY}/repositories/${JB_SPACE_GIT_REPOSITORY_NAME}",
-      "revision": "${JB_SPACE_GIT_REVISION}",
-      "branch": "${JB_SPACE_GIT_BRANCH}"
-    }
+      "revision": "${JB_SPACE_GIT_REVISION}"
+    },
+    "name": "JetBrains Space",
+    "url": "${JB_SPACE_EXECUTION_URL}"
   },
   {
-    "name": "Semaphore",
-    "url": "${SEMAPHORE_ORGANIZATION_URL}/jobs/${SEMAPHORE_JOB_ID}",
     "buildNumber": "${SEMAPHORE_JOB_ID}",
     "git": {
+      "branch": "${SEMAPHORE_GIT_BRANCH}",
       "remote": "${SEMAPHORE_GIT_URL}",
       "revision": "${SEMAPHORE_GIT_SHA}",
-      "branch": "${SEMAPHORE_GIT_BRANCH}",
       "tag": "${SEMAPHORE_GIT_TAG_NAME}"
-    }
+    },
+    "name": "Semaphore",
+    "url": "${SEMAPHORE_ORGANIZATION_URL}/jobs/${SEMAPHORE_JOB_ID}"
   },
   {
-    "name": "Travis CI",
-    "url": "${TRAVIS_BUILD_WEB_URL}",
     "buildNumber": "${TRAVIS_JOB_NUMBER}",
     "git": {
+      "branch": "${TRAVIS_BRANCH}",
       "remote": "https://github.com/${TRAVIS_REPO_SLUG}.git",
       "revision": "${TRAVIS_COMMIT}",
-      "branch": "${TRAVIS_BRANCH}",
       "tag": "${TRAVIS_TAG}"
-    }
+    },
+    "name": "Travis CI",
+    "url": "${TRAVIS_BUILD_WEB_URL}"
   },
   {
-    "name": "Wercker",
-    "url": "${WERCKER_RUN_URL}",
     "buildNumber": "${WERCKER_RUN_URL/.*\\/([^\\/]+)$/\\1}",
     "git": {
+      "branch": "${WERCKER_GIT_BRANCH}",
       "remote": "https://${WERCKER_GIT_DOMAIN}/${WERCKER_GIT_OWNER}/${WERCKER_GIT_REPOSITORY}.git",
-      "revision": "${WERCKER_GIT_COMMIT}",
-      "branch": "${WERCKER_GIT_BRANCH}"
-    }
+      "revision": "${WERCKER_GIT_COMMIT}"
+    },
+    "name": "Wercker",
+    "url": "${WERCKER_RUN_URL}"
   }
 ]

data/lib/cucumber/ci_environment.rb

@@ -2,79 +2,79 @@
 
 require 'uri'
 require 'json'
-require 'cucumber/ci_environment/variable_expression'
+
+require_relative 'variable_expression'
 
 module Cucumber
-  module CiEnvironment
+  class CiEnvironment
     extend VariableExpression
-    CI_ENVIRONMENTS_PATH = File.join(File.dirname(__FILE__), 'ci_environment/CiEnvironments.json')
-
-    module_function
 
-    def detect_ci_environment(env)
-      ci_environments = JSON.parse(File.read(CI_ENVIRONMENTS_PATH))
-      ci_environments.each do |ci_environment|
-        detected = detect(ci_environment, env)
-        return detected unless detected.nil?
-      end
+    CI_ENVIRONMENTS_PATH = File.join(File.dirname(__FILE__), './CiEnvironments.json')
 
-      nil
-    end
+    class << self
+      def detect_ci_environment(env)
+        ci_environments = JSON.parse(File.read(CI_ENVIRONMENTS_PATH))
+        ci_environments.each do |ci_environment|
+          detected = detect(ci_environment, env)
+          return detected unless detected.nil?
+        end
 
-    def detect(ci_environment, env)
-      url = evaluate(ci_environment['url'], env)
-      return nil if url.nil?
+        nil
+      end
 
-      result = {
-        name: ci_environment['name'],
-        url: url,
-        buildNumber: evaluate(ci_environment['buildNumber'], env)
-      }
+      def remove_userinfo_from_url(value)
+        return nil if value.nil?
 
-      detected_git = detect_git(ci_environment, env)
-      result[:git] = detected_git if detected_git
-      result
-    end
+        begin
+          uri = URI(value)
+          uri.userinfo = ''
+          uri.to_s
+        rescue StandardError
+          value
+        end
+      end
 
-    def detect_git(ci_environment, env)
-      revision = detect_revision(ci_environment, env)
-      return nil if revision.nil?
+      private
 
-      remote = evaluate(ci_environment['git']['remote'], env)
-      return nil if remote.nil?
+      def detect(ci_environment, env)
+        url = evaluate(ci_environment['url'], env)
+        return nil if url.nil?
 
-      git_info = {
-        remote: remove_userinfo_from_url(remote),
-        revision: revision
-      }
+        result = {
+          name: ci_environment['name'],
+          url: url,
+          buildNumber: evaluate(ci_environment['buildNumber'], env)
+        }
 
-      tag = evaluate(ci_environment['git']['tag'], env)
-      branch = evaluate(ci_environment['git']['branch'], env)
-      git_info[:tag] = tag if tag
-      git_info[:branch] = branch if branch
-      git_info
-    end
+        detected_git = detect_git(ci_environment, env)
+        result[:git] = detected_git if detected_git
+        result
+      end
 
-    def detect_revision(ci_environment, env)
-      return evaluate(ci_environment['git']['revision'], env) unless env['GITHUB_EVENT_NAME'] == 'pull_request'
+      def detect_git(ci_environment, env)
+        revision = detect_revision(ci_environment, env)
+        return nil if revision.nil?
 
-      raise StandardError('GITHUB_EVENT_PATH not set') unless env['GITHUB_EVENT_PATH']
+        remote = evaluate(ci_environment['git']['remote'], env)
+        return nil if remote.nil?
 
-      event = JSON.parse(File.read(env['GITHUB_EVENT_PATH']))
-      event.dig('pull_request', 'head', 'sha').tap do |revision|
-        raise StandardError("Could not find .pull_request.head.sha in GITHUB_EVENT_PATH:\n#{JSON.pretty_generate(event)}") if revision.nil?
+        {
+          remote: remove_userinfo_from_url(remote),
+          revision: revision,
+          tag: evaluate(ci_environment['git']['tag'], env),
+          branch: evaluate(ci_environment['git']['branch'], env)
+        }.compact
       end
-    end
 
-    def remove_userinfo_from_url(value)
-      return nil if value.nil?
+      def detect_revision(ci_environment, env)
+        return evaluate(ci_environment['git']['revision'], env) unless env['GITHUB_EVENT_NAME'] == 'pull_request'
+
+        raise StandardError('GITHUB_EVENT_PATH not set') unless env['GITHUB_EVENT_PATH']
 
-      begin
-        uri = URI(value)
-        uri.userinfo = ''
-        uri.to_s
-      rescue StandardError
-        value
+        event = JSON.parse(File.read(env['GITHUB_EVENT_PATH']))
+        event.dig('pull_request', 'head', 'sha').tap do |revision|
+          raise StandardError("Could not find .pull_request.head.sha in GITHUB_EVENT_PATH:\n#{JSON.pretty_generate(event)}") if revision.nil?
+        end
       end
     end
   end

data/lib/cucumber/variable_expression.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Cucumber
+  module VariableExpression
+    def evaluate(expression, env)
+      return nil if expression.nil?
+
+      expression.gsub(/\${(.*?)(?:(?<!\\)\/(.*)\/(.*))?}/) do
+        variable = Regexp.last_match(1)
+        pattern = Regexp.last_match(2)
+        replacement = Regexp.last_match(3)
+
+        value = get_value(variable, env)
+        raise "Undefined variable #{variable}" if value.nil?
+
+        if pattern.nil?
+          value
+        else
+          regexp = Regexp.new(pattern.gsub('\/', '/'))
+          match = value.match(regexp)
+          raise "No match for variable #{variable}" if match.nil?
+
+          match[1..].each_with_index do |group, i|
+            replacement = replacement.gsub("\\#{i + 1}", group)
+          end
+          replacement
+        end
+      end
+    rescue StandardError
+      nil
+    end
+
+    def get_value(variable, env)
+      if variable.index('*')
+        regexp = Regexp.new(variable.gsub('*', '.*'))
+        # GoCD env var with dynamic "material" name
+        # https://github.com/ashwanthkumar/gocd-build-github-pull-requests#github
+        env.each do |name, value|
+          return value if regexp.match?(name)
+        end
+      end
+      env[variable]
+    end
+  end
+end

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-ci-environment
 version: !ruby/object:Gem::Version
-  version: 13.0.0
+  version: 15.0.0
 platform: ruby
 authors:
 - Vincent Prêtre
+- Luke Hill
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -43,56 +44,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.81.0
+        version: 1.88.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.81.0
+        version: 1.88.2
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.23.0
+        version: 1.26.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.10.2
 description: Detect CI Environment from environment variables
 email: cukes@googlegroups.com
 executables: []
@@ -100,9 +101,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- lib/cucumber/CiEnvironments.json
 - lib/cucumber/ci_environment.rb
-- lib/cucumber/ci_environment/CiEnvironments.json
-- lib/cucumber/ci_environment/variable_expression.rb
+- lib/cucumber/variable_expression.rb
 homepage: https://github.com/cucumber/ci-environment
 licenses:
 - MIT
@@ -118,14 +119,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 3.2.8
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
-summary: cucumber-ci-environment-13.0.0
+summary: cucumber-ci-environment-15.0.0
 test_files: []

data/lib/cucumber/ci_environment/variable_expression.rb

@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-module Cucumber
-  module CiEnvironment
-    module VariableExpression
-      def evaluate(expression, env)
-        return nil if expression.nil?
-
-        begin
-          expression.gsub(/\${(.*?)(?:(?<!\\)\/(.*)\/(.*))?}/) do
-            variable = Regexp.last_match(1)
-            pattern = Regexp.last_match(2)
-            replacement = Regexp.last_match(3)
-
-            value = get_value(variable, env)
-            raise "Undefined variable #{variable}" if value.nil?
-
-            if pattern.nil?
-              value
-            else
-              regexp = Regexp.new(pattern.gsub('\/', '/'))
-              match = value.match(regexp)
-              raise "No match for variable #{variable}" if match.nil?
-
-              match[1..].each_with_index do |group, i|
-                replacement = replacement.gsub("\\#{i + 1}", group)
-              end
-              replacement
-            end
-          end
-        rescue StandardError
-          nil
-        end
-      end
-
-      def get_value(variable, env)
-        if variable.index('*')
-          env.each do |name, value|
-            return value if Regexp.new(variable.gsub('*', '.*')).match?(name)
-          end
-        end
-        env[variable]
-      end
-    end
-  end
-end