diff options
| author | sersut <serdar@opscode.com> | 2014-06-27 09:34:16 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2014-06-27 09:34:16 -0700 |
| commit | 18d746903f7be680d6dd95df5f217574eaf2b854 (patch) | |
| tree | 1f73d94d5777c0a42cf4e40f7f7a0d7efcf199c2 /chef.gemspec | |
| parent | c17c9c86acc66e818603e5a732eef4d343d78aa6 (diff) | |
| parent | 64c7f8fe69dbfe7ed73fdcfaf97d712b778ca6ae (diff) | |
| download | chef-18d746903f7be680d6dd95df5f217574eaf2b854.tar.gz | |
Merge branch 'master' into 11-stable
Conflicts:
CHANGELOG.md
CONTRIBUTIONS.md
RELEASE_NOTES.md
chef.gemspec
lib/chef/version.rb
spec/unit/application/client_spec.rb
Diffstat (limited to 'chef.gemspec')
| -rw-r--r-- | chef.gemspec | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chef.gemspec b/chef.gemspec index b3ff2cbfae..163ee93941 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "mixlib-authentication", "~> 1.3" s.add_dependency "mixlib-shellout", "~> 1.4" - s.add_dependency "ohai", "~> 7.0.4" + s.add_dependency "ohai", "= 7.2.0.rc.0" s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0" # rest-client has an unbounded dependency on mime-types. @@ -26,9 +26,7 @@ Gem::Specification.new do |s| # it's the version I had when I tested. s.add_dependency "mime-types", "~> 1.16" - # The JSON gem reliably releases breaking changes as a patch release - s.add_dependency "json", ">= 1.4.4", "<= 1.8.1" - s.add_dependency "yajl-ruby", "~> 1.1" + s.add_dependency "ffi-yajl" s.add_dependency "net-ssh", "~> 2.6" s.add_dependency "net-ssh-multi", "~> 1.1" # CHEF-3027: The knife-cloud plugins require newer features from highline, core chef should not. @@ -36,15 +34,18 @@ Gem::Specification.new do |s| s.add_dependency "erubis", "~> 2.7" s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4" - # There's a bug with Chef Zero and IPV6 prior to version 2.0.2 - s.add_dependency "chef-zero", ">= 2.0.2", "< 2.1" + s.add_dependency "chef-zero", "~> 2.1", ">= 2.1.4" s.add_dependency "pry", "~> 0.9" + s.add_development_dependency "rack" + # Rake 10.2 drops Ruby 1.8 support - s.add_development_dependency("rake", "~> 10.1.0") + s.add_development_dependency "rake", "~> 10.1.0" + + # rspec_junit_formatter 0.2.0 drops ruby 1.8.7 support + s.add_development_dependency "rspec_junit_formatter", "~> 0.1.0" - %w( rack rspec_junit_formatter).each { |gem| s.add_development_dependency gem } %w(rspec-core rspec-expectations rspec-mocks).each { |gem| s.add_development_dependency gem, "~> 2.14.0" } s.bindir = "bin" |