puppet-lint-topscope-variable-check 1.2.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8168088835aca0348f181b125582456955c20cb0dee175dd62f72ba1df6607bc
4
- data.tar.gz: 646719472eedfae47ad5ad0a3cd5d3f57bc5bf6ef3e7f8f0f6a845f27052ed95
3
+ metadata.gz: 1fc4c9fad102c69f34007e5ba9251dc01d21e026504fe8cd5d5758001260858e
4
+ data.tar.gz: afa1a825948a96aafc053c309d0c65bb7914c9cb4a72d3b0b9017897f30e8cca
5
5
  SHA512:
6
- metadata.gz: e0585fb8efa9c97dade2f2a3ee3d725d1ccb0c59e220a105420b19100b33c73631b0de286e084b06c79d015ac3faa768044f243c54f4a5500821350a522d8d00
7
- data.tar.gz: 23f37b88e4b10d51b8b05702e87081d554e048546193e9e633edc31a1a0350671ff3d01472702e8d7440c197cf2a9d0f63880440cb2b9c993a9827ac2d277392
6
+ metadata.gz: 7a545487b53ac6a268ef378e6adeae71b754085a3af3d29d07af5fa525bf9ec2169f37035c3fcf9ad81a8a9111858600f579346ac08706a63fa67081b67c8772
7
+ data.tar.gz: 1b40c7be69c3211843fe72821cd2a1fd90706bac4562ec25a6c987d343ee1b6e058f04e8ec2967beda4994c1579068acdfe2b07cc0be71d023e48b60806e46de
@@ -5,14 +5,15 @@ PuppetLint.new_check(:topscope_variable) do
5
5
  return if class_list.first.nil?
6
6
 
7
7
  tokens.select { |x| x.type == :VARIABLE }.each do |token|
8
- next if token.value !~ /^::[a-z0-9_][a-zA-Z0-9_]+::/
8
+ next unless /^::[a-z0-9_][a-zA-Z0-9_]+::/.match?(token.value)
9
+
9
10
  fixed = token.value.sub(/^::/, '')
10
11
  notify(
11
12
  :warning,
12
13
  message: "use $#{fixed} instead of $#{token.value}",
13
14
  line: token.line,
14
15
  column: token.column,
15
- token: token
16
+ token: token,
16
17
  )
17
18
  end
18
19
  end
@@ -2,6 +2,7 @@ require 'spec_helper'
2
2
 
3
3
  describe 'topscope_variable' do
4
4
  let(:msg) { 'use $foo::bar instead of $::foo::bar' }
5
+
5
6
  context 'with fix disabled' do
6
7
  context 'with correct topscope' do
7
8
  let(:code) do
@@ -14,7 +15,7 @@ describe 'topscope_variable' do
14
15
  PUP
15
16
  end
16
17
 
17
- it 'should not detect any problems' do
18
+ it 'does not detect any problems' do
18
19
  expect(problems).to have(0).problem
19
20
  end
20
21
  end
@@ -30,7 +31,7 @@ describe 'topscope_variable' do
30
31
  PUP
31
32
  end
32
33
 
33
- it 'should detect one problem' do
34
+ it 'detects one problem' do
34
35
  expect(problems).to have(1).problem
35
36
  end
36
37
  end
@@ -46,7 +47,7 @@ describe 'topscope_variable' do
46
47
  PUP
47
48
  end
48
49
 
49
- it 'should detect one problem' do
50
+ it 'detects one problem' do
50
51
  expect(problems).to have(1).problem
51
52
  end
52
53
  end
@@ -62,7 +63,7 @@ describe 'topscope_variable' do
62
63
  PUP
63
64
  end
64
65
 
65
- it 'should not detect any problems' do
66
+ it 'does not detect any problems' do
66
67
  expect(problems).to have(0).problem
67
68
  end
68
69
  end
@@ -78,7 +79,7 @@ describe 'topscope_variable' do
78
79
  PUP
79
80
  end
80
81
 
81
- it 'should detect one problem' do
82
+ it 'detects one problem' do
82
83
  expect(problems).to have(1).problem
83
84
  end
84
85
  end
@@ -94,7 +95,7 @@ describe 'topscope_variable' do
94
95
  PUP
95
96
  end
96
97
 
97
- it 'should not detect any problems' do
98
+ it 'does not detect any problems' do
98
99
  expect(problems).to have(0).problem
99
100
  end
100
101
  end
@@ -110,7 +111,7 @@ describe 'topscope_variable' do
110
111
  PUP
111
112
  end
112
113
 
113
- it 'should not detect any problems' do
114
+ it 'does not detect any problems' do
114
115
  expect(problems).to have(0).problem
115
116
  end
116
117
  end
@@ -136,7 +137,7 @@ describe 'topscope_variable' do
136
137
  PUP
137
138
  end
138
139
 
139
- it 'should not detect any problems' do
140
+ it 'does not detect any problems' do
140
141
  expect(problems).to have(0).problem
141
142
  end
142
143
  end
