From 5deb733976748c31ba4e3c4b128964a14167c504 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Wed, 9 Nov 2016 19:35:57 -0800 Subject: Move dev deps to the Gemfile and bump changelog generator This removes the need for Rack 1.X which we had to pin due to the old github changelog generator release. We now have a new active support pin to keep Ruby 2.1 support Signed-off-by: Tim Smith --- Gemfile | 10 +++++++++- ohai.gemspec | 12 ------------ 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} -- cgit v1.2.1