cucumber-create-meta 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3439afc7d30fd03f345e699bfd6bc8ad5148a269a1de1bf7a844ede135b0b4ac
-  data.tar.gz: 2f2224d15ab4da7133cb2c6461733b4a9e0732f9f6ebd9207a023eab59d99038
+  metadata.gz: 0444456cd7e3d135ce1393117b37b0804d1b027365e8ad6ded7eb2999cc3704e
+  data.tar.gz: bfb0927d6316a1dd577326f59c314c3d69e7f3144adcdba2b4aea1d3a58309f1
 SHA512:
-  metadata.gz: 10a81fe0937170ff097b4d83b020aeabdc36f8ca0408387361aace80eab70c2923c18e82044af52ab8e9a07cf3f3ef93fb9dafedb10c65052350544fcd18f95a
-  data.tar.gz: 01bbf4f81b424027207b84f9de6fc98541ea4eedb3d746f27d6300bebc4a55dd30806ca9065306fea6c40ac57b68277c24376afddf500b99ad0776ecb5a52f9d
+  metadata.gz: 7b1251604b3d8617bd1c4cc3845099c0b48e482d7d162145311d3698d23cd9db861b5320e367174657ec639b49bd7ab8cb187a7529fa7c14f3945912af91d2e1
+  data.tar.gz: 6144894e4f5f5826e3060717eff1c83ae5db6c4c426b7ac264694810268f9f18713c6b1b6ac8dd90b2e888039ece6f7507f82d62471a9e88906630134a23156a

data/lib/cucumber/create_meta.rb

@@ -1,29 +1,31 @@
+require 'uri'
 require 'cucumber/messages'
 require 'sys/uname'
 require 'json'
 
 module Cucumber
   module CreateMeta
-    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)
+    def create_meta(tool_name, tool_version, env = ENV)
       Cucumber::Messages::Meta.new(
-        protocol_version: Cucumber::Messages::VERSION,
-        implementation: Cucumber::Messages::Meta::Product.new(
-          name: tool_name,
-          version: tool_version
-        ),
-        runtime: Cucumber::Messages::Meta::Product.new(
-          name: RUBY_ENGINE,
-          version: RUBY_VERSION
-        ),
-        os: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_os'],
-          version: Sys::Uname.uname.version
-        ),
-        cpu: Cucumber::Messages::Meta::Product.new(
-          name: RbConfig::CONFIG['target_cpu']
-        )
+          protocol_version: Cucumber::Messages::VERSION,
+          implementation: Cucumber::Messages::Meta::Product.new(
+              name: tool_name,
+              version: tool_version
+          ),
+          runtime: Cucumber::Messages::Meta::Product.new(
+              name: RUBY_ENGINE,
+              version: RUBY_VERSION
+          ),
+          os: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_os'],
+              version: Sys::Uname.uname.version
+          ),
+          cpu: Cucumber::Messages::Meta::Product.new(
+              name: RbConfig::CONFIG['target_cpu']
+          ),
+          ci: detect_ci(env)
       )
     end
 
@@ -40,14 +42,14 @@ module Cucumber
       return nil if url.nil?
 
       Cucumber::Messages::Meta::CI.new(
-        url: url,
-        name: ci_name,
-        git: Cucumber::Messages::Meta::CI::Git.new(
-          remote: 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),
-        )
+          url: url,
+          name: ci_name,
+          git: Cucumber::Messages::Meta::CI::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
 
@@ -79,6 +81,17 @@ module Cucumber
       m[1]
     end
 
-    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate
+    def remove_userinfo_from_url(value)
+      return nil if value.nil?
+      begin
+        uri = URI(value)
+        uri.userinfo = ''
+        uri.to_s
+      rescue
+        value
+      end
+    end
+
+    module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate, :remove_userinfo_from_url
   end
 end

data/spec/cucumber/remove_userinfo_from_url_spec.rb

@@ -0,0 +1,29 @@
+require 'cucumber/create_meta'
+
+describe 'remove_user_info_from_url' do
+  it 'returns nil for nil' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url(nil)).to be_nil
+  end
+
+  it 'returns empty string for empty string' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url('')).to eq('')
+  end
+
+  it 'leaves the data intact when no sensitive information is detected' do
+    expect(Cucumber::CreateMeta.remove_userinfo_from_url('pretty safe')).to eq('pretty safe')
+  end
+
+  context 'with URLs' do
+    it 'leaves intact when no password is found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('https://example.com/git/repo.git')).to eq('https://example.com/git/repo.git')
+    end
+
+    it 'removes credentials when found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('http://login@example.com/git/repo.git')).to eq('http://example.com/git/repo.git')
+    end
+
+    it 'removes credentials and passwords when found' do
+      expect(Cucumber::CreateMeta.remove_userinfo_from_url('ssh://login:password@example.com/git/repo.git')).to eq('ssh://example.com/git/repo.git')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cucumber-create-meta
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Vincent Prêtre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-02-09 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.0'
+        version: '14.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 14.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '14.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.0.1
+        version: 14.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.3
   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.3
 - !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: []
@@ -101,6 +101,7 @@ files:
 - lib/cucumber/create_meta.rb
 - spec/capture_warnings.rb
 - spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb
 homepage: https://github.com/cucumber/create-meta-ruby
 licenses:
 - MIT
@@ -129,7 +130,8 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: cucumber-create-meta-2.0.0
+summary: cucumber-create-meta-3.0.0
 test_files:
-- spec/cucumber/create_meta_spec.rb
 - spec/capture_warnings.rb
+- spec/cucumber/create_meta_spec.rb
+- spec/cucumber/remove_userinfo_from_url_spec.rb