dohlog 0.1.11 → 0.2.0

data/lib/{doh/log → dohlog}/event.rb

@@ -1,4 +1,4 @@
-require 'doh/log/severity'
+require 'dohlog/severity'
 
 module DohLog
 

data/lib/{doh/log → dohlog}/integrate.rb

@@ -1,12 +1,10 @@
 class Module
-  undef dohlog
   def dohlog
     @dohlog ||= DohLog::Interface.new(self.to_s)
   end
 end
 
 class Object
-  undef dohlog
   def dohlog
     self.class.dohlog
   end

data/lib/dohlog/interface.rb

@@ -0,0 +1,55 @@
+require 'dohlog/event'
+
+module DohLog
+
+class Interface
+  @@acceptor = nil
+  @@enabled = false
+
+  def self.setup(acceptor)
+    @@acceptor = acceptor
+    @@enabled = true
+  end
+
+  def self.shutdown
+    @@acceptor.shutdown
+  end
+
+  def self.enable
+    @@enabled = true
+  end
+
+  def self.disable
+    @@enabled = false
+  end
+
+  def initialize(location)
+    @location = location
+  end
+
+  def debug(msg, exception = nil)
+    if @@enabled
+      @@acceptor.add(Event.new(DohLog::DEBUG, msg, @location, exception))
+    end
+  end
+
+  def info(msg, exception = nil)
+    if @@enabled
+      @@acceptor.add(Event.new(DohLog::INFO, msg, @location, exception))
+    end
+  end
+
+  def warn(msg, exception = nil)
+    if @@enabled
+      @@acceptor.add(Event.new(DohLog::WARN, msg, @location, exception))
+    end
+  end
+
+  def error(msg, exception = nil)
+    if @@enabled
+      @@acceptor.add(Event.new(DohLog::ERROR, msg, @location, exception))
+    end
+  end
+end
+
+end

data/lib/dohlog/severity.rb

@@ -0,0 +1,13 @@
+module DohLog
+
+DEBUG = 0
+INFO = 1
+WARN = 2
+ERROR = 3
+SEVERITY_LEVELS = %w(debug info WARNING ERROR)
+
+def self.severity_text(level)
+  SEVERITY_LEVELS[level]
+end
+
+end

data/lib/dohlog.rb

@@ -0,0 +1,24 @@
+require 'dohlog/interface'
+require 'dohlog/integrate'
+require 'dohlog/stream_acceptor'
+
+module DohLog
+extend self
+
+def setup(acceptor)
+  DohLog::Interface.setup(acceptor)
+end
+
+def shutdown
+  DohLog::Interface.shutdown
+end
+
+def enable
+  DohLog::Interface.enable
+end
+
+def disable
+  DohLog::Interface.disable
+end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dohlog
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-20 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dohutil
@@ -36,18 +36,16 @@ extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
 files:
-- lib/doh/log/append_acceptor.rb
-- lib/doh/log/email_acceptor.rb
-- lib/doh/log/event.rb
-- lib/doh/log/filter_acceptor.rb
-- lib/doh/log/integrate.rb
-- lib/doh/log/interface.rb
-- lib/doh/log/memory_acceptor.rb
-- lib/doh/log/multi_acceptor.rb
-- lib/doh/log/severity.rb
-- lib/doh/log/stream_acceptor.rb
-- lib/doh/log/unintegrate.rb
-- lib/doh/log.rb
+- lib/dohlog/append_acceptor.rb
+- lib/dohlog/event.rb
+- lib/dohlog/filter_acceptor.rb
+- lib/dohlog/integrate.rb
+- lib/dohlog/interface.rb
+- lib/dohlog/memory_acceptor.rb
+- lib/dohlog/multi_acceptor.rb
+- lib/dohlog/severity.rb
+- lib/dohlog/stream_acceptor.rb
+- lib/dohlog.rb
 - MIT-LICENSE
 homepage: https://github.com/atpsoft/dohlog
 licenses:

data/lib/doh/log/email_acceptor.rb

@@ -1,27 +0,0 @@
-require 'net/smtp'
-
-module DohLog
-
-class EmailAcceptor
-  # required config fields are :from, :to, :server
-  def initialize(config)
-    @config = config
-    @msg_start = "From:#{config[:from]}\nTo:#{config[:to].join(', ')}\nContent-Type: text/plain\nSubject:"
-  end
-
-  def add(event)
-    msg = "#{@msg_start}#{event.severity_text}: #{event.msg}\n\n#{event.summary}\n#{event.exception_text}"
-    Net::SMTP.start(@config[:server]) do |smtp|
-      begin
-        smtp.send_message(msg, @config[:from], @config[:to])
-      rescue => excpt
-        $stderr.puts "DohLog EmailAcceptor send failed: #{excpt}"
-      end
-    end
-  end
-
-  def shutdown
-  end
-end
-
-end

data/lib/doh/log/interface.rb

@@ -1,45 +0,0 @@
-require 'doh/log/event'
-
-module DohLog
-
-class Interface
-  @@acceptor = nil
-
-  def self.setup(acceptor)
-    @@acceptor = acceptor
-  end
-
-  def self.shutdown
-    @@acceptor.shutdown
-  end
-
-  def initialize(location)
-    @location = location
-  end
-
-  def debug(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::DEBUG, msg, @location, exception))
-  end
-
-  def info(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::INFO, msg, @location, exception))
-  end
-
-  def notify(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::NOTIFY, msg, @location, exception))
-  end
-
-  def warn(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::WARN, msg, @location, exception))
-  end
-
-  def error(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::ERROR, msg, @location, exception))
-  end
-
-  def fatal(msg, exception = nil)
-    @@acceptor.add(Event.new(DohLog::FATAL, msg, @location, exception))
-  end
-end
-
-end

data/lib/doh/log/severity.rb

@@ -1,15 +0,0 @@
-module DohLog
-
-DEBUG = 0
-INFO = 1
-NOTIFY = 2
-WARN = 3
-ERROR = 4
-FATAL = 5
-SEVERITY_LEVELS = %w(debug info NOTIFY WARNING ERROR ***FATAL***)
-
-def self.severity_text(level)
-  SEVERITY_LEVELS[level]
-end
-
-end

data/lib/doh/log/unintegrate.rb

@@ -1,7 +0,0 @@
-class Module
-  undef dohlog
-end
-
-class Object
-  undef dohlog
-end

data/lib/doh/log.rb

@@ -1,26 +0,0 @@
-require 'doh/log/stub'
-require 'doh/log/interface'
-
-module DohLog
-
-def self.setup(acceptor)
-  require 'doh/log/integrate'
-  DohLog::Interface.setup(acceptor)
-end
-
-def self.shutdown
-  DohLog::Interface.shutdown
-end
-
-def self.disable
-  return if dohlog == StubInterface
-  load 'doh/log/unintegrate.rb'
-  load 'doh/log/stub.rb'
-end
-
-def self.enable
-  return unless dohlog == StubInterface
-  load 'doh/log/integrate.rb'
-end
-
-end