cucumber-create-meta 2.0.0 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/cucumber/create_meta.rb +40 -27
  3. data/spec/cucumber/remove_userinfo_from_url_spec.rb +29 -0
  4. metadata +18 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3439afc7d30fd03f345e699bfd6bc8ad5148a269a1de1bf7a844ede135b0b4ac
4
- data.tar.gz: 2f2224d15ab4da7133cb2c6461733b4a9e0732f9f6ebd9207a023eab59d99038
3
+ metadata.gz: 0444456cd7e3d135ce1393117b37b0804d1b027365e8ad6ded7eb2999cc3704e
4
+ data.tar.gz: bfb0927d6316a1dd577326f59c314c3d69e7f3144adcdba2b4aea1d3a58309f1
5
5
  SHA512:
6
- metadata.gz: 10a81fe0937170ff097b4d83b020aeabdc36f8ca0408387361aace80eab70c2923c18e82044af52ab8e9a07cf3f3ef93fb9dafedb10c65052350544fcd18f95a
7
- data.tar.gz: 01bbf4f81b424027207b84f9de6fc98541ea4eedb3d746f27d6300bebc4a55dd30806ca9065306fea6c40ac57b68277c24376afddf500b99ad0776ecb5a52f9d
6
+ metadata.gz: 7b1251604b3d8617bd1c4cc3845099c0b48e482d7d162145311d3698d23cd9db861b5320e367174657ec639b49bd7ab8cb187a7529fa7c14f3945912af91d2e1
7
+ data.tar.gz: 6144894e4f5f5826e3060717eff1c83ae5db6c4c426b7ac264694810268f9f18713c6b1b6ac8dd90b2e888039ece6f7507f82d62471a9e88906630134a23156a
data/lib/cucumber/create_meta.rb CHANGED
@@ -1,29 +1,31 @@
1
+ require 'uri'
1
2
  require 'cucumber/messages'
2
3
  require 'sys/uname'
3
4
  require 'json'
4
5
 
5
6
  module Cucumber
6
7
  module CreateMeta
7
- CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__),"ciDict.json")))
8
+ CI_DICT = JSON.parse(IO.read(File.join(File.dirname(__FILE__), "ciDict.json")))
8
9
 
9
- def create_meta(tool_name, tool_version)
10
+ def create_meta(tool_name, tool_version, env = ENV)
10
11
  Cucumber::Messages::Meta.new(
11
- protocol_version: Cucumber::Messages::VERSION,
12
- implementation: Cucumber::Messages::Meta::Product.new(
13
- name: tool_name,
14
- version: tool_version
15
- ),
16
- runtime: Cucumber::Messages::Meta::Product.new(
17
- name: RUBY_ENGINE,
18
- version: RUBY_VERSION
19
- ),
20
- os: Cucumber::Messages::Meta::Product.new(
21
- name: RbConfig::CONFIG['target_os'],
22
- version: Sys::Uname.uname.version
23
- ),
24
- cpu: Cucumber::Messages::Meta::Product.new(
25
- name: RbConfig::CONFIG['target_cpu']
26
- )
12
+ protocol_version: Cucumber::Messages::VERSION,
13
+ implementation: Cucumber::Messages::Meta::Product.new(
14
+ name: tool_name,
15
+ version: tool_version
16
+ ),
17
+ runtime: Cucumber::Messages::Meta::Product.new(
18
+ name: RUBY_ENGINE,
19
+ version: RUBY_VERSION
20
+ ),
21
+ os: Cucumber::Messages::Meta::Product.new(
22
+ name: RbConfig::CONFIG['target_os'],
23
+ version: Sys::Uname.uname.version
24
+ ),
25
+ cpu: Cucumber::Messages::Meta::Product.new(
26
+ name: RbConfig::CONFIG['target_cpu']
27
+ ),
28
+ ci: detect_ci(env)
27
29
  )
28
30
  end
29
31
 
@@ -40,14 +42,14 @@ module Cucumber
40
42
  return nil if url.nil?
41
43
 
42
44
  Cucumber::Messages::Meta::CI.new(
43
- url: url,
44
- name: ci_name,
45
- git: Cucumber::Messages::Meta::CI::Git.new(
46
- remote: evaluate(ci_system['git']['remote'], env),
47
- revision: evaluate(ci_system['git']['revision'], env),
48
- branch: evaluate(ci_system['git']['branch'], env),
49
- tag: evaluate(ci_system['git']['tag'], env),
50
- )
45
+ url: url,
46
+ name: ci_name,
47
+ git: Cucumber::Messages::Meta::CI::Git.new(
48
+ remote: remove_userinfo_from_url(evaluate(ci_system['git']['remote'], env)),
49
+ revision: evaluate(ci_system['git']['revision'], env),
50
+ branch: evaluate(ci_system['git']['branch'], env),
51
+ tag: evaluate(ci_system['git']['tag'], env),
52
+ )
51
53
  )
52
54
  end
53
55
 
@@ -79,6 +81,17 @@ module Cucumber
79
81
  m[1]
80
82
  end
81
83
 
