diff --git a/.gitignore b/.gitignore index adcda08..a985dbd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -*.gemspec -*.gem +t*.gem *.rbc .bundle .config diff --git a/README.md b/README.md index 765a3c5..2ac383d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Slogger +Semlogger ======= -(Semi-)Structured Logger for Ruby (and Rails) \ No newline at end of file +(Semi-)Structured Logger for Ruby (and Rails) diff --git a/Rakefile b/Rakefile index e5fad5a..68654fb 100644 --- a/Rakefile +++ b/Rakefile @@ -4,11 +4,11 @@ require 'rake' begin require 'jeweler' Jeweler::Tasks.new do |gem| - gem.name = "slogger" + gem.name = "semlogger" gem.summary = %Q{(Semi-)Structured Logger} gem.description = %Q{(Semi-)Structured Logger for Ruby (and Rails)} gem.email = %w[Denis.Knauf@gmail.com] - gem.homepage = "http://github.com/DenisKnauf/Slogger" + gem.homepage = "http://github.com/DenisKnauf/semlogger" gem.authors = ["Denis Knauf"] gem.files = %w[AUTHORS README.md VERSION LICENSE lib/**/*.rb] gem.require_paths = %w[lib] @@ -52,7 +52,7 @@ Rake::RDocTask.new do |rdoc| end rdoc.rdoc_dir = 'rdoc' - rdoc.title = "Slogger #{version}" + rdoc.title = "semlogger #{version}" rdoc.rdoc_files.include 'README.md' rdoc.rdoc_files.include 'AUTHORS' rdoc.rdoc_files.include 'LICENSE' diff --git a/lib/slogger.rb b/lib/semlogger.rb similarity index 85% rename from lib/slogger.rb rename to lib/semlogger.rb index a3dc744..57b17e9 100644 --- a/lib/slogger.rb +++ b/lib/semlogger.rb @@ -1,9 +1,9 @@ require 'json' -class Slogger < ::Logger +class Semlogger < ::Logger def initialize logdev = nil, *a, &e case logdev - when String, nil then logdev = ::Slogger::Writer.new logdev + when String, nil then logdev = ::Semlogger::Writer.new logdev end @level, @data, @tags, @logdev = DEBUG, {}, [], logdev end @@ -75,8 +75,8 @@ class Slogger < ::Logger end end -require 'slogger/rotate' -require 'slogger/multiplex' -require 'slogger/rack' -require 'slogger/filter' -require 'slogger/writer' +require 'semlogger/rotate' +require 'semlogger/multiplex' +require 'semlogger/rack' +require 'semlogger/filter' +require 'semlogger/writer' diff --git a/lib/slogger/filter.rb b/lib/semlogger/filter.rb similarity index 71% rename from lib/slogger/filter.rb rename to lib/semlogger/filter.rb index 8e68265..cf3dde8 100644 --- a/lib/slogger/filter.rb +++ b/lib/semlogger/filter.rb @@ -1,4 +1,4 @@ -class Slogger::Filter +class Semlogger::Filter attr_accessor :level, :logdev def initialize level, logdev @@ -15,9 +15,9 @@ end %w[debug info warn error fatal].each do |level| eval <<-EOC - class ::Slogger::F#{level.camelcase} < Slogger::Filter + class ::Semlogger::F#{level.camelcase} < Semlogger::Filter def initialize *a - super Slogger::#{level.upcase}, *a + super Semlogger::#{level.upcase}, *a end end EOC diff --git a/lib/slogger/formatter.rb b/lib/semlogger/formatter.rb similarity index 93% rename from lib/slogger/formatter.rb rename to lib/semlogger/formatter.rb index 5acfaf1..d0379dc 100644 --- a/lib/slogger/formatter.rb +++ b/lib/semlogger/formatter.rb @@ -1,4 +1,4 @@ -class Slogger::Formatter < ::Logger::Formatter +class Semlogger::Formatter < ::Logger::Formatter def initialize tags, data @tags, @data = tags, data end diff --git a/lib/slogger/multiplex.rb b/lib/semlogger/multiplex.rb similarity index 95% rename from lib/slogger/multiplex.rb rename to lib/semlogger/multiplex.rb index e10bb84..4c8430a 100644 --- a/lib/slogger/multiplex.rb +++ b/lib/semlogger/multiplex.rb @@ -1,4 +1,4 @@ -class Slogger::Multiplex +class Semlogger::Multiplex def initialize( *dests) @__dests__ = dests end def write( *a, &e) @__dests__.each {|d| d.write *a, &e } end diff --git a/lib/slogger/rack.rb b/lib/semlogger/rack.rb similarity index 93% rename from lib/slogger/rack.rb rename to lib/semlogger/rack.rb index f0cf227..3032726 100644 --- a/lib/slogger/rack.rb +++ b/lib/semlogger/rack.rb @@ -1,4 +1,4 @@ -class Slogger::Rack < Rails::Rack::Logger +class Semlogger::Rack < Rails::Rack::Logger def initialize app, tags = nil, data = nil super app, tags @data = data diff --git a/lib/slogger/rotate.rb b/lib/semlogger/rotate.rb similarity index 95% rename from lib/slogger/rotate.rb rename to lib/semlogger/rotate.rb index 35142e0..a658477 100644 --- a/lib/slogger/rotate.rb +++ b/lib/semlogger/rotate.rb @@ -1,4 +1,4 @@ -class Slogger::Rotate +class Semlogger::Rotate attr_reader :file def filename() @filename.dup end diff --git a/lib/slogger/tailer.rb b/lib/semlogger/tailer.rb similarity index 95% rename from lib/slogger/tailer.rb rename to lib/semlogger/tailer.rb index 2afbc24..bf823ef 100644 --- a/lib/slogger/tailer.rb +++ b/lib/semlogger/tailer.rb @@ -1,4 +1,4 @@ -class Slogger::Tailer < Rails::Rack::LogTailer +class Semlogger::Tailer < Rails::Rack::LogTailer def initialize app, log = nil @app = app log ||= Rails.root.join( 'log', Rails.env).to_s.gsub('%', '%%') + '.%Y-%m-%d.%$.log' diff --git a/lib/slogger/writer.rb b/lib/semlogger/writer.rb similarity index 75% rename from lib/slogger/writer.rb rename to lib/semlogger/writer.rb index a41a9af..a7dd419 100644 --- a/lib/slogger/writer.rb +++ b/lib/semlogger/writer.rb @@ -1,9 +1,9 @@ -class Slogger::Output +class Semlogger::Output end -class Slogger::Writer < Slogger::Output +class Semlogger::Writer < Semlogger::Output def initialize logdev = nil - @logdev = logdev || ::Slogger::Rotate.new( ::Rails.root.join( 'log', ::Rails.env).to_s.gsub('%', '%%') + '.%Y-%m-%d.%$.log') + @logdev = logdev || ::Semlogger::Rotate.new( ::Rails.root.join( 'log', ::Rails.env).to_s.gsub('%', '%%') + '.%Y-%m-%d.%$.log') end def add severity, time, progname, data, tags, message @@ -11,7 +11,7 @@ class Slogger::Writer < Slogger::Output end end -class Slogger::Printer < Slogger::Output +class Semlogger::Printer < Semlogger::Output def initialize logdev = nil @logdev = logdev || $stdout @last_reqid = nil diff --git a/lib/slogger/transaction.rb b/lib/slogger/transaction.rb deleted file mode 100644 index 5ea8676..0000000 --- a/lib/slogger/transaction.rb +++ /dev/null @@ -1,28 +0,0 @@ -class Slogger::Transaction - include UUIDTools - attr_reader :app, :id, :default_id - - class <= 0") if s.respond_to? :required_rubygems_version= + s.authors = ["Denis Knauf"] + s.date = %q{2012-05-14} + s.description = %q{(Semi-)Structured Logger for Ruby (and Rails)} + s.email = ["Denis.Knauf@gmail.com"] + s.extra_rdoc_files = [ + "LICENSE", + "README.md" + ] + s.files = [ + "AUTHORS", + "LICENSE", + "README.md", + "VERSION", + "lib/semlogger.rb", + "lib/semlogger/filter.rb", + "lib/semlogger/formatter.rb", + "lib/semlogger/multiplex.rb", + "lib/semlogger/rack.rb", + "lib/semlogger/rotate.rb", + "lib/semlogger/tailer.rb", + "lib/semlogger/writer.rb" + ] + s.homepage = %q{http://github.com/DenisKnauf/semlogger} + s.require_paths = ["lib"] + s.rubygems_version = %q{1.3.7} + s.summary = %q{(Semi-)Structured Logger} + + if s.respond_to? :specification_version then + current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION + s.specification_version = 3 + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q, [">= 0"]) + else + s.add_dependency(%q, [">= 0"]) + end + else + s.add_dependency(%q, [">= 0"]) + end +end +