cucumber-create-meta 5.0.0 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f655f885d4b250da9d8923262231aca56d2c2aff33788fbfc55ed1c86318c58
-  data.tar.gz: 7cc5d5a2e4ac40b40652373ee8afd8a61a3db34be2e58780945b7361b82ce906
+  metadata.gz: 683fb4b95e55fbb4f6ff2416f93caf823c8c1ceb64c00025c875ea8b6b935cd7
+  data.tar.gz: 7ee13b6e2bfbd50f40abbb8d2507f042cd2d0bad82653eb7309e8d56f469da01
 SHA512:
-  metadata.gz: e743ddae1ad514729be26e52995f2ab9e5b82f4b29d0ca60c92d48df8a19befb0653476d29326a23c7dc1f1539629cb19f0dea57280d65c919451c1a577e8f72
-  data.tar.gz: 54ce5d5d9ed2a044f68749d0127c4f6e543982d53ecdd746e6c5347dee3f72ba245c1cfb0d10172c8057da259bd4d3c5188f3f03b6264f1a679e3dda4dd3b1b9
+  metadata.gz: 9c05e86d15d9b4e46e791044b64cb8a0f76c4fd7fea563e4448b35b2d9d842e4764e47f15d8c396aa4e9d19c3e77a5ab4515d4b3df0fe552edae34593cb69d3b
+  data.tar.gz: 463c982c9731b39cf1ea15e20d29bcbfbf14187e09505b8f7b6bbb440adca1e47c20401686f2e301d4868a632094f0640d9b316f83e8eda9e1dbb87f808a393a

data/lib/cucumber/create_meta.rb

@@ -7,28 +7,28 @@ 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")))
+    CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'ciDict.json')))
 
     def create_meta(tool_name, tool_version, env = ENV)
-      {
-          protocol_version: Cucumber::Messages::VERSION,
-          implementation: {
-              name: tool_name,
-              version: tool_version
-          },
-          runtime: {
-              name: RUBY_ENGINE,
-              version: RUBY_VERSION
-          },
-          os: {
-              name: RbConfig::CONFIG['target_os'],
-              version: Sys::Uname.uname.version
-          },
-          cpu: {
-              name: RbConfig::CONFIG['target_cpu']
-          },
-          ci: detect_ci(env)
-      }
+      Cucumber::Messages::Meta.new(
+        protocol_version: Cucumber::Messages::VERSION,
+        implementation: Cucumber::Messages::Product.new(
+            name: tool_name,
+            version: tool_version
+        ),
+        runtime: Cucumber::Messages::Product.new(
+            name: RUBY_ENGINE,
+            version: RUBY_VERSION
+        ),
+        os: Cucumber::Messages::Product.new(
+            name: RbConfig::CONFIG['target_os'],
+            version: Sys::Uname.uname.version
+        ),
+        cpu: Cucumber::Messages::Product.new(
+            name: RbConfig::CONFIG['target_cpu']
+        ),
+        ci: detect_ci(env)
+      )
     end
 
     def detect_ci(env)
@@ -43,16 +43,17 @@ module Cucumber
       url = evaluate(ci_system['url'], env)
       return nil if url.nil?
 
