Merge pull request #144 from chef/jk/json2

Allow JSON 2.0 on Ruby 2.2 and above

Author: chris-rock

Gemfile

@@ -8,6 +8,11 @@ if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
   gem 'net-ssh', '~> 2.9'
 end
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2')
+  gem 'json', '< 2.0'
+  gem 'rack', '< 2.0'
+end
+
 group :test do
   gem 'bundler', '~> 1.11'
   gem 'minitest', '~> 5.8'

train.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'json', '~> 1.8'
+  spec.add_dependency 'json', '>= 1.8', '< 3.0'
   # chef-client < 12.4.1 require mixlib-shellout-2.0.1
   spec.add_dependency 'mixlib-shellout', '~> 2.0'
   # net-ssh 3.x drops Ruby 1.9 support, so this constraint could be raised when