diff options
author | Thom May <thom@may.lt> | 2016-10-13 11:24:00 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-13 11:24:00 +0100 |
commit | 67a63735c31db1c4b01aa7180f1cebb9bb7fbd6c (patch) | |
tree | 768abd530bb367a29f5190304a6c33f7a8e94602 | |
parent | 35733aaa97982f6e23cd2f6f8bd0d5ac034a205b (diff) | |
parent | 4c789d59fc1e2c4e1b84803f5f8c32961f80350a (diff) | |
download | mixlib-log-67a63735c31db1c4b01aa7180f1cebb9bb7fbd6c.tar.gz |
Merge pull request #20 from chef/ruby22
Require Ruby 2.2+
-rw-r--r-- | .travis.yml | 15 | ||||
-rwxr-xr-x | Gemfile | 1 | ||||
-rw-r--r-- | README.md | 6 | ||||
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | mixlib-log.gemspec | 5 | ||||
-rw-r--r-- | spec/spec_helper.rb | 2 |
6 files changed, 14 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index a0ad733..406c407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,14 @@ language: ruby cache: bundler - sudo: false - +rvm: + - 2.2.5 + - 2.3.1 branches: only: - master - before_install: - bundle --version - gem --version -rvm: - - 2.1.10 - - 2.2.5 - - 2.3.1 - script: - - bundle exec chefstyle - - bundle exec rake spec - - bundle exec rake features + - bundle exec rake @@ -5,5 +5,4 @@ gemspec group :development do gem "rdoc" gem "bundler" - gem "rack", "< 2.0" end @@ -31,7 +31,11 @@ Log.init('/tmp/logfile', 7) # log to /tmp/logfile, rotate every day Enjoy! -## LICENSE: +## Contributing + +For information on contributing to this project see <https://github.com/chef/chef/blob/master/CONTRIBUTING.md> + +## License - Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. - License:: Apache License, Version 2.0 @@ -7,7 +7,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec| spec.pattern = "spec/**/*_spec.rb" end -task :default => :spec +task default: [:style, :spec, :features] # For rubygems-test task :test => :spec diff --git a/mixlib-log.gemspec b/mixlib-log.gemspec index f958b44..82ea5b3 100644 --- a/mixlib-log.gemspec +++ b/mixlib-log.gemspec @@ -13,9 +13,10 @@ Gem::Specification.new do |gem| gem.has_rdoc = true gem.extra_rdoc_files = ["README.md", "LICENSE", "NOTICE"] gem.files = Dir["lib/**/*"] + Dir["spec/**/*"] + ["Gemfile", "Rakefile", ".gemtest", "mixlib-log.gemspec"] + gem.required_ruby_version = ">= 2.2" gem.add_development_dependency "rake" gem.add_development_dependency "rspec", "~> 3.4" - gem.add_development_dependency "chefstyle", "~> 0.3" + gem.add_development_dependency "chefstyle" gem.add_development_dependency "cucumber" - gem.add_development_dependency "github_changelog_generator", "1.11.3" + gem.add_development_dependency "github_changelog_generator", ">= 1.11.3" end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1789614..3461464 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,7 +1,7 @@ # # Author:: Adam Jacob (<adam@chef.io>) # Author:: Christopher Brown (<cb@chef.io>) -# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.. +# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); |