Skip to content

Commit f7ddd39

Browse files
authored
Merge pull request #178 from eputnam/release
(maint) add puppet-blacksmith
2 parents 1a230dc + ff60ebc commit f7ddd39

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

Gemfile

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ source "https://rubygems.org"
22

33
group :development, :test do
44
gem 'rake'
5-
gem 'rspec', "~> 3.4.0", :require => false
6-
gem 'mocha', "~> 0.10.5", :require => false
5+
gem 'rspec', "~> 3.4.0", :require => false
6+
gem 'mocha', "~> 0.10.5", :require => false
77
gem 'puppetlabs_spec_helper', :require => false
8+
gem 'puppet-blacksmith', :require => false
89
end
910

1011
if puppetversion = ENV['PUPPET_GEM_VERSION']
@@ -15,12 +16,12 @@ end
1516

1617
gem 'puppet-lint', '>= 1.0.0'
1718
gem 'puppet-lint-unquoted_string-check', :require => false
18-
gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3'
19-
gem 'public_suffix', :require => false if RUBY_VERSION > '1.9.3'
20-
gem 'json', '<= 1.8' , :require => false if RUBY_VERSION < '2.0.0'
21-
gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0'
22-
gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
23-
gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9'
19+
gem 'public_suffix', '1.4.6', :require => false if RUBY_VERSION <= '1.9.3'
20+
gem 'public_suffix', :require => false if RUBY_VERSION > '1.9.3'
21+
gem 'json', '<= 1.8' , :require => false if RUBY_VERSION < '2.0.0'
22+
gem 'json_pure', '<= 2.0.1' , :require => false if RUBY_VERSION < '2.0.0'
23+
gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
24+
gem 'metadata-json-lint', :require => false if RUBY_VERSION >= '1.9'
2425

2526
if RUBY_VERSION < '2.0'
2627
gem 'mime-types', '<3.0', :require => false
@@ -30,7 +31,7 @@ group :system_tests do
3031
if beaker_version = ENV['BEAKER_VERSION']
3132
gem 'beaker', *location_for(beaker_version)
3233
end
33-
gem 'beaker-puppet_install_helper', :require => false
34+
gem 'beaker-puppet_install_helper', :require => false
3435
gem 'master_manipulator', '~> 1.2', :require => false
3536
end
3637
# vim:ft=ruby

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
require 'puppetlabs_spec_helper/rake_tasks'
2+
require 'puppet_blacksmith/rake_tasks'
23
require 'puppet-lint/tasks/puppet-lint'
34
PuppetLint.configuration.send('disable_80chars')
45
PuppetLint.configuration.relative = true

0 commit comments

Comments
 (0)