summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppet.com>2016-08-08 16:15:21 +0100
committerGitHub <noreply@github.com>2016-08-08 16:15:21 +0100
commite39fe01ea01719b97110341cacc4b4e2784a7d1a (patch)
tree620b3c0889386c88d0731f0b958f622d0b4d1bac /Gemfile
parent2bf9187cf8971fad35b0ffebf7c49963ba35c850 (diff)
parent6e7e69fe203e042b28aacb01301c338d55448c5f (diff)
Merge pull request #629 from tphoney/MODULES-3533
(modules-3533) deprecation for 3.x number function
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index c7da908..0fc6c18 100644
--- a/Gemfile
+++ b/Gemfile
@@ -16,7 +16,7 @@ group :development, :unit_tests do
gem 'metadata-json-lint', :require => false
gem 'puppet_facts', :require => false
gem 'puppet-blacksmith', '>= 3.4.0', :require => false
- gem 'puppetlabs_spec_helper', :require => false
+ gem 'puppetlabs_spec_helper', :git => 'git://github.com/puppetlabs/puppetlabs_spec_helper.git', :ref => '157a7fd', :require => false
gem 'rspec-puppet', '>= 2.3.2', :require => false
gem 'simplecov', :require => false
end
@@ -32,6 +32,8 @@ end
# json_pure 2.0.2 added a requirement on ruby >= 2. We pin to json_pure 2.0.1
# if using ruby 1.x
gem 'json_pure', '<=2.0.1', :require => false if RUBY_VERSION =~ /^1\./
+# rubocop 0.42.0 requires ruby >=2
+gem 'rubocop', '0.41.2', :require => false if RUBY_VERSION =~ /^1\./
gem 'facter', *location_for(ENV['FACTER_GEM_VERSION'])
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])