Skip to content

Commit

Permalink
Merge pull request #22 from olleolleolle/patch-1
Browse files Browse the repository at this point in the history
Travis: update Ruby versions, pass lint
  • Loading branch information
tas50 authored Feb 10, 2017
2 parents 67a6373 + 8e0ffab commit 8d7e834
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ language: ruby
cache: bundler
sudo: false
rvm:
- 2.2.5
- 2.3.1
- 2.2.6
- 2.3.3
- 2.4.0
branches:
only:
- master
before_install:
- bundle --version
- gem --version
- gem update --system
script:
- bundle exec rake
4 changes: 2 additions & 2 deletions features/steps/log.rb
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@

Then /^the regex '(.+)' should be logged$/ do |regex_string|
regex = Regexp.new(regex_string, Regexp::MULTILINE)
regex.match(@output).should_not == nil
expect(regex.match(@output)).not_to be_nil
end

Then /^nothing should be logged$/ do
@output.should == ""
expect(@output).to eq ""
end
2 changes: 1 addition & 1 deletion lib/mixlib/log/formatter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ def msg2str(msg)
when ::String
msg
when ::Exception
"#{ msg.message } (#{ msg.class })\n" <<
"#{msg.message} (#{msg.class})\n" <<
(msg.backtrace || []).join("\n")
else
msg.inspect
Expand Down

0 comments on commit 8d7e834

Please sign in to comment.