cucumber-create-meta 2.0.4 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbdf3f86379a4f4dd927107934be7f8f76dfc6f8074e58c3bfd416f721464e94
-  data.tar.gz: e2deca2d48e54912f16d398c710b8ef9be6fd516525f6286db6ec117c058f884
+  metadata.gz: d6ee53160861ac80fab521c7c68e65d3f67992a253096b1bc86eebf071e93084
+  data.tar.gz: b3a3a1a5272e75af443cb88f736924209563e92f40d8d37bac855a71ddcc9608
 SHA512:
-  metadata.gz: f6d40548b2963719ed2e36c01d0bcb637a62591383465ccbd9c9bd273de28bb614bc29d320b36a699a376a7907fd1ba8a4c551c3c6a4fc95f2cf9cea29dc9843
-  data.tar.gz: e77db158dc98e3895902a28741cf96053a98d8db5156f9d3c90e0cb7bcb96fd10253beee705638b7c17c84ea9796ba5667cf4f937752a0d57b0f103406418113
+  metadata.gz: 8a3d47bf29d4e21381473159abafa1262f179c3049eacfbad3725ac0a8c054ba061849d66c585b1f60167e0ca5ecab06615bfc7e73a8d9f19b8d547504cabeb6
+  data.tar.gz: 451316acb36b939dff9e89e772585bd1acac9d6c07e3d61847bff0b5bad97e7e18e02e8eed097f43b3b61caf4c716eb9f4e798fbc64f5ee6578cddbd3430677c

data/lib/cucumber/ciDict.json