@@ -152,16 +153,8 @@ describe 'topscope_variable' do
152
153
  PUP
153
154
  end
154
155
 
155
- it 'should detect one problem' do
156
- expect(problems).to have(1).problem
157
- end
158
-
159
- it 'should fix the problem' do
160
- expect(problems).to contain_fixed(msg).on_line(3).in_column(16)
161
- end
162
-
163
- it 'should remove :: after the $' do
164
- expect(manifest).to eq <<~PUP
156
+ let(:fixed) do
157
+ <<~PUP
165
158
  class foo::blub {
166
159
  notify { 'foo':
167
160
  message => $foo::bar
@@ -169,6 +162,18 @@ describe 'topscope_variable' do
169
162
  }
170
163
  PUP
171
164
  end
165
+
166
+ it 'detects one problem' do
167
+ expect(problems).to have(1).problem
168
+ end
169
+
170
+ it 'fixes the problem' do
171
+ expect(problems).to contain_fixed(msg).on_line(3).in_column(16)
172
+ end
173
+
174
+ it 'removes :: after the $' do
175
+ expect(manifest).to eq fixed
176
+ end
172
177
  end
173
178
 
174
179
  context 'with incorrect topscope from external module' do
@@ -182,16 +187,8 @@ describe 'topscope_variable' do
182
187
  PUP
183
188
  end
184
189
 
185
- it 'should detect one problem' do
186
- expect(problems).to have(1).problem
187
- end
188
-
189
- it 'should fix the problem' do
190
- expect(problems).to contain_fixed('use $some_component_module::bar instead of $::some_component_module::bar').on_line(3).in_column(16)
191
- end
192
-
193
- it 'should remove :: after the $' do
194
- expect(manifest).to eq <<~PUP
190
+ let(:fixed) do
191
+ <<~PUP
195
192
  class profile::foo {
196
193
  notify { 'foo':
197
194
  message => $some_component_module::bar
@@ -199,6 +196,18 @@ describe 'topscope_variable' do
199
196
  }
200
197
  PUP
201
198
  end
199
+
200
+ it 'detects one problem' do
201
+ expect(problems).to have(1).problem
202
+ end
203
+
204
+ it 'fixes the problem' do
205
+ expect(problems).to contain_fixed('use $some_component_module::bar instead of $::some_component_module::bar').on_line(3).in_column(16)
206
+ end
207
+
208
+ it 'removes :: after the $' do
209
+ expect(manifest).to eq fixed
210
+ end
202
211
  end
203
212
 
204
213
  context 'with incorrect topscope in quoted variable' do
@@ -212,16 +221,8 @@ describe 'topscope_variable' do
212
221
  PUP
213
222
  end
214
223
 
215
- it 'should detect one problem' do
216
- expect(problems).to have(1).problem
217
- end
218
-
219
- it 'should fix the problem' do
220
- expect(problems).to contain_fixed(msg).on_line(3).in_column(20)
221
- end
222
-
223
- it 'should remove :: after the $' do
224
- expect(manifest).to eq <<~PUP
224
+ let(:fixed) do
225
+ <<~PUP
225
226
  class foo::blub {
226
227
  notify { 'foo':
227
228
  message => ">${foo::bar}<"
@@ -229,6 +230,18 @@ describe 'topscope_variable' do
229
230
  }
230
231
  PUP
231
232
  end
233
+
234
+ it 'detects one problem' do
235
+ expect(problems).to have(1).problem
236
+ end
237
+
238
+ it 'fixes the problem' do
239
+ expect(problems).to contain_fixed(msg).on_line(3).in_column(20)
240
+ end
241
+
242
+ it 'removes :: after the $' do
243
+ expect(manifest).to eq fixed
244
+ end
232
245
  end
233
246
  end
234
247
 
@@ -238,7 +251,8 @@ describe 'topscope_variable' do
238
251
  include ::foo
239
252
  PUP
240
253
  end
241
- it 'should not detect any problems' do
254
+
255
+ it 'does not detect any problems' do
242
256
  expect(problems).to have(0).problem
243
257
  end
244
258
  end
data/spec/spec_helper.rb CHANGED
@@ -1,29 +1,6 @@
1
1
  # frozen_string_literal: true
2
2
 
3
- begin
4
- require 'simplecov'
5
- require 'simplecov-console'
6
- require 'codecov'
7
- rescue LoadError
8
- else
9
- SimpleCov.start do
10
- track_files 'lib/**/*.rb'
11
-
12
- add_filter '/spec'
13
-
14
- enable_coverage :branch
15
-
16
- # do not track vendored files
17
- add_filter '/vendor'
18
- add_filter '/.vendor'
19
- end
20
-
21
- SimpleCov.formatters = [
22
- SimpleCov::Formatter::Console,
23
- SimpleCov::Formatter::Codecov,
24
- ]
25
- end
26
-
27
3
  require 'puppet-lint'
4
+ require 'rspec/collection_matchers'
28
5
 
29
6
  PuppetLint::Plugins.load_spec_helper
metadata CHANGED
@@ -1,111 +1,28 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-lint-topscope-variable-check
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
8
- autorequire:
9
8
  bindir: bin
10
9
  cert_chain: []
11
- date: 2023-02-24 00:00:00.000000000 Z
10
+ date: 1980-01-02 00:00:00.000000000 Z
12
11
  dependencies:
13
12
  - !ruby/object:Gem::Dependency
14
13
  name: puppet-lint
15
- requirement: !ruby/object:Gem::Requirement
16
- requirements:
17
- - - ">="
18
- - !ruby/object:Gem::Version
19
- version: '2.0'
20
- - - "<"
21
- - !ruby/object:Gem::Version
22
- version: '4'
23
- type: :runtime
24
- prerelease: false
25
- version_requirements: !ruby/object:Gem::Requirement
26
- requirements:
27
- - - ">="
28
- - !ruby/object:Gem::Version
29
- version: '2.0'
30
- - - "<"
31
- - !ruby/object:Gem::Version
32
- version: '4'
33
- - !ruby/object:Gem::Dependency
34
- name: rake
35
- requirement: !ruby/object:Gem::Requirement
36
- requirements:
37
- - - ">="
38
- - !ruby/object:Gem::Version
39
- version: '12.0'
40
- - - "<"
41
- - !ruby/object:Gem::Version
42
- version: '14'
43
- type: :development
44
- prerelease: false
45
- version_requirements: !ruby/object:Gem::Requirement
46
- requirements:
47
- - - ">="
48
- - !ruby/object:Gem::Version
49
- version: '12.0'
50
- - - "<"
51
- - !ruby/object:Gem::Version
52
- version: '14'
53
- - !ruby/object:Gem::Dependency
54
- name: rspec
55
14
  requirement: !ruby/object:Gem::Requirement
56
15
  requirements:
57
16
  - - "~>"
58
17
  - !ruby/object:Gem::Version
59
- version: '3.0'
60
- type: :development
61
- prerelease: false
62
- version_requirements: !ruby/object:Gem::Requirement
63
- requirements:
64
- - - "~>"
65
- - !ruby/object:Gem::Version
66
- version: '3.0'
67
- - !ruby/object:Gem::Dependency
68
- name: rspec-collection_matchers
69
- requirement: !ruby/object:Gem::Requirement
70
- requirements:
71
- - - "~>"
72
- - !ruby/object:Gem::Version
73
- version: '1.0'
74
- type: :development
75
- prerelease: false
76
- version_requirements: !ruby/object:Gem::Requirement
77
- requirements:
78
- - - "~>"
79
- - !ruby/object:Gem::Version
80
- version: '1.0'
81
- - !ruby/object:Gem::Dependency
82
- name: rspec-its
83
- requirement: !ruby/object:Gem::Requirement
84
- requirements:
85
- - - "~>"
86
- - !ruby/object:Gem::Version
87
- version: '1.0'
88
- type: :development
18
+ version: '5.1'
19
+ type: :runtime
89
20
  prerelease: false
90
21
  version_requirements: !ruby/object:Gem::Requirement
91
22
  requirements:
92
23
  - - "~>"
93
24
  - !ruby/object:Gem::Version
94
- version: '1.0'
95
- - !ruby/object:Gem::Dependency
96
- name: simplecov
97
- requirement: !ruby/object:Gem::Requirement
98
- requirements:
99
- - - ">="
100
- - !ruby/object:Gem::Version
101
- version: '0'
102
- type: :development
103
- prerelease: false
104
- version_requirements: !ruby/object:Gem::Requirement
105
- requirements:
106
- - - ">="
107
- - !ruby/object:Gem::Version
108
- version: '0'
25
+ version: '5.1'
109
26
  description: " A puppet-lint plugin to check that topscope variable names don't
110
27
  start with ::.\n"
111
28
  email: voxpupuli@groups.io
@@ -122,7 +39,6 @@ homepage: https://github.com/voxpupuli/puppet-lint-topscope-variable-check
122
39
  licenses:
123
40
  - MIT
124
41
  metadata: {}
125
- post_install_message:
126
42
  rdoc_options: []
127
43
  require_paths:
128
44
  - lib
@@ -130,17 +46,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
130
46
  requirements:
131
47
  - - ">="
132
48
  - !ruby/object:Gem::Version
133
- version: '0'
49
+ version: '3.2'
134
50
  required_rubygems_version: !ruby/object:Gem::Requirement
135
51
  requirements:
136
52
  - - ">="
137
53
  - !ruby/object:Gem::Version
138
54
  version: '0'
139
55
  requirements: []
140
- rubygems_version: 3.2.33
141
- signing_key:
56
+ rubygems_version: 3.6.9
142
57
  specification_version: 4
143
58
  summary: A puppet-lint plugin to check topscope variables.
144
- test_files:
145
- - spec/puppet-lint/plugins/topscope_variable_spec.rb
146
- - spec/spec_helper.rb
59
+ test_files: []