Skip to content

Commit aa6d88d

Browse files
wyardleywyardley
authored
Merge pull request #230 from voxpupuli/modulesync
modulesync 1.1.0
2 parents 1e69539 + baaf0a7 commit aa6d88d

File tree

17 files changed

+54
-81
lines changed

17 files changed

+54
-81
lines changed

‎.msync.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '0.21.3'
1+
modulesync_config_version: '1.1.0'

‎.rubocop.yml‎

Lines changed: 37 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Lint/AmbiguousOperator:
5151
Lint/AssignmentInCondition:
5252
Enabled: True
5353

54-
Style/SpaceBeforeComment:
54+
Layout/SpaceBeforeComment:
5555
Enabled: True
5656

5757
Style/AndOr:
@@ -119,7 +119,7 @@ Lint/UselessAssignment:
119119
Lint/Void:
120120
Enabled: True
121121

122-
Style/AccessModifierIndentation:
122+
Layout/AccessModifierIndentation:
123123
Enabled: True
124124

125125
Style/AccessorMethodName:
@@ -128,13 +128,13 @@ Style/AccessorMethodName:
128128
Style/Alias:
129129
Enabled: True
130130

131-
Style/AlignArray:
131+
Layout/AlignArray:
132132
Enabled: True
133133

134-
Style/AlignHash:
134+
Layout/AlignHash:
135135
Enabled: True
136136

137-
Style/AlignParameters:
137+
Layout/AlignParameters:
138138
Enabled: True
139139

140140
Metrics/BlockNesting:
@@ -152,7 +152,7 @@ Style/BracesAroundHashParameters:
152152
Style/CaseEquality:
153153
Enabled: True
154154

155-
Style/CaseIndentation:
155+
Layout/CaseIndentation:
156156
Enabled: True
157157

158158
Style/CharacterLiteral:
@@ -186,64 +186,64 @@ Style/WordArray:
186186
Style/UnneededPercentQ:
187187
Enabled: True
188188

189-
Style/Tab:
189+
Layout/Tab:
190190
Enabled: True
191191

192-
Style/SpaceBeforeSemicolon:
192+
Layout/SpaceBeforeSemicolon:
193193
Enabled: True
194194

195-
Style/TrailingBlankLines:
195+
Layout/TrailingBlankLines:
196196
Enabled: True
197197

198-
Style/SpaceInsideBlockBraces:
198+
Layout/SpaceInsideBlockBraces:
199199
Enabled: True
200200

201-
Style/SpaceInsideBrackets:
201+
Layout/SpaceInsideBrackets:
202202
Enabled: True
203203

204-
Style/SpaceInsideHashLiteralBraces:
204+
Layout/SpaceInsideHashLiteralBraces:
205205
Enabled: True
206206

207-
Style/SpaceInsideParens:
207+
Layout/SpaceInsideParens:
208208
Enabled: True
209209

210-
Style/LeadingCommentSpace:
210+
Layout/LeadingCommentSpace:
211211
Enabled: True
212212

213-
Style/SpaceBeforeFirstArg:
213+
Layout/SpaceBeforeFirstArg:
214214
Enabled: True
215215

216-
Style/SpaceAfterColon:
216+
Layout/SpaceAfterColon:
217217
Enabled: True
218218

219-
Style/SpaceAfterComma:
219+
Layout/SpaceAfterComma:
220220
Enabled: True
221221

222-
Style/SpaceAfterMethodName:
222+
Layout/SpaceAfterMethodName:
223223
Enabled: True
224224

225-
Style/SpaceAfterNot:
225+
Layout/SpaceAfterNot:
226226
Enabled: True
227227

228-
Style/SpaceAfterSemicolon:
228+
Layout/SpaceAfterSemicolon:
229229
Enabled: True
230230

231-
Style/SpaceAroundEqualsInParameterDefault:
231+
Layout/SpaceAroundEqualsInParameterDefault:
232232
Enabled: True
233233

234-
Style/SpaceAroundOperators:
234+
Layout/SpaceAroundOperators:
235235
Enabled: True
236236

237-
Style/SpaceBeforeBlockBraces:
237+
Layout/SpaceBeforeBlockBraces:
238238
Enabled: True
239239

240-
Style/SpaceBeforeComma:
240+
Layout/SpaceBeforeComma:
241241
Enabled: True
242242

243243
Style/CollectionMethods:
244244
Enabled: True
245245