@@ -1,24 +1,27 @@
 {
   "Azure Pipelines": {
-    "url": "${BUILD_URI}",
+    "url": "${BUILD_BUILDURI}",
+    "buildNumber": "${BUILD_BUILDNUMBER}",
     "git": {
       "remote": "${BUILD_REPOSITORY_URI}",
       "revision": "${BUILD_SOURCEVERSION}",
-      "branch": "${refbranch BUILD_SOURCEBRANCH}",
-      "tag": "${reftag BUILD_SOURCEBRANCH}"
+      "branch": "${BUILD_SOURCEBRANCH/refs\/heads\/(.*)/\\1}",
+      "tag": "${BUILD_SOURCEBRANCH/refs\/tags\/(.*)/\\1}"
     }
   },
   "Bamboo": {
-    "url": "${bamboo.buildResultsUrl}",
+    "url": "${bamboo_buildResultsUrl}",
+    "buildNumber": "${bamboo_buildNumber}",
     "git": {
-      "remote": "${bamboo.planRepository.1.repositoryUrl}",
-      "revision": "${bamboo.planRepository.1.revision}",
-      "branch": "${bamboo.planRepository.1.branch}",
+      "remote": "${bamboo_planRepository_repositoryUrl}",
+      "revision": "${bamboo_planRepository_revision}",
+      "branch": "${bamboo_planRepository_branch}",
       "tag": null
     }
   },
   "Buddy": {
     "url": "${BUDDY_EXECUTION_URL}",
+    "buildNumber": "${BUDDY_EXECUTION_ID}",
     "git": {
       "remote": "${BUDDY_SCM_URL}",
       "revision": "${BUDDY_EXECUTION_REVISION}",
@@ -26,8 +29,19 @@
       "tag": "${BUDDY_EXECUTION_TAG}"
     }
   },
+  "Bitrise": {
+    "url": "${BITRISE_BUILD_URL}",
+    "buildNumber": "${BITRISE_BUILD_NUMBER}",
+    "git": {
+      "remote": "${GIT_REPOSITORY_URL}",
+      "revision": "${BITRISE_GIT_COMMIT}",
+      "branch": "${BITRISE_GIT_BRANCH}",
+      "tag": "${BITRISE_GIT_TAG}"
+    }
+  },
   "CircleCI": {
     "url": "${CIRCLE_BUILD_URL}",
+    "buildNumber": "${CIRCLE_BUILD_NUM}",
     "git": {
       "remote": "${CIRCLE_REPOSITORY_URL}",
       "revision": "${CIRCLE_SHA1}",
@@ -35,26 +49,39 @@
       "tag": "${CIRCLE_TAG}"
     }
   },
-  "CodeShip": {
+  "CodeFresh": {
     "url": "${CF_BUILD_URL}",
+    "buildNumber": "${CF_BUILD_ID}",
     "git": {
-      "remote": "${CF_COMMIT_URL}",
+      "remote": "${CF_COMMIT_URL/(.*)\\/commit.+$/\\1}.git",
       "revision": "${CF_REVISION}",
       "branch": "${CF_BRANCH}",
       "tag": null
     }
   },
+  "CodeShip": {
+    "url": "${CI_BUILD_URL}",
+    "buildNumber": "${CI_BUILD_NUMBER}",
+    "git": {
+      "remote": "${CI_PULL_REQUEST/(.*)\\/pull\\/\\d+/\\1.git}",
+      "revision": "${CI_COMMIT_ID}",
+      "branch": "${CI_BRANCH}",
+      "tag": null
+    }
+  },
   "GitHub Actions": {
     "url": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}",
+    "buildNumber": "${GITHUB_RUN_ID}",
     "git": {
       "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
       "revision": "${GITHUB_SHA}",
-      "branch": "${refbranch GITHUB_REF}",
-      "tag": "${reftag GITHUB_REF}"
+      "branch": "${GITHUB_REF/refs\/heads\/(.*)/\\1}",
+      "tag": "${GITHUB_REF/refs\/tags\/(.*)/\\1}"
     }
   },
   "GitLab": {
     "url": "${CI_JOB_URL}",
+    "buildNumber": "${CI_JOB_ID}",
     "git": {
       "remote": "${CI_REPOSITORY_URL}",
       "revision": "${CI_COMMIT_SHA}",
@@ -63,16 +90,28 @@
     }
   },
   "GoCD": {
-    "url": "${GO_SERVER_URL}/???",
+    "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": {
-      "remote": null,
+      "remote": "${GO_SCM_*_PR_URL/(.*)\\/pull\\/\\d+/\\1.git}",
       "revision": "${GO_REVISION}",
-      "branch": null,
+      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}",
+      "tag": null
+    }
+  },
+  "Jenkins": {
+    "url": "${BUILD_URL}",
+    "buildNumber": "${BUILD_NUMBER}",
+    "git": {
+      "remote": "${GIT_URL}",
+      "revision": "${GIT_COMMIT}",
+      "branch": "${GIT_LOCAL_BRANCH}",
       "tag": null
     }
   },
   "Semaphore": {
-    "url": "${SEMAPHORE_ORGANIZATION_URL}/${}",
+    "url": "${SEMAPHORE_ORGANIZATION_URL}/jobs/${SEMAPHORE_JOB_ID}",
+    "buildNumber": "${SEMAPHORE_JOB_ID}",
     "git": {
       "remote": "${SEMAPHORE_GIT_URL}",
       "revision": "${SEMAPHORE_GIT_SHA}",
@@ -80,17 +119,9 @@
       "tag": "${SEMAPHORE_GIT_TAG_NAME}"
     }
   },
-  "TeamCity": {
-    "url": "${teamcity.serverUrl}/app/rest/builds/id:${teamcity.build.id}",
-    "git": {
-      "remote": null,
-      "revision": "${build.vcs.number}",
-      "branch": "${teamcity.build.branch}",
-      "tag": null
-    }
-  },
   "Travis CI": {
     "url": "${TRAVIS_BUILD_WEB_URL}",
+    "buildNumber": "${TRAVIS_JOB_NUMBER}",
     "git": {
       "remote": "https://github.com/${TRAVIS_REPO_SLUG}.git",
       "revision": "${TRAVIS_COMMIT}",
@@ -100,6 +131,7 @@
   },
   "Wercker": {
     "url": "${WERCKER_RUN_URL}",
+    "buildNumber": "${WERCKER_RUN_URL/.*\\/([^\\/]+)$/\\1}",
     "git": {
       "remote": "https://${WERCKER_GIT_DOMAIN}/${WERCKER_GIT_OWNER}/${WERCKER_GIT_REPOSITORY}.git",
       "revision": "${WERCKER_GIT_COMMIT}",

data/lib/cucumber/create_meta.rb

@@ -1,32 +1,34 @@
 require 'uri'
-require 'cucumber/messages'
 require 'sys/uname'
 require 'json'
+require 'cucumber/messages'
+require 'cucumber/create_meta/variable_expression'
 
 module Cucumber
   module CreateMeta
+    extend Cucumber::CreateMeta::VariableExpression
     CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), "ciDict.json")))
 
     def create_meta(tool_name, tool_version, env = ENV)
