summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2015-07-22 11:13:39 -0700
committerClaire McQuin <claire@getchef.com>2015-07-22 11:29:32 -0700
commitaab4611b0c7e742a507e6fe48e73263bf0c5f6e5 (patch)
treeb68df5bb6418d8a9d0a2133a9f8e11bc8c260403
parent7556a1d55808c459f3a9fad88e2a2371f361f3e0 (diff)
downloadohai-mcquin/fix-deps.tar.gz
Update the chef-config dependency version to be compatible with chefmcquin/fix-deps
-rw-r--r--ohai.gemspec10
1 files changed, 9 insertions, 1 deletions
diff --git a/ohai.gemspec b/ohai.gemspec
index 359e456f..4b16a9f9 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -25,7 +25,15 @@ Gem::Specification.new do |s|
s.add_dependency "ipaddress"
s.add_dependency "wmi-lite", "~> 1.0"
s.add_dependency "ffi", "~> 1.9"
- s.add_dependency "chef-config", "~> 12.4"
+ # Note for ohai developers: If chef-config causes you grief, try:
+ # bundle install --with development
+ # this should work as long as chef is a development dependency in Gemfile.
+ #
+ # Chef depends on ohai and chef-config. Ohai depends on chef-config. The
+ # version of chef-config that chef depends on is whatver version chef
+ # happens to be on master. This will need to be updated again once work on
+ # Chef 13 starts, otherwise builds will break.
+ s.add_dependency "chef-config", ">= 12.5.0.current.0", "< 13"
s.add_dependency "rake", "~> 10.1"
s.add_development_dependency "rspec-core", "~> 3.0"