madvertise-logging 0.3.2 → 0.4.0

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -1,20 +1,17 @@
1
- source 'https://rubygems.org'
1
+ source :rubygems
2
2
 
3
- # Specify your gem's dependencies in madvertise-logging.gemspec
4
3
  gemspec
5
4
 
6
- group :development do
7
- gem 'rake'
5
+ group :development, :test do
6
+ gem 'bundler'
8
7
  gem 'pry'
9
8
  gem 'pry-doc'
10
- end
11
-
12
- group :test do
9
+ gem 'rake'
10
+ gem 'redcarpet'
11
+ gem 'reek'
13
12
  gem 'rspec'
14
- gem 'simplecov'
15
13
  gem 'ruby2ruby', '=1.3.0' # 1.3.1 is broken :(
16
- gem 'reek'
17
- gem 'yard'
18
- gem 'redcarpet'
14
+ gem 'simplecov'
19
15
  gem 'syslogger', :require => false
16
+ gem 'yard'
20
17
  end
@@ -12,9 +12,6 @@ module Madvertise
12
12
  #
13
13
  class ImprovedLogger < ImprovedIO
14
14
 
15
- # Write a copy of all log messages to stdout.
16
- attr_accessor :copy_to_stdout
17
-
18
15
  # Program name prefix. Used as ident for syslog backends.
19
16
  attr_accessor :progname
20
17
 
@@ -42,7 +39,6 @@ module Madvertise
42
39
  end
43
40
 
44
41
  def initialize(logfile = nil, progname = nil)
45
- @copy_to_stdout = false
46
42
  @progname = progname || File.basename($0)
47
43
  self.logger = logfile
48
44
  end
@@ -200,8 +196,6 @@ module Madvertise
200
196
  message = "[#{@token}] #{message}" if @token
201
197
 
202
198
  logger.add(severity) { message }
203
-
204
- $stdout.puts(message) if self.copy_to_stdout && severity >= @logger.level
205
199
  end
206
200
 
207
201
  def create_backend
@@ -12,7 +12,7 @@ module Madvertise
12
12
 
13
13
  # Attach an ImprovedLogger object.
14
14
  def attach(logger)
15
- logger.token = @loggers.first.token
15
+ logger.token = @loggers.first.token rescue nil
16
16
  @loggers << logger
17
17
  end
18
18
 
@@ -1,6 +1,6 @@
1
1
  module Madvertise
2
2
  module Logging
3
3
  # @private
4
- VERSION = "0.3.2"
4
+ VERSION = "0.4.0"
5
5
  end
6
6
  end
@@ -2,6 +2,8 @@
2
2
  require File.expand_path('../lib/madvertise/logging/version', __FILE__)
3
3
 
4
4
  Gem::Specification.new do |gem|
5
+ gem.name = "madvertise-logging"
6
+ gem.version = Madvertise::Logging::VERSION
5
7
  gem.authors = ["Benedikt Böhm"]
6
8
  gem.email = ["benedikt.boehm@madvertise.com"]
7
9
  gem.description = %q{Advanced logging classes with buffer backend, transactions, multi logger, etc}
@@ -11,7 +13,5 @@ Gem::Specification.new do |gem|
11
13
  gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
12
14
  gem.files = `git ls-files`.split("\n")
13
15
  gem.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
14
- gem.name = "madvertise-logging"
15
16
  gem.require_paths = ["lib"]
16
- gem.version = Madvertise::Logging::VERSION
17
17
  end
@@ -1,17 +1,20 @@
1
1
  require File.dirname(__FILE__) + '/spec_helper'
2
2
 
3
+ require 'tempfile'
4
+
3
5
  include Madvertise::Logging
4
6
 
5
7
  RSpec::Matchers.define :have_received_message do |expected|
6
8
  match do |actual|
7
- IO.readlines(actual).last.match(Regexp.new(expected))
9
+ last = IO.readlines(actual).last
10
+ last ? last.match(Regexp.new(expected)) : false
8
11
  end
9
12
  end
10
13
 
11
14
  describe ImprovedLogger do
12
15
 
13
16
  before(:each) do
14
- @logfile = "#{ROOT}/log/spec.log"
17
+ @logfile = Tempfile.new("spec").path
15
18
  @logger = ImprovedLogger.new(@logfile)
16
19
  @logger.level = :debug
17
20
  end
data/spec/spec_helper.rb CHANGED
@@ -1,12 +1,9 @@
1
1
  require 'rubygems'
2
2
  require 'rspec'
3
- require 'fileutils'
4
3
 
5
4
  require 'simplecov'
6
5
  SimpleCov.start
7
6
 
8
- ROOT = "#{File.dirname(__FILE__)}/../tmp"
9
-
10
7
  $:.unshift(File.dirname(__FILE__) + '/../lib')
11
8
  require 'madvertise-logging'
12
9
 
@@ -19,8 +16,4 @@ RSpec.configure do |config|
19
16
  # config.mock_with :mocha
20
17
  # config.mock_with :flexmock
21
18
  # config.mock_with :rr
22
-
23
- # setup a fake root
24
- config.before(:all) { File.directory?(ROOT) ? FileUtils.rm_rf("#{ROOT}/*") : FileUtils.mkdir_p(ROOT) }
25
- config.after(:all) { FileUtils.rm_rf("#{ROOT}/*") }
26
19
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: madvertise-logging
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.4.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-06 00:00:00.000000000 Z
12
+ date: 2012-06-19 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: Advanced logging classes with buffer backend, transactions, multi logger,
15
15
  etc
@@ -55,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
55
55
  version: '0'
56
56
  segments:
57
57
  - 0
58
- hash: 1207848459056771944
58
+ hash: 3348248919075792827
59
59
  required_rubygems_version: !ruby/object:Gem::Requirement
60
60
  none: false
61
61
  requirements:
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
64
64
  version: '0'
65
65
  segments:
66
66
  - 0
67
- hash: 1207848459056771944
67
+ hash: 3348248919075792827
68
68
  requirements: []
69
69
  rubyforge_project:
70
70
  rubygems_version: 1.8.17