-      Cucumber::Messages::Meta.new(
+      {
           protocol_version: Cucumber::Messages::VERSION,
-          implementation: Cucumber::Messages::Meta::Product.new(
+          implementation: {
               name: tool_name,
               version: tool_version
-          ),
-          runtime: Cucumber::Messages::Meta::Product.new(
+          },
+          runtime: {
               name: RUBY_ENGINE,
               version: RUBY_VERSION
-          ),
-          os: Cucumber::Messages::Meta::Product.new(
+          },
+          os: {
               name: RbConfig::CONFIG['target_os'],
               version: Sys::Uname.uname.version
-          ),
-          cpu: Cucumber::Messages::Meta::Product.new(
+          },
+          cpu: {
               name: RbConfig::CONFIG['target_cpu']
-          ),
+          },
           ci: detect_ci(env)
-      )
+      }
     end
 
     def detect_ci(env)
@@ -41,44 +43,17 @@ module Cucumber
       url = evaluate(ci_system['url'], env)
       return nil if url.nil?
 
-      Cucumber::Messages::Meta::CI.new(
+      {
           url: url,
           name: ci_name,
-          git: Cucumber::Messages::Meta::CI::Git.new(
+          buildNumber: evaluate(ci_system['buildNumber'], env),
+          git: {
               remote: remove_userinfo_from_url(evaluate(ci_system['git']['remote'], env)),
               revision: evaluate(ci_system['git']['revision'], env),
               branch: evaluate(ci_system['git']['branch'], env),
               tag: evaluate(ci_system['git']['tag'], env),
-          )
-      )
-    end
-
-    def evaluate(template, env)
-      return nil if template.nil?
-      begin
-        template.gsub(/\${((refbranch|reftag)\s+)?([^\s}]+)(\s+\|\s+([^}]+))?}/) do
-          func = $2
-          variable = $3
-          default_value = $5 == "" ? nil : $5
-          value = env[variable] || default_value
-
-          if func == 'refbranch'
-            value = group1(value, /^refs\/heads\/(.*)/)
-          elsif func == 'reftag'
-            value = group1(value, /^refs\/tags\/(.*)/)
-          end
-          raise "Undefined variable: #{variable}" if value.nil?
-          value
-        end
-      rescue
-        nil
-      end
-    end
-
-    def group1(value, regexp)
-      m = value.match(regexp)
-      raise "No match" if m.nil?
-      m[1]
+          }.delete_if {|k,v| v.nil?}
+      }
     end
 
     def remove_userinfo_from_url(value)
@@ -92,6 +67,6 @@ module Cucumber
       end
     end
 
-    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate, :remove_userinfo_from_url
+    module_function :create_meta, :detect_ci, :create_ci, :remove_userinfo_from_url
   end
 end

data/lib/cucumber/create_meta/variable_expression.rb

@@ -0,0 +1,41 @@
+module Cucumber
+  module CreateMeta
+    module VariableExpression
+      def evaluate(expression, env)
+        return nil if expression.nil?
+        begin
+          expression.gsub(/\${(.*?)(?:(?<!\\)\/(.*)\/(.*))?}/) do
+            variable = $1
+            pattern = $2
+            replacement = $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..-1].each_with_index do |group, i|
+                replacement = replacement.gsub("\\#{i+1}", group)
+              end
+              replacement
+            end
+          end
+        rescue
+          nil
+        end
+      end
+
+      def get_value(variable, env)
+        if variable.index('*')
+          env.each do |name, value|
+            return value if Regexp.new(variable.gsub('*', '.*')) =~ name
+          end
+        end
+        env[variable]
+      end
+    end
+  end
+end

data/spec/cucumber/create_meta_spec.rb

@@ -1,16 +1,16 @@
 require 'cucumber/create_meta'
 
-describe 'createMeta' do
+describe 'create_meta' do
   it 'generates a Meta message with platform information' do
     meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z')
 
