Skip to content

Commit

Permalink
Merge pull request #99 from chef/ruby21
Browse files Browse the repository at this point in the history
Require Ruby 2.1+
  • Loading branch information
chris-rock authored Aug 24, 2016
2 parents 3ccd656 + eb977dc commit c26f08d
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 23 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ before_install:
- gem --version
matrix:
include:
- rvm: 2.0
- rvm: 2.1.9
- rvm: ruby-head
- rvm: 2.2.5
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='default profile contains_inspec'
- rvm: 2.2.5
- rvm: 2.3.1
bundler_args: "--without guard tools"
script: bundle exec rake test:integration OS='supermarket'
- rvm: ruby-head
allow_failures:
- rvm: ruby-head
deploy:
Expand Down
19 changes: 8 additions & 11 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,23 @@ group :guard do
end

group :test do
gem "bundler", "~> 1.5"
gem "bundler", "~> 1.10"
gem "minitest", "~> 5.5"
gem "rake", "~> 10"
gem "chefstyle", "~> 0.4.0"
gem "rake", "~> 11.0"
gem "chefstyle", "0.4.0"
gem "concurrent-ruby", "~> 0.9"
gem "codeclimate-test-reporter", :require => nil
end

# pin dependency for Ruby 1.9.3 since bundler is not
# detecting that net-ssh 3 does not work with 1.9.3
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new("1.9.3")
gem "net-ssh", "~> 2.9"
gem "rspec"
gem "simplecov", "~> 0.12"
gem "countloc", "~> 0.4"
end

group :integration do
gem "berkshelf", ">= 4.2.3"
gem "berkshelf", ">= 4.3.5"
gem "kitchen-dokken"
end

group :tools do
gem "pry", "~> 0.10"
gem "github_changelog_generator", "1.11.3"
gem "github_changelog_generator", "1.13.1"
end
10 changes: 1 addition & 9 deletions kitchen-inspec.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,7 @@ Gem::Specification.new do |spec|
spec.bindir = "exe"
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ["lib"]
spec.required_ruby_version = ">= 2.1.0"
spec.add_dependency "inspec", ">=0.22.0", "<1.0.0"
spec.add_dependency "test-kitchen", "~> 1.6"
spec.add_development_dependency "countloc", "~> 0.4"
spec.add_development_dependency "bundler", "~> 1.10"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "rspec"
spec.add_development_dependency "simplecov", "~> 0.10"
# style and complexity libraries are tightly version pinned as newer releases
# may introduce new and undesireable style choices which would be immediately
# enforced in CI
spec.add_development_dependency "chefstyle", "0.4.0"
end

0 comments on commit c26f08d

Please sign in to comment.