sappho-basics 0.0.6 → 0.0.7

data/lib/sappho-basics/auto_flush_log.rb

@@ -21,13 +21,23 @@ module Sappho
         'fatal' => Logger::FATAL
     }
     LOG_DETAIL = {
-        'message' => proc { |severity, datetime, progname, message| "#{message}\n" }
+        'message' => proc { |severity, datetime, progname, message| "#{message}\n" },
+        'test' => proc { |severity, datetime, progname, message| "#{severity} #{message}\n" }
     }
+    @@file = nil
+
+    def AutoFlushLog.file file
+      @@file = file
+    end
 
     def initialize
       @mutex = Mutex.new
-      filename = ENV['application.log.filename']
-      @log = Logger.new(filename ? File.open(filename, 'a') : $stdout)
+      unless @@file
+        filename = ENV['application.log.filename']
+        mode = File.exists?(filename) ? 'a' : 'w' if filename
+        @@file = filename ? File.open(filename, mode) : $stdout
+      end
+      @log = Logger.new @@file
       level = ENV['application.log.level']
       @log.level = LOG_LEVELS.has_key?(level) ? LOG_LEVELS[level] : Logger::INFO
       detail = ENV['application.log.detail']
@@ -65,7 +75,7 @@ module Sappho
 
     def fatal error
       @mutex.synchronize do
-        @log.fatal "fatal error! #{error.message}"
+        @log.fatal "error! #{error.message}"
         error.backtrace.each { |error| @log.fatal error }
         $stdout.flush
       end if @log.fatal?

data/lib/sappho-basics/version.rb

@@ -5,7 +5,7 @@
 
 module Sappho
   NAME = 'sappho-basics'
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
   AUTHORS = ['Andrew Heald']
   EMAILS = ['andrew@heald.co.uk']
   HOMEPAGE = 'https://github.com/sappho/sappho-basics/wiki'

data/test/ruby/auto_flush_log_test.rb

@@ -0,0 +1,47 @@
+# See https://github.com/sappho/sappho-basics/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+
+require 'test/unit'
+require 'stringio'
+require 'sappho-basics/auto_flush_log'
+
+class AutoFlushLogTest < Test::Unit::TestCase
+
+  include Sappho::LogUtilities
+
+  def test_logging
+    file = StringIO.new
+    Sappho::AutoFlushLog.file file
+    assert_raises NoMethodError do
+      Sappho::AutoFlushLog.new
+    end
+    ENV['application.log.level'] = 'debug'
+    ENV['application.log.detail'] = 'test'
+    log = Sappho::AutoFlushLog.instance
+    assert log.debug?
+    log.debug 'Test 1'
+    log.info 'Test 2'
+    log.warn 'Test 3'
+    begin
+      raise 'Test 4'
+    rescue => error
+      log.error error
+    end
+    begin
+      raise 'Test 5'
+    rescue => error
+      log.fatal error
+    end
+    assert_match /DEBUG Test 1/m, file.string
+    assert_match /INFO Test 2/m, file.string
+    assert_match /WARN Test 3/m, file.string
+    assert_match /ERROR error! Test 4/m, file.string
+    assert_match /ERROR .+\/auto_flush_log_test.rb:\d+:in `test_logging'/m, file.string
+    assert_match /FATAL error! Test 5/m, file.string
+    assert_match /FATAL .+\/auto_flush_log_test.rb:\d+:in `test_logging'/m, file.string
+    assert_equal '61 62 63 78 79 7a ', hexString('abcxyz'.unpack('c*'))
+  end
+
+end

data/test/ruby/module_register_test.rb

@@ -0,0 +1,62 @@
+# See https://github.com/sappho/sappho-basics/wiki for project documentation.
+# This software is licensed under the GNU Affero General Public License, version 3.
+# See http://www.gnu.org/licenses/agpl.html for full details of the license terms.
+# Copyright 2012 Andrew Heald.
+
+require 'test/unit'
+require 'sappho-basics/module_register'
+
+class ModuleRegisterTest < Test::Unit::TestCase
+
+  def test_module_register
+    assert_raises NoMethodError do
+      Sappho::ModuleRegister.new
+    end
+    modules = Sappho::ModuleRegister.instance
+    assert_nil modules.get(:missing)
+    assert !modules.set?(:missing)
+    assert modules.set?(:log)
+    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
+    test1 = TestModule.new
+    test2 = TestModule.new
+    modules.set :test1, test1
+    modules.set :test2, test2
+    modules.set :test1, test1
+    assert_equal test1, modules.get(:test1)
+    assert_equal test2, modules.get(:test2)
+    assert modules.set?(:test1)
+    assert modules.set?(:test2)
+    assert test1.alive
+    assert test2.alive
+    modules.shutdown
+    assert !test1.alive
+    assert !test2.alive
+    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
+    assert_equal test1, modules.get(:test1)
+    assert_equal test2, modules.get(:test2)
+    test1.alive = true
+    test2.alive = true
+    modules.shutdown
+    assert !test1.alive
+    assert !test2.alive
+    assert_instance_of Sappho::AutoFlushLog, modules.get(:log)
+    assert_equal test1, modules.get(:test1)
+    assert_equal test2, modules.get(:test2)
+  end
+
+  class TestModule
+
+    attr_accessor :alive
+
+    def initialize
+      @alive = true
+    end
+
+    def shutdown
+      @alive = false
+      raise 'ignored error'
+    end
+
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sappho-basics
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Andrew Heald
@@ -47,6 +47,8 @@ files:
 - lib/sappho-basics/auto_flush_log.rb
 - lib/sappho-basics/module_register.rb
 - lib/sappho-basics/version.rb
+- test/ruby/auto_flush_log_test.rb
+- test/ruby/module_register_test.rb
 homepage: https://github.com/sappho/sappho-basics/wiki
 licenses: []
 
@@ -80,5 +82,6 @@ rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Provides a small set of basic classes and modules to Sapphic apps
-test_files: []
-
+test_files: 
+- test/ruby/auto_flush_log_test.rb
+- test/ruby/module_register_test.rb