246-
Style/CommentIndentation:
246+
Layout/CommentIndentation:
247247
Enabled: True
248248

249249
Style/ColonMethodCall:
@@ -268,7 +268,7 @@ Style/DefWithParentheses:
268268
Style/PreferredHashMethods:
269269
Enabled: True
270270

271-
Style/DotPosition:
271+
Layout/DotPosition:
272272
EnforcedStyle: trailing
273273

274274
Style/DoubleNegation:
@@ -277,25 +277,25 @@ Style/DoubleNegation:
277277
Style/EachWithObject:
278278
Enabled: True
279279

280-
Style/EmptyLineBetweenDefs:
280+
Layout/EmptyLineBetweenDefs:
281281
Enabled: True
282282

283-
Style/IndentArray:
283+
Layout/IndentArray:
284284
Enabled: True
285285

286-
Style/IndentHash:
286+
Layout/IndentHash:
287287
Enabled: True
288288

289-
Style/IndentationConsistency:
289+
Layout/IndentationConsistency:
290290
Enabled: True
291291

292-
Style/IndentationWidth:
292+
Layout/IndentationWidth:
293293
Enabled: True
294294

295-
Style/EmptyLines:
295+
Layout/EmptyLines:
296296
Enabled: True
297297

298-
Style/EmptyLinesAroundAccessModifier:
298+
Layout/EmptyLinesAroundAccessModifier:
299299
Enabled: True
300300

301301
Style/EmptyLiteral:
@@ -314,7 +314,7 @@ Style/MethodDefParentheses:
314314
Style/LineEndConcatenation:
315315
Enabled: True
316316

317-
Style/TrailingWhitespace:
317+
Layout/TrailingWhitespace:
318318
Enabled: True
319319

320320
Style/StringLiterals:
@@ -466,9 +466,6 @@ Metrics/ParameterLists:
466466
Lint/RequireParentheses:
467467
Enabled: True
468468

469-
Style/SpaceBeforeFirstArg:
470-
Enabled: True
471-
472469
Style/ModuleFunction:
473470
Enabled: True
474471

@@ -484,7 +481,7 @@ Style/Encoding:
484481
Style/BlockDelimiters:
485482
Enabled: True
486483

487-
Style/MultilineBlockLayout:
484+
Layout/MultilineBlockLayout:
488485
Enabled: True
489486

490487
# 'Complexity' is very relative
@@ -498,7 +495,7 @@ Metrics/PerceivedComplexity:
498495
Lint/UselessAssignment:
499496
Enabled: True
500497

501-
Style/ClosingParenthesisIndentation:
498+
Layout/ClosingParenthesisIndentation:
502499
Enabled: True
503500

504501
# RSpec
@@ -527,7 +524,7 @@ RSpec/NestedGroups:
527524
Enabled: False
528525

529526
# this is broken on ruby1.9
530-
Style/IndentHeredoc:
527+
Layout/IndentHeredoc:
531528
Enabled: False
532529

533530
# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs

‎.travis.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,15 @@ matrix:
1818
- rvm: 2.1.9
1919
bundler_args: --without system_tests development
2020
env: PUPPET_VERSION="~> 4.0" CHECK=test
21-
- rvm: 2.2.7
22-
bundler_args: --without system_tests development
23-
env: PUPPET_VERSION="~> 4.0" CHECK=test
24-
- rvm: 2.3.4
25-
bundler_args: --without system_tests development
26-
env: PUPPET_VERSION="~> 4.0" CHECK=test
2721
- rvm: 2.4.1
2822
bundler_args: --without system_tests development
29-
env: PUPPET_VERSION="~> 4.0" CHECK=test
23+
env: PUPPET_VERSION="~> 5.0" CHECK=test
3024
- rvm: 2.4.1
3125
bundler_args: --without system_tests development
32-
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
26+
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
3327
- rvm: 2.4.1
3428
bundler_args: --without system_tests development
35-
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
29+
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
3630
branches:
3731
only:
3832
- master

‎Gemfile‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ def location_for(place, fake_version = nil)
1111
end
1212

