Skip to content

Commit 55d113f

Browse files
wilson208tphoney
authored andcommitted
[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config (#754)
* [msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config * [maint] Fix puppet-lint warnings introduced with 2.2.0 puppet-lint release
1 parent d4a0ee4 commit 55d113f

File tree

3 files changed

+19
-31
lines changed

3 files changed

+19
-31
lines changed

Gemfile

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,27 @@ end
2929

3030
# Used for gem conditionals
3131
supports_windows = false
32+
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
33+
minor_version = "#{ruby_version_segments[0]}.#{ruby_version_segments[1]}"
3234

3335
group :development do
34-
gem 'puppet-lint', :require => false
35-
gem 'metadata-json-lint', :require => false, :platforms => 'ruby'
36-
gem 'puppet_facts', :require => false
37-
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
38-
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
39-
gem 'rspec-puppet', '>= 2.3.2', :require => false
40-
gem 'rspec-puppet-facts', :require => false, :platforms => 'ruby'
41-
gem 'mocha', '< 1.2.0', :require => false
42-
gem 'simplecov', :require => false, :platforms => 'ruby'
43-
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
44-
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
45-
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
46-
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
47-
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
48-
gem 'pry', :require => false
49-
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
50-
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
51-
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
52-
gem 'rainbow', '< 2.2.0', :require => false
36+
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
37+
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
38+
gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby"
39+
gem "puppet-module-win-dev-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
40+
gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
41+
gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
42+
gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
5343
end
5444

5545
group :system_tests do
56-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
57-
gem 'beaker-pe', :require => false
58-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
59-
gem 'beaker-puppet_install_helper', :require => false
60-
gem 'beaker-module_install_helper', :require => false
61-
gem 'master_manipulator', :require => false
62-
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
63-
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
46+
gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby"
47+
gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
48+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
49+
gem "beaker-pe", :require => false
50+
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
51+
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
52+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
6453
end
6554

6655
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

examples/file_line.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# of the file_line resource type.
33
file { '/tmp/dansfile':
44
ensure => file,
5-
} ->
6-
file_line { 'dans_line':
5+
}
6+
-> file_line { 'dans_line':
77
line => 'dan is awesome',
88
path => '/tmp/dansfile',
99
}

locales/config.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ gettext:
2222
# Patterns for +Dir.glob+ used to find all files that might contain
2323
# translatable content, relative to the project root directory
2424
source_files:
25-
- 'metadata.json'
26-
25+

0 commit comments

Comments
 (0)