-    expect(meta.protocol_version).to match(/\d+\.\d+\.\d+/)
-    expect(meta.implementation.name).to eq('cucumba-ruby')
-    expect(meta.implementation.version).to eq('X.Y.Z')
-    expect(meta.runtime.name).to match(/(jruby|ruby)/)
-    expect(meta.runtime.version).to eq(RUBY_VERSION)
-    expect(meta.os.name).to match(/.+/)
-    expect(meta.os.version).to match(/.+/)
-    expect(meta.cpu.name).to match(/.+/)
+    expect(meta[:protocol_version]).to match(/\d+\.\d+\.\d+/)
+    expect(meta[:implementation][:name]).to eq('cucumba-ruby')
+    expect(meta[:implementation][:version]).to eq('X.Y.Z')
+    expect(meta[:runtime][:name]).to match(/(jruby|ruby)/)
+    expect(meta[:runtime][:version]).to eq(RUBY_VERSION)
+    expect(meta[:os][:name]).to match(/.+/)
+    expect(meta[:os][:version]).to match(/.+/)
+    expect(meta[:cpu][:name]).to match(/.+/)
   end
 end

data/spec/cucumber/evaluate_variable_expression_spec.rb

@@ -0,0 +1,38 @@
+require 'cucumber/create_meta'
+
+describe 'Cucumber::CreateMeta::VariableExpression.evaluate' do
+  include Cucumber::CreateMeta::VariableExpression
+
+  it 'returns nil when a variable is undefined' do
+    expression = "hello-${SOME_VAR}";
+    result = evaluate(expression, {});
+    expect(result).to eq(nil)
+  end
+
+  it 'gets a value without replacement' do
+    expression = "${SOME_VAR}";
+    result = evaluate(expression, {'SOME_VAR' => 'some_value'});
+    expect(result).to eq('some_value')
+  end
+
+  it 'captures a group' do
+    expression = "${SOME_REF/refs\/heads\/(.*)/\\1}";
+    result = evaluate(expression, {'SOME_REF' => 'refs/heads/main'});
+    expect(result).to eq('main')
+  end
+
+  it 'works with star wildcard in var' do
+    expression = "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}";
+    result = evaluate(expression, {'GO_SCM_MY_MATERIAL_PR_BRANCH' => 'ashwankthkumar:feature-1'});
+    expect(result).to eq('feature-1')
+  end
+
+  it 'evaluates a complex expression' do
+    expression = "hello-${VAR1}-${VAR2/(.*) (.*)/\\2-\\1}-world";
+    result = evaluate(expression, {
+      'VAR1' => 'amazing',
+      'VAR2' => 'gorgeous beautiful'
+    })
+    expect(result).to eq('hello-amazing-beautiful-gorgeous-world')
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 6.0.1
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-29 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '17.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 17.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.1'
+        version: '17.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.1.0
+        version: 17.0.1
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,27 +69,27 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.9.0
+        version: 3.10.0
 description: Produce the meta message for Cucumber Ruby
 email: cukes@googlegroups.com
 executables: []
@@ -99,18 +99,20 @@ files:
 - LICENSE
 - lib/cucumber/ciDict.json
 - lib/cucumber/create_meta.rb
+- lib/cucumber/create_meta/variable_expression.rb
 - spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/evaluate_variable_expression_spec.rb
 - spec/cucumber/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/create-meta-ruby
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/cucumber/cucumber/issues
-  changelog_uri: https://github.com/cucumber/cucumber/blob/master/gherkin/CHANGELOG.md
+  changelog_uri: https://github.com/cucumber/common/blob/main/gherkin/CHANGELOG.md
   documentation_uri: https://cucumber.io/docs/gherkin/
   mailing_list_uri: https://groups.google.com/forum/#!forum/cukes
-  source_code_uri: https://github.com/cucumber/cucumber/blob/master/gherkin/ruby
+  source_code_uri: https://github.com/cucumber/common/blob/main/gherkin/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -130,8 +132,9 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-2.0.4
+summary: cucumber-create-meta-6.0.1
 test_files:
 - spec/capture_warnings.rb
-- spec/cucumber/create_meta_spec.rb
 - spec/cucumber/remove_userinfo_from_url_spec.rb
+- spec/cucumber/evaluate_variable_expression_spec.rb
+- spec/cucumber/create_meta_spec.rb