Skip to content

Commit

Permalink
do not raise error on dump (#7)
Browse files Browse the repository at this point in the history
* reproduced #6

* fixed #6

* updated rubocop

* version bump
  • Loading branch information
JelF authored Nov 22, 2016
1 parent 4c61a13 commit 8136689
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 11 deletions.
2 changes: 1 addition & 1 deletion lamian.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency 'bundler', '~> 1.12'
spec.add_development_dependency 'rake', '~> 10.0'
spec.add_development_dependency 'rspec', '~> 3.0'
spec.add_development_dependency 'rubocop', '~> 0.41'
spec.add_development_dependency 'rubocop', '~> 0.45'
spec.add_development_dependency 'pry', '~> 0.10'
spec.add_development_dependency 'coveralls', '~> 0.8'
end
10 changes: 6 additions & 4 deletions lib/lamian/logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,19 @@ def add(*args, &block)
end

def dump(format: nil)
result = logdevs[-1].string.dup
format ? apply_format(format, result) : result
result = logdevs[-1]&.string&.dup
apply_format!(format, result)
result
end

private

attr_accessor :level, :logdevs, :formatter

def apply_format(_format, result)
def apply_format!(format, result)
return unless format
return unless result
result.gsub!(/\[\d{1,2}m/, '')
result
end

def push_logdev(logdev)
Expand Down
2 changes: 1 addition & 1 deletion lib/lamian/version.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# frozen_string_literal: true
module Lamian
VERSION = '0.3.2'
VERSION = '0.3.3'
end
17 changes: 13 additions & 4 deletions spec/lamian/logger_spec.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
# frozen_string_literal: true
describe Lamian::Logger, :cool_loggers do
specify '#run' do
Lamian.run do
describe Lamian::Logger do
describe '#dump', :cool_loggers do
specify 'with #run' do
Lamian.run do
generic_logger.info "it's alive"
expect(Lamian.dump).to eq "it's alive\n"
expect(Lamian.dump).to eq "it's alive\n"
end
end

specify 'without #run' do
generic_logger.info "it's alive"
expect(Lamian.dump).to eq "it's alive\n"
expect { Lamian.dump }.not_to raise_error
expect(Lamian.dump).to be_nil
end
end
end
2 changes: 1 addition & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
let(:generic_logger) { Logger.new(generic_logger_buffer) }

let(:cool_formatter) do
-> (_severity, _date, _progname, message) { "#{message}\n" }
->(_severity, _date, _progname, message) { "#{message}\n" }
end

before('extend generic_logger') { Lamian.extend_logger(generic_logger) }
Expand Down

0 comments on commit 8136689

Please sign in to comment.