summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2016-11-10 10:26:05 +0000
committerGitHub <noreply@github.com>2016-11-10 10:26:05 +0000
commit93e4b306065d934e8bef6a07661e933fb59d3d15 (patch)
tree5ccbb2dea2f62975081cb579750bc7b00194238f
parent0eb54010fe59afbbd7677bff331c9d4463125d9d (diff)
parent5deb733976748c31ba4e3c4b128964a14167c504 (diff)
downloadohai-93e4b306065d934e8bef6a07661e933fb59d3d15.tar.gz
Merge pull request #899 from chef/deps
Move dev deps to the Gemfile and bump changelog generator
-rw-r--r--Gemfile10
-rw-r--r--ohai.gemspec12
2 files changed, 9 insertions, 13 deletions
diff --git a/Gemfile b/Gemfile
index c5ca659c..7d848933 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,9 +5,17 @@ gemspec
group :development do
gem "sigar", :platform => "ruby"
- gem "chefstyle", "= 0.4.0"
+ gem "chefstyle"
gem "overcommit", ">= 0.34.1"
gem "pry-byebug"
gem "pry-stack_explorer"
gem "rb-readline"
+ gem "rake", ">= 10.1.0", "< 12.0.0"
+ gem "rspec-core", "~> 3.0"
+ gem "rspec-expectations", "~> 3.0"
+ gem "rspec-mocks", "~> 3.0"
+ gem "rspec-collection_matchers", "~> 1.0"
+ gem "rspec_junit_formatter"
+ gem "github_changelog_generator", ">= 1.14"
+ gem "activesupport", "< 5.0" if RUBY_VERSION <= "2.2.2" # github_changelog_generator dep
end
diff --git a/ohai.gemspec b/ohai.gemspec
index 7177f8ca..233e0fb3 100644
--- a/ohai.gemspec
+++ b/ohai.gemspec
@@ -35,18 +35,6 @@ Gem::Specification.new do |s|
# Chef 13 starts, otherwise builds will break.
s.add_dependency "chef-config", ">= 12.5.0.alpha.1", "< 13"
- s.add_development_dependency "rake", ">= 10.1.0", "< 12.0.0"
- s.add_development_dependency "rspec-core", "~> 3.0"
- s.add_development_dependency "rspec-expectations", "~> 3.0"
- s.add_development_dependency "rspec-mocks", "~> 3.0"
- s.add_development_dependency "rspec-collection_matchers", "~> 1.0"
- s.add_development_dependency "rspec_junit_formatter"
- s.add_development_dependency "github_changelog_generator", "1.13.1"
-
- # github_changelog_generator -> github-api -> oauth2 -> rack
- # rack being unconstrained breaks Ruby 2.1 installs
- s.add_development_dependency "rack", "~> 1.0"
-
s.bindir = "bin"
s.executables = %w{ohai}