82
- module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate
84
+ def remove_userinfo_from_url(value)
85
+ return nil if value.nil?
86
+ begin
87
+ uri = URI(value)
88
+ uri.userinfo = ''
89
+ uri.to_s
90
+ rescue
91
+ value
92
+ end
93
+ end
94
+
95
+ module_function :create_meta, :detect_ci, :create_ci, :group1, :evaluate, :remove_userinfo_from_url
83
96
  end
84
97
  end
data/spec/cucumber/remove_userinfo_from_url_spec.rb ADDED
@@ -0,0 +1,29 @@
1
+ require 'cucumber/create_meta'
2
+
3
+ describe 'remove_user_info_from_url' do
4
+ it 'returns nil for nil' do
5
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url(nil)).to be_nil
6
+ end
7
+
8
+ it 'returns empty string for empty string' do
9
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url('')).to eq('')
10
+ end
11
+
12
+ it 'leaves the data intact when no sensitive information is detected' do
13
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url('pretty safe')).to eq('pretty safe')
14
+ end
15
+
16
+ context 'with URLs' do
17
+ it 'leaves intact when no password is found' do
18
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url('https://example.com/git/repo.git')).to eq('https://example.com/git/repo.git')
19
+ end
20
+
21
+ it 'removes credentials when found' do
22
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url('http://login@example.com/git/repo.git')).to eq('http://example.com/git/repo.git')
23
+ end
24
+
25
+ it 'removes credentials and passwords when found' do
26
+ expect(Cucumber::CreateMeta.remove_userinfo_from_url('ssh://login:password@example.com/git/repo.git')).to eq('ssh://example.com/git/repo.git')
27
+ end
28
+ end
29
+ end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cucumber-create-meta
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vincent Prêtre
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-07 00:00:00.000000000 Z
11
+ date: 2021-02-09 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cucumber-messages
@@ -16,20 +16,20 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: '13.0'
19
+ version: '14.0'
20
20
  - - ">="
21
21
  - !ruby/object:Gem::Version
22
- version: 13.0.1
22
+ version: 14.0.1
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - "~>"
28
28
  - !ruby/object:Gem::Version
29
- version: '13.0'
29
+ version: '14.0'
30
30
  - - ">="
31
31
  - !ruby/object:Gem::Version
32
- version: 13.0.1
32
+ version: 14.0.1
33
33
  - !ruby/object:Gem::Dependency
34
34
  name: sys-uname
35
35
  requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
39
39
  version: '1.2'
40
40
  - - ">="
41
41
  - !ruby/object:Gem::Version
42
- version: 1.2.1
42
+ version: 1.2.2
43
43
  type: :runtime
44
44
  prerelease: false
45
45
  version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
49
49
  version: '1.2'
50
50
  - - ">="
51
51
  - !ruby/object:Gem::Version
52
- version: 1.2.1
52
+ version: 1.2.2
53
53
  - !ruby/object:Gem::Dependency
54
54
  name: rake
55
55
  requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
59
59
  version: '13.0'
60
60
  - - ">="
61
61
  - !ruby/object:Gem::Version
62
- version: 13.0.1
62
+ version: 13.0.3
63
63
  type: :development
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
@@ -69,27 +69,27 @@ dependencies:
69
69
  version: '13.0'
70
70
  - - ">="
71
71
  - !ruby/object:Gem::Version
72
- version: 13.0.1
72
+ version: 13.0.3
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: rspec
75
75
  requirement: !ruby/object:Gem::Requirement
76
76
  requirements:
77
77
  - - "~>"
78
78
  - !ruby/object:Gem::Version
79
- version: '3.9'
79
+ version: '3.10'
80
80
  - - ">="
81
81
  - !ruby/object:Gem::Version
82
- version: 3.9.0
82
+ version: 3.10.0
83
83
  type: :development
84
84
  prerelease: false
85
85
  version_requirements: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: '3.9'
89
+ version: '3.10'
90
90
  - - ">="
91
91
  - !ruby/object:Gem::Version
92
- version: 3.9.0
92
+ version: 3.10.0
93
93
  description: Produce the meta message for Cucumber Ruby
94
94
  email: cukes@googlegroups.com
95
95
  executables: []
@@ -101,6 +101,7 @@ files:
101
101
  - lib/cucumber/create_meta.rb
102
102
  - spec/capture_warnings.rb
103
103
  - spec/cucumber/create_meta_spec.rb
104
+ - spec/cucumber/remove_userinfo_from_url_spec.rb
104
105
  homepage: https://github.com/cucumber/create-meta-ruby
105
106
  licenses:
106
107
  - MIT
@@ -129,7 +130,8 @@ requirements: []
129
130
  rubygems_version: 3.1.2
130
131
  signing_key:
131
132
  specification_version: 4
132
- summary: cucumber-create-meta-2.0.0
133
+ summary: cucumber-create-meta-3.0.0
133
134
  test_files:
134
- - spec/cucumber/create_meta_spec.rb
135
135
  - spec/capture_warnings.rb
136
+ - spec/cucumber/create_meta_spec.rb
137
+ - spec/cucumber/remove_userinfo_from_url_spec.rb