-      {
-          url: url,
-          name: ci_name,
-          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),
-          }.delete_if {|k,v| v.nil?}
-      }
+      Cucumber::Messages::Ci.new(
+        url: url,
+        name: ci_name,
+        build_number: evaluate(ci_system['buildNumber'], env),
+        git: Cucumber::Messages::Git.new(
+          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 remove_userinfo_from_url(value)

data/spec/acceptance/create_meta_spec.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'cucumber/create_meta'
+require 'json'
+
+TEST_DATA_DIR = '../testdata'
+
+describe 'CreateMeta' do
+  Dir.each_child(TEST_DATA_DIR) do |test_data_file|
+    next unless File.extname(test_data_file) == '.txt'
+
+    context "with #{File.basename(test_data_file, '.*')}" do
+      subject { JSON.parse(meta.ci.to_json) }
+
+      let(:meta) { Cucumber::CreateMeta.create_meta('cucumber-something', '1.2.3', env) }
+      let(:env) { Hash[entries] }
+      let(:entries) { env_data.split(/\n/).map { |line| line.split(/=/) } }
+      let(:env_data) { IO.read("#{TEST_DATA_DIR}/#{test_data_file}") }
+
+      let(:expected_json) { File.read("#{TEST_DATA_DIR}/#{test_data_file}.json") }
+
+      it { is_expected.to eq JSON.parse(expected_json) }
+    end
+  end
+end

data/spec/cucumber/create_meta_spec.rb

@@ -2,15 +2,35 @@ require 'cucumber/create_meta'
 
 describe 'create_meta' do
   it 'generates a Meta message with platform information' do
-    meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z')
+    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(/.+/)
+    expect(meta.ci).to be_nil
+  end
+
+  it 'generates a Meta message with CI information' do
+    env = {
+      'BUILD_URL' => 'url of the build',
+      'BUILD_NUMBER' => '42',
+      'GIT_URL' => 'url of git',
+      'GIT_COMMIT' => 'git_sha1',
+      'GIT_LOCAL_BRANCH' => 'main'
+    }
+
+    meta = Cucumber::CreateMeta.create_meta('cucumba-ruby', 'X.Y.Z', env)
+
+    expect(meta.ci).not_to be_nil
+    expect(meta.ci.url).to eq env['BUILD_URL']
+    expect(meta.ci.build_number).to eq env['BUILD_NUMBER']
+    expect(meta.ci.git.remote).to eq env['GIT_URL']
+    expect(meta.ci.git.revision).to eq env['GIT_COMMIT']
+    expect(meta.ci.git.branch).to eq env['GIT_LOCAL_BRANCH']
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.3
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-17 00:00:00.000000000 Z
+date: 2021-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '16.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 17.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '16.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 16.0.0
+        version: 17.1.1
 - !ruby/object:Gem::Dependency
   name: sys-uname
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -69,7 +69,7 @@ dependencies:
         version: '13.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,9 +97,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- lib/cucumber/ciDict.json
 - lib/cucumber/create_meta.rb
 - lib/cucumber/create_meta/variable_expression.rb
+- spec/acceptance/create_meta_spec.rb
 - spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
 - spec/cucumber/evaluate_variable_expression_spec.rb
@@ -108,11 +108,11 @@ 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
+  bug_tracker_uri: https://github.com/cucumber/common/issues
+  changelog_uri: https://github.com/cucumber/common/blob/main/create-meta/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/tree/main/create-meta/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -132,9 +132,10 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-5.0.0
+summary: cucumber-create-meta-6.0.3
 test_files:
-- spec/capture_warnings.rb
-- spec/cucumber/create_meta_spec.rb
-- spec/cucumber/evaluate_variable_expression_spec.rb
+- spec/acceptance/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
+- spec/capture_warnings.rb

data/lib/cucumber/ciDict.json

@@ -1,137 +0,0 @@
-{
-  "Azure Pipelines": {
-    "url": "${BUILD_URI}",
-    "git": {
-      "remote": "${BUILD_REPOSITORY_URI}",
-      "revision": "${BUILD_SOURCEVERSION}",
-      "branch": "${BUILD_SOURCEBRANCH/refs\/heads\/(.*)/\\1}",
-      "tag": "${BUILD_SOURCEBRANCH/refs\/tags\/(.*)/\\1}"
-    }
-  },
-  "Bamboo": {
-    "url": "${bamboo.buildResultsUrl}",
-    "git": {
-      "remote": "${bamboo.planRepository.1.repositoryUrl}",
-      "revision": "${bamboo.planRepository.1.revision}",
-      "branch": "${bamboo.planRepository.1.branch}",
-      "tag": null
-    }
-  },
-  "Buddy": {
-    "url": "${BUDDY_EXECUTION_URL}",
-    "git": {
-      "remote": "${BUDDY_SCM_URL}",
-      "revision": "${BUDDY_EXECUTION_REVISION}",
-      "branch": "${BUDDY_EXECUTION_BRANCH}",
-      "tag": "${BUDDY_EXECUTION_TAG}"
-    }
-  },
-  "Bitrise": {
-    "url": "${BITRISE_BUILD_URL}",
-    "git": {
-      "remote": "${GIT_REPOSITORY_URL}",
-      "revision": "${BITRISE_GIT_COMMIT}",
-      "branch": "${BITRISE_GIT_BRANCH}",
-      "tag": "${BITRISE_GIT_TAG}"
-    }
-  },
-  "CircleCI": {
-    "url": "${CIRCLE_BUILD_URL}",
-    "git": {
-      "remote": "${CIRCLE_REPOSITORY_URL}",
-      "revision": "${CIRCLE_SHA1}",
-      "branch": "${CIRCLE_BRANCH}",
-      "tag": "${CIRCLE_TAG}"
-    }
-  },
-  "CodeFresh": {
-    "url": "${CF_BUILD_URL}",
-    "git": {
-      "remote": "${CF_COMMIT_URL}",
-      "revision": "${CF_REVISION}",
-      "branch": "${CF_BRANCH}",
-      "tag": null
-    }
-  },
-  "CodeShip": {
-    "url": "${CI_BUILD_URL}",
-    "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}",
-    "git": {
-      "remote": "${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}.git",
-      "revision": "${GITHUB_SHA}",
-      "branch": "${GITHUB_REF/refs\/heads\/(.*)/\\1}",
-      "tag": "${GITHUB_REF/refs\/tags\/(.*)/\\1}"
-    }
-  },
-  "GitLab": {
-    "url": "${CI_JOB_URL}",
-    "git": {
-      "remote": "${CI_REPOSITORY_URL}",
-      "revision": "${CI_COMMIT_SHA}",
-      "branch": "${CI_COMMIT_BRANCH}",
-      "tag": "${CI_COMMIT_TAG}"
-    }
-  },
-  "GoCD": {
-    "url": "${GO_SERVER_URL}/pipelines/${GO_PIPELINE_NAME}/${GO_PIPELINE_COUNTER}/${GO_STAGE_NAME}/${GO_STAGE_COUNTER}",
-    "git": {
-      "remote": "${GO_SCM_*_PR_URL/(.*)\\/pull\\/\\d+/\\1.git}",
-      "revision": "${GO_REVISION}",
-      "branch": "${GO_SCM_*_PR_BRANCH/.*:(.*)/\\1}",
-      "tag": null
-    }
-  },
-  "Jenkins": {
-    "url": "${BUILD_URL}",
-    "git": {
-      "remote": "${GIT_URL}",
-      "revision": "${GIT_COMMIT}",
-      "branch": "${GIT_LOCAL_BRANCH}",
-      "tag": null
-    }
-  },
-  "Semaphore": {
-    "url": "${SEMAPHORE_ORGANIZATION_URL}/jobs/${SEMAPHORE_JOB_ID}",
-    "git": {
-      "remote": "${SEMAPHORE_GIT_URL}",
-      "revision": "${SEMAPHORE_GIT_SHA}",
-      "branch": "${SEMAPHORE_GIT_BRANCH}",
-      "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}",
-    "git": {
-      "remote": "https://github.com/${TRAVIS_REPO_SLUG}.git",
-      "revision": "${TRAVIS_COMMIT}",
-      "branch": "${TRAVIS_BRANCH}",
-      "tag": "${TRAVIS_TAG}"
-    }
-  },
-  "Wercker": {
-    "url": "${WERCKER_RUN_URL}",
-    "git": {
-      "remote": "https://${WERCKER_GIT_DOMAIN}/${WERCKER_GIT_OWNER}/${WERCKER_GIT_REPOSITORY}.git",
-      "revision": "${WERCKER_GIT_COMMIT}",
-      "branch": "${WERCKER_GIT_BRANCH}",
-      "tag": null
-    }
-  }
-}