diff options
| author | Thom May <thom@may.lt> | 2016-08-11 11:46:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 11:46:55 +0100 |
| commit | 5aae671a04f43505e4ccbad80fb9c4fd0112846e (patch) | |
| tree | 1ee8ac4e2d75fd1639bdec89caf00fb07a2e1c60 | |
| parent | 9078ea8472ecaf4edff213f146a2a2a01c44afdf (diff) | |
| parent | 68acf8f4e5d3d3ca7a261624468895511ec484a4 (diff) | |
| download | ohai-5aae671a04f43505e4ccbad80fb9c4fd0112846e.tar.gz | |
Merge pull request #861 from chef/rack_fix
Fix installs on Ruby 2.1 and rspec testing with rspec 3.5
| -rw-r--r-- | ohai.gemspec | 6 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/ohai.gemspec b/ohai.gemspec index f9508757..6066ca8a 100644 --- a/ohai.gemspec +++ b/ohai.gemspec @@ -41,7 +41,11 @@ Gem::Specification.new do |s| 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.11.3" + 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} diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 5f5491ee..8932cdc8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,4 +1,3 @@ -require "rspec" require "rspec/collection_matchers" # require 'pry-debugger' |