Skip to content

Commit 64ec1e9

Browse files
author
Wilson McCoubrey
committed
[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config
1 parent 92e0c49 commit 64ec1e9

File tree

5 files changed

+287
-273
lines changed

5 files changed

+287
-273
lines changed

Gemfile

+16-27
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ end
2929

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

3335
# The following gems are not included by default as they require DevKit on Windows.
3436
# You should probably include them in a Gemfile.local or a ~/.gemfile
@@ -41,36 +43,23 @@ supports_windows = true
4143
#end
4244

4345
group :development do
44-
gem 'puppet-lint', :require => false
45-
gem 'metadata-json-lint', :require => false, :platforms => 'ruby'
46-
gem 'puppet_facts', :require => false
47-
gem 'puppet-blacksmith', '>= 3.4.0', :require => false, :platforms => 'ruby'
48-
gem 'puppetlabs_spec_helper', '>= 1.2.1', :require => false
49-
gem 'rspec-puppet', '>= 2.3.2', :require => false
50-
gem 'rspec-puppet-facts', :require => false, :platforms => 'ruby'
51-
gem 'mocha', '< 1.2.0', :require => false
52-
gem 'simplecov', :require => false, :platforms => 'ruby'
53-
gem 'parallel_tests', '< 2.10.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
54-
gem 'parallel_tests', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
55-
gem 'rubocop', '0.41.2', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
56-
gem 'rubocop', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.0.0')
57-
gem 'rubocop-rspec', '~> 1.6', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')
58-
gem 'pry', :require => false
59-
gem 'json_pure', '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
60-
gem 'fast_gettext', '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
61-
gem 'fast_gettext', :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
62-
gem 'rainbow', '< 2.2.0', :require => false
46+
gem "puppet-module-posix-default-r#{minor_version}", :require => false, :platforms => "ruby"
47+
gem "puppet-module-win-default-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
48+
gem "puppet-module-posix-dev-r#{minor_version}", :require => false, :platforms => "ruby"
49+
gem "puppet-module-win-dev-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
50+
gem "json_pure", '<= 2.0.1', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.0.0')
51+
gem "fast_gettext", '1.1.0', :require => false if Gem::Version.new(RUBY_VERSION.dup) < Gem::Version.new('2.1.0')
52+
gem "fast_gettext", :require => false if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.1.0')
6353
end
6454

6555
group :system_tests do
66-
gem 'beaker', *location_for(ENV['BEAKER_VERSION'] || '>= 3')
67-
gem 'beaker-pe', :require => false
68-
gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'])
69-
gem 'beaker-puppet_install_helper', :require => false
70-
gem 'beaker-module_install_helper', :require => false
71-
gem 'master_manipulator', :require => false
72-
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
73-
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
56+
gem "puppet-module-posix-system-r#{minor_version}", :require => false, :platforms => "ruby"
57+
gem "puppet-module-win-system-r#{minor_version}", :require => false, :platforms => ["mswin", "mingw", "x64_mingw"]
58+
gem "beaker", *location_for(ENV['BEAKER_VERSION'] || '>= 3')
59+
gem "beaker-pe", :require => false
60+
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
61+
gem "beaker-hostgenerator", *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
62+
gem "beaker-abs", *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
7463
end
7564

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

0 commit comments

Comments
 (0)