1313
group :test do
14-
gem 'puppetlabs_spec_helper', '~> 2.1.1', :require => false
14+
gem 'puppetlabs_spec_helper', '~> 2.2.0', :require => false
1515
gem 'rspec-puppet', '~> 2.5', :require => false
1616
gem 'rspec-puppet-facts', :require => false
1717
gem 'rspec-puppet-utils', :require => false
18-
gem 'puppet-lint-absolute_classname-check', :require => false
1918
gem 'puppet-lint-leading_zero-check', :require => false
2019
gem 'puppet-lint-trailing_comma-check', :require => false
2120
gem 'puppet-lint-version_comparison-check', :require => false
@@ -24,10 +23,10 @@ group :test do
2423
gem 'puppet-lint-variable_contains_upcase', :require => false
2524
gem 'metadata-json-lint', :require => false
2625
gem 'puppet-blacksmith', :require => false
27-
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
26+
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
2827
gem 'puppet-strings', '~> 1.0', :require => false
2928
gem 'redcarpet', :require => false
30-
gem 'rubocop', '~> 0.48.0', :require => false if RUBY_VERSION >= '2.3.0'
29+
gem 'rubocop', '~> 0.49.1', :require => false if RUBY_VERSION >= '2.3.0'
3130
gem 'rubocop-rspec', '~> 1.15.0', :require => false if RUBY_VERSION >= '2.3.0'
3231
gem 'mocha', '>= 1.2.1', :require => false
3332
gem 'coveralls', :require => false
@@ -44,7 +43,7 @@ group :development do
4443
gem 'travis', :require => false
4544
gem 'travis-lint', :require => false
4645
gem 'guard-rake', :require => false
47-
gem 'overcommit', '~> 0.39.1', :require => false
46+
gem 'overcommit', '>= 0.39.1', :require => false
4847
end
4948

5049
group :system_tests do
@@ -65,10 +64,10 @@ end
6564
if facterversion = ENV['FACTER_GEM_VERSION']
6665
gem 'facter', facterversion.to_s, :require => false, :groups => [:test]
6766
else
68-
gem 'facter', :require => false, :groups => [:test]
67+
gem 'facter', :require => false, :groups => [:test]
6968
end
7069

71-
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
70+
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 5.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
7271
gem 'puppet', puppetversion, :require => false, :groups => [:test]
7372

7473
# vim: syntax=ruby

‎Rakefile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ begin
3535
require 'github_changelog_generator/task'
3636
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
3737
version = (Blacksmith::Modulefile.new).version
38-
config.future_release = "v#{version}"
39-
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not impact the functionality of the module."
40-
config.exclude_labels = %w{duplicate question invalid wontfix modulesync}
38+
config.future_release = "v#{version}" if version =~ /^\d+\.\d+.\d+$/
39+
config.header = "# Changelog\n\nAll notable changes to this project will be documented in this file.\nEach new release typically also includes the latest modulesync defaults.\nThese should not affect the functionality of the module."
40+
config.exclude_labels = %w{duplicate question invalid wontfix wont-fix modulesync skip-changelog}
41+
config.user = 'voxpupuli'
4142
end
4243
rescue LoadError
4344
end

‎lib/puppet/type/network_route.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
isrequired
1818
desc 'The target network address'
1919
validate do |value|
20-
unless 'default' == value
20+
unless value == 'default'
2121
a = PuppetX::Voxpupuli::Utils.try { IPAddr.new(value) }
2222
raise("Invalid value for network: #{value}") unless a
2323
end

‎spec/acceptance/nodesets/docker/ubuntu-14.04.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ HOSTS:
1212
docker_image_commands:
1313
- 'rm /usr/sbin/policy-rc.d'
1414
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
15-
- 'apt-get install -y net-tools wget'
15+
- 'apt-get install -y net-tools wget apt-transport-https'
1616
- 'locale-gen en_US.UTF-8'
1717
CONFIG:
1818
trace_limit: 200

‎spec/acceptance/nodesets/docker/ubuntu-16.04.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ HOSTS:
1010
docker_preserve_image: true
1111
docker_cmd: '["/sbin/init"]'
1212
docker_image_commands:
13-
- 'apt-get install -y net-tools wget locales'
13+
- 'apt-get install -y net-tools wget locales apt-transport-https'
1414
- 'locale-gen en_US.UTF-8'
1515
CONFIG:
1616
trace_limit: 200

‎spec/unit/facts/network_nexthop_ip_spec.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env rspec
2-
31
require 'spec_helper'
42

53
describe 'network_nexthop_ip' do

‎spec/unit/facts/network_primary_interface_spec.rb‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#!/usr/bin/env rspec
2-
31
require 'spec_helper'
42

53
describe 'network_primary_interface' do

0 commit comments

Comments
 (0)