summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2016-08-04 11:01:37 +0100
committerGitHub <noreply@github.com>2016-08-04 11:01:37 +0100
commit51a8b709c4af76714bed354831d93a292f56cfd2 (patch)
treedc18cbb21d95e17c2d19256caa884e3ec45bab9a
parent9e2473d401803558f21efdaf199f4cff7be6ecae (diff)
parentaaccbd577f113b2595487bcd341a4f7767b29a98 (diff)
downloadmixlib-log-51a8b709c4af76714bed354831d93a292f56cfd2.tar.gz
Merge pull request #16 from chef/tm/update_travis
test with updated ruby versions and run cucumber
-rw-r--r--.travis.yml6
-rw-r--r--Rakefile20
2 files changed, 15 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 4d116b7..a0ad733 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,9 +11,11 @@ before_install:
- bundle --version
- gem --version
rvm:
- - 2.1
- - 2.2
+ - 2.1.10
+ - 2.2.5
+ - 2.3.1
script:
- bundle exec chefstyle
- bundle exec rake spec
+ - bundle exec rake features
diff --git a/Rakefile b/Rakefile
index 99d9307..57cd178 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,16 +1,8 @@
-require "rake"
-require "rubygems/package_task"
+require "bundler/gem_tasks"
require "rdoc/task"
-require "yaml"
require "rspec/core/rake_task"
require "cucumber/rake/task"
-gemspec = eval(IO.read("mixlib-log.gemspec"))
-
-Gem::PackageTask.new(gemspec) do |pkg|
- pkg.gem_spec = gemspec
-end
-
RSpec::Core::RakeTask.new(:spec) do |spec|
spec.pattern = "spec/**/*_spec.rb"
end
@@ -30,3 +22,13 @@ end
Cucumber::Rake::Task.new(:features) do |t|
t.cucumber_opts = "--format pretty"
end
+
+begin
+ require "chefstyle"
+ require "rubocop/rake_task"
+ RuboCop::RakeTask.new(:style) do |task|
+ task.options += ["--display-cop-names", "--no-color"]
+ end
+rescue LoadError
+ puts "chefstyle/rubocop is not available. gem install chefstyle to do style checking."
+end