cucumber-create-meta 6.0.0 → 6.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c10212121773a60d2a7818cf9b9e8890cf412243f36a69b1d8ab6248d66b059
-  data.tar.gz: e8f7eeaa2cb1ba16145c0dc4b0fbf8662bacdd648f7a1fb19cf7a99aab90b0df
+  metadata.gz: 63127f1e5e91ab72c44f0bb1bd04fd3c6e135f3d663e527dc5cb9e83333b64bc
+  data.tar.gz: fe39fb543eaeb57b6f11e461a669da01348571d8bff54ab88a0cb1ed70afa910
 SHA512:
-  metadata.gz: 7fe13c2d94345aeb18f3dea76a177173c32a7b355cf75bae5c63881634443242a8962e6caeffd91be861163917bcbf98a927b6add7f9a82d2d00d76a0c289d4f
-  data.tar.gz: fef0b73181b7a120a9b3f7467c98a27aa47358ea0c045c5fc9d1cbf97c1bf37d3519d7da9f28062c3773b2b4f6516895656bf1388ea5058ac8339e722cb7d4ae
+  metadata.gz: 70de8133e0320a1ecd8a340e69fa5c469c874676b4c65aa7f7ef268c298b875720c9152068366b628183e4cc13d29387adee865defef9da23159465cf42b34ab
+  data.tar.gz: 40298073a226c0fd14ed6d3e2342fe01e5b3ef6c60cd3abcfcdcc54c760a572fcb55ccf76ca13e4ebf6a6a47263421977d47efb400e0cbb3b98f4042fcf78cc3

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,26 +43,27 @@ module Cucumber
       url = evaluate(ci_system['url'], env)
       return nil if url.nil?
 
-      {
-          url: url,
-          name: ci_name,
-          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),
-          }.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)
       return nil if value.nil?
+
       begin
         uri = URI(value)
         uri.userinfo = ''
         uri.to_s
-      rescue
+      rescue StandardError
         value
       end
     end

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: 6.0.0
+  version: 6.0.4
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-08 00:00:00.000000000 Z
+date: 2021-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 17.0.0
+        version: 17.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '17.0'
+        version: '17.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 17.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.5
+        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.5
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -100,19 +100,20 @@ files:
 - 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
 - spec/cucumber/remove_userinfo_from_url_spec.rb
-homepage: https://github.com/cucumber/create-meta-ruby
+homepage: https://github.com/cucumber/create-meta
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/cucumber/cucumber/issues
-  changelog_uri: https://github.com/cucumber/common/blob/main/gherkin/CHANGELOG.md
+  bug_tracker_uri: https://github.com/cucumber/create-meta/issues
+  changelog_uri: https://github.com/cucumber/create-meta/blob/main/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/common/blob/main/gherkin/ruby
+  source_code_uri: https://github.com/cucumber/create-meta/tree/main/ruby
 post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
@@ -132,9 +133,10 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-6.0.0
+summary: cucumber-create-meta-6.0.4
 test_files:
-- spec/capture_warnings.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