logging 0.6.0 → 0.6.1

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.1 / 2008-01-01
+
+1 bugfix
+  - Fixed include order to avoid double loading when testing
+
 == 0.6.0 / 2007-12-26
 
 * Using the new 'getopt' method for handling option hashes

data/Manifest.txt

@@ -22,13 +22,13 @@ lib/logging/logger.rb
 lib/logging/repository.rb
 lib/logging/root_logger.rb
 lib/logging/utils.rb
-rakelib/doc.rake
-rakelib/gem.rake
-rakelib/manifest.rake
-rakelib/rubyforge.rake
-rakelib/setup.rb
-rakelib/test.rake
-rakelib/website.rake
+tasks/annotations.rake
+tasks/doc.rake
+tasks/gem.rake
+tasks/manifest.rake
+tasks/rubyforge.rake
+tasks/setup.rb
+tasks/test.rake
 test/appenders/test_console.rb
 test/appenders/test_email.rb
 test/appenders/test_file.rb

data/Rakefile

@@ -1,8 +1,7 @@
 # $Id$
 
-load 'rakelib/setup.rb'
+load 'tasks/setup.rb'
 ensure_in_path 'lib'
-
 require 'logging'
 
 task :default => 'test:run'
@@ -20,11 +19,8 @@ PROJ.rdoc_dir = 'doc/rdoc'
 PROJ.rdoc_remote_dir = ''
 PROJ.version = Logging::VERSION
 
-PROJ.exclude << '^(\.\/|\/)?website/output'
-PROJ.exclude << '^(\.\/|\/)?doc'
-PROJ.exclude << '^(\.\/|\/)?tags$'
-PROJ.rdoc_exclude << '^(\.\/|\/)?data'
-PROJ.rdoc_exclude << '^(\.\/|\/)?website'
+PROJ.exclude << '^tags$' << '^tasks/archive'
+PROJ.rdoc_exclude << '^data'
 
 depend_on 'flexmock'
 depend_on 'lockfile'

data/lib/logging.rb

@@ -1,15 +1,21 @@
-# $Id: logging.rb 65 2007-12-23 04:48:55Z tim_pease $
+# $Id: logging.rb 80 2008-01-01 22:39:52Z tim_pease $
 
 require 'logging/utils'
+require 'logging/log_event'
+require 'logging/logger'
+require 'logging/root_logger'
 require 'logging/repository'
+require 'logging/appender'
+require 'logging/layout'
 
 # require all appenders
+require 'logging/appenders/static_appender'
+require 'logging/appenders/io'
 require 'logging/appenders/console'
 require 'logging/appenders/email'
 require 'logging/appenders/file'
 require 'logging/appenders/growl'
 require 'logging/appenders/rolling_file'
-require 'logging/appenders/static_appender'
 require 'logging/appenders/syslog'
 
 # require all layouts
@@ -24,7 +30,7 @@ require 'logging/config/yaml_configurator'
 #
 module Logging
 
-  VERSION = '0.6.0'   # :nodoc:
+  VERSION = '0.6.1'   # :nodoc:
 
   LEVELS = {}  # :nodoc:
   LNAMES = {}  # :nodoc:

data/lib/logging/appender.rb

@@ -1,10 +1,6 @@
-# $Id: appender.rb 67 2007-12-26 16:27:06Z tim_pease $
+# $Id: appender.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 require 'thread'
-require 'logging'
-require 'logging/logger'
-require 'logging/layout'
-require 'logging/layouts/basic'
 
 module Logging
 

data/lib/logging/appenders/console.rb

@@ -1,6 +1,4 @@
-# $Id: console.rb 65 2007-12-23 04:48:55Z tim_pease $
-
-require 'logging/appenders/io'
+# $Id: console.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging::Appenders
 

data/lib/logging/appenders/file.rb

@@ -1,6 +1,4 @@
-# $Id: file.rb 62 2007-12-22 20:37:05Z tim_pease $
-
-require 'logging/appenders/io'
+# $Id: file.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging::Appenders
 

data/lib/logging/appenders/growl.rb

@@ -1,6 +1,4 @@
-# $Id: growl.rb 69 2007-12-26 20:53:33Z tim_pease $
-
-require 'logging/appender'
+# $Id: growl.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging::Appenders
 

data/lib/logging/appenders/io.rb

@@ -1,6 +1,4 @@
-# $Id: io.rb 72 2007-12-26 21:59:58Z tim_pease $
-
-require 'logging/appender'
+# $Id: io.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging::Appenders
 

data/lib/logging/appenders/rolling_file.rb

@@ -1,7 +1,11 @@
-# $Id: rolling_file.rb 67 2007-12-26 16:27:06Z tim_pease $
-
-require 'logging/appenders/file'
-require 'lockfile'
+# $Id: rolling_file.rb 77 2007-12-30 02:21:33Z tim_pease $
+
+begin
+  require 'lockfile'
+rescue LoadError
+  require 'rubygems'
+  require 'lockfile'
+end
 
 module Logging::Appenders
 

data/lib/logging/appenders/static_appender.rb

@@ -1,6 +1,4 @@
-# $Id: static_appender.rb 37 2007-10-26 19:12:44Z tim_pease $
-
-require 'logging/appenders/console'
+# $Id: static_appender.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging
 class Appender

data/lib/logging/appenders/syslog.rb

@@ -1,7 +1,6 @@
-# $Id: syslog.rb 72 2007-12-26 21:59:58Z tim_pease $
+# $Id: syslog.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 begin
-  require 'logging/appender'
   require 'syslog'
   HAVE_SYSLOG = true
 rescue LoadError

data/lib/logging/config/yaml_configurator.rb

@@ -1,7 +1,6 @@
-# $Id: yaml_configurator.rb 52 2007-11-27 23:53:23Z tim_pease $
+# $Id: yaml_configurator.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 require 'yaml'
-require 'logging'
 
 module Logging
 module Config

data/lib/logging/layout.rb

@@ -1,7 +1,6 @@
-# $Id: layout.rb 62 2007-12-22 20:37:05Z tim_pease $
+# $Id: layout.rb 77 2007-12-30 02:21:33Z tim_pease $
  
 require 'yaml'
-require 'logging'
 
 module Logging
 

data/lib/logging/layouts/basic.rb

@@ -1,8 +1,4 @@
-# $Id: basic.rb 37 2007-10-26 19:12:44Z tim_pease $
-
-require 'logging'
-require 'logging/layout'
-
+# $Id: basic.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging
 module Layouts

data/lib/logging/layouts/pattern.rb

@@ -1,7 +1,4 @@
-# $Id: pattern.rb 62 2007-12-22 20:37:05Z tim_pease $
-
-require 'logging'
-require 'logging/layout'
+# $Id: pattern.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging
 module Layouts

data/lib/logging/logger.rb

@@ -1,11 +1,6 @@
-# $Id: logger.rb 52 2007-11-27 23:53:23Z tim_pease $
+# $Id: logger.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 require 'thread'
-require 'logging'
-require 'logging/appender'
-require 'logging/log_event'
-require 'logging/repository'
-
 
 module Logging
 

data/lib/logging/repository.rb

@@ -1,8 +1,6 @@
-# $Id: repository.rb 52 2007-11-27 23:53:23Z tim_pease $
+# $Id: repository.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 require 'singleton'
-require 'logging/root_logger'
-
 
 module Logging
 

data/lib/logging/root_logger.rb

@@ -1,7 +1,4 @@
-# $Id: root_logger.rb 52 2007-11-27 23:53:23Z tim_pease $
-
-require 'logging'
-require 'logging/logger'
+# $Id: root_logger.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 module Logging
 

data/tasks/annotations.rake

@@ -0,0 +1,30 @@
+# $Id$
+
+if HAVE_BONES
+
+desc "Enumerate all annotations"
+task :notes do
+  Bones::AnnotationExtractor.enumerate(
+      PROJ, "OPTIMIZE|FIXME|TODO", :tag => true)
+end
+
+namespace :notes do
+  desc "Enumerate all OPTIMIZE annotations"
+  task :optimize do
+    Bones::AnnotationExtractor.enumerate(PROJ, "OPTIMIZE")
+  end
+
+  desc "Enumerate all FIXME annotations"
+  task :fixme do
+    Bones::AnnotationExtractor.enumerate(PROJ, "FIXME")
+  end
+
+  desc "Enumerate all TODO annotations"
+  task :todo do
+    Bones::AnnotationExtractor.enumerate(PROJ, "TODO")
+  end
+end
+
+end  # if HAVE_BONES
+
+# EOF

data/{rakelib → tasks}/doc.rake

@@ -1,4 +1,4 @@
-# $Id: doc.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id$
 
 require 'rake/rdoctask'
 
@@ -38,6 +38,12 @@ namespace :doc do
 
 end  # namespace :doc
 
+desc 'Alias to doc:rdoc'
+task :doc => 'doc:rdoc'
+
+desc 'Remove all build products'
 task :clobber => %w(doc:clobber_rdoc doc:clobber_ri)
 
+remove_desc_for_task %w(doc:clobber_rdoc doc:clobber_ri)
+
 # EOF

data/{rakelib → tasks}/gem.rake

@@ -1,4 +1,4 @@
-# $Id: gem.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id$
 
 require 'rake/gempackagetask'
 
@@ -18,7 +18,6 @@ namespace :gem do
     PROJ.dependencies.each do |dep|
       s.add_dependency(*dep)
     end
-    s.add_dependency('rake', ">= #{RAKEVERSION}")
 
     s.files = PROJ.files
     s.executables = PROJ.executables.map {|fn| File.basename(fn)}
@@ -80,6 +79,11 @@ namespace :gem do
 
 end  # namespace :gem
 
+desc 'Alias to gem:package'
+task :gem => 'gem:package'
+
 task :clobber => 'gem:clobber_package'
 
+remove_desc_for_task %w(gem:clobber_package)
+
 # EOF

data/{rakelib → tasks}/manifest.rake

@@ -1,18 +1,19 @@
-# $Id: manifest.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id$
 
 require 'find'
 
 namespace :manifest do
 
-  desc 'Verify the manfiest'
+  desc 'Verify the manifest'
   task :check do
     fn = 'Manifest.tmp'
     files = []
     exclude = Regexp.new(PROJ.exclude.join('|'))
     Find.find '.' do |path|
+      path.sub! %r/^(\.\/|\/)/o, ''
       next unless test ?f, path
       next if path =~ exclude
-      files << path[2..-1]
+      files << path
     end
 
     File.open(fn, 'w') {|fp| fp.puts files.sort}
@@ -26,9 +27,10 @@ namespace :manifest do
     files = []
     exclude = Regexp.new(PROJ.exclude.join('|'))
     Find.find '.' do |path|
+      path.sub! %r/^(\.\/|\/)/o, ''
       next unless test ?f, path
       next if path =~ exclude
-      files << path[2..-1]
+      files << path
     end
 
     files << fn unless test ?f, fn

data/{rakelib → tasks}/rubyforge.rake

@@ -1,4 +1,4 @@
-# $Id: rubyforge.rake 11 2007-08-23 15:45:16Z tim_pease $
+# $Id$
 
 if PROJ.rubyforge_name && HAVE_RUBYFORGE
 

data/{rakelib → tasks}/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 63 2007-12-22 20:47:54Z tim_pease $
+# $Id: setup.rb 79 2008-01-01 20:29:30Z tim_pease $
 
 require 'rubygems'
 require 'rake'
@@ -16,7 +16,7 @@ PROJ.email = nil
 PROJ.url = nil
 PROJ.version = ENV['VERSION'] || '0.0.0'
 PROJ.rubyforge_name = nil
-PROJ.exclude = %w(tmp$ bak$ ~$ CVS \.svn)
+PROJ.exclude = %w(tmp$ bak$ ~$ CVS \.svn ^pkg ^doc)
 
 # Rspec
 PROJ.specs = FileList['spec/**/*_spec.rb']
@@ -56,6 +56,13 @@ PROJ.dependencies = []
 PROJ.need_tar = true
 PROJ.need_zip = false
 
+# File Annotations
+PROJ.annotation_exclude = []
+PROJ.annotation_extensions = %w(.txt .rb .erb) << ''
+
+# Load the other rake files in the tasks folder
+Dir.glob('tasks/*.rake').sort.each {|fn| import fn}
+
 # Setup some constants
 WIN32 = %r/win32/ =~ RUBY_PLATFORM unless defined? WIN32
 
@@ -86,12 +93,12 @@ SUDO = if WIN32 then ''
 RCOV = WIN32 ? 'rcov.cmd'  : 'rcov'
 GEM  = WIN32 ? 'gem.cmd'   : 'gem'
 
-%w(rcov spec rubyforge).each do |lib|
+%w(rcov spec/rake/spectask rubyforge bones).each do |lib|
   begin
     require lib
-    Object.instance_eval {const_set "HAVE_#{lib.upcase}", true}
+    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", true}
   rescue LoadError
-    Object.instance_eval {const_set "HAVE_#{lib.upcase}", false}
+    Object.instance_eval {const_set "HAVE_#{lib.tr('/','_').upcase}", false}
   end
 end
 
@@ -120,7 +127,18 @@ end
 #
 def ensure_in_path( path )
   path = File.expand_path(path)
-  $: << path if test(?d, path) and not $:.include?(path)
+  $:.unshift(path) if test(?d, path) and not $:.include?(path)
+end
+
+# Find a rake task using the task name and remove any description text. This
+# will prevent the task from being displayed in the list of available tasks.
+#
+def remove_desc_for_task( names )
+  Array(names).each do |task_name|
+    task = Rake.application.tasks.find {|t| t.name == task_name}
+    next if task.nil?
+    task.instance_variable_set :@comment, nil
+  end
 end
 
 # EOF

data/{rakelib → tasks}/test.rake

@@ -30,6 +30,11 @@ namespace :test do
 
 end  # namespace :test
 
+desc 'Alias to test:run'
+task :test => 'test:run'
+
 task :clobber => 'test:clobber_rcov' if HAVE_RCOV
 
+remove_desc_for_task %w(test:clobber_rcov)
+
 # EOF

data/test/setup.rb

@@ -1,4 +1,4 @@
-# $Id: setup.rb 72 2007-12-26 21:59:58Z tim_pease $
+# $Id: setup.rb 77 2007-12-30 02:21:33Z tim_pease $
 
 require 'test/unit'
 
@@ -7,15 +7,7 @@ require 'test/unit'
 #
 KeyError = IndexError if not defined? KeyError
 
-begin
-  require 'rubygems'
-  require 'logging'
-rescue LoadError
-  path = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
-  raise if $:.include? path
-  $: << path
-  retry
-end
+require File.join(File.dirname(__FILE__), '..', 'lib', 'logging')
 
 begin
   require 'turn'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: logging
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Tim Pease
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-26 00:00:00 -07:00
+date: 2008-01-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,15 +30,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.4.3
     version: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.8.1
-    version: 
 description: Logging is a flexible logging library for use in Ruby programs based on the design of Java's log4j library. It features a hierarchical logging system, custom level names, multiple output destinations per log event, custom formatting, and more.
 email: tim.pease@gmail.com
 executables: []
@@ -73,13 +64,13 @@ files:
 - lib/logging/repository.rb
 - lib/logging/root_logger.rb
 - lib/logging/utils.rb
-- rakelib/doc.rake
-- rakelib/gem.rake
-- rakelib/manifest.rake
-- rakelib/rubyforge.rake
-- rakelib/setup.rb
-- rakelib/test.rake
-- rakelib/website.rake
+- tasks/annotations.rake
+- tasks/doc.rake
+- tasks/gem.rake
+- tasks/manifest.rake
+- tasks/rubyforge.rake
+- tasks/setup.rb
+- tasks/test.rake
 - test/appenders/test_console.rb
 - test/appenders/test_email.rb
 - test/appenders/test_file.rb

data/rakelib/website.rake

@@ -1,38 +0,0 @@
-# $Id: website.rake 12 2007-08-23 16:43:11Z tim_pease $
-
-namespace :website do
-
-  desc 'Build the Logging website'
-  task :build do
-    begin
-      olddir = pwd
-      chdir 'website'
-      sh 'rake build'
-      cp_r 'output/.', olddir + '/doc'
-    ensure
-      chdir olddir
-    end
-  end
-
-  desc 'Remove the Logging website'
-  task :clobber do
-    rm_r 'doc' rescue nil
-  end
-
-  desc 'Publish the website to RubyForge'
-  task :release => %w(website:clobber doc:rdoc website:build) do
-    config = YAML.load(
-        File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-    )
-
-    host = "#{config['username']}@rubyforge.org"
-    remote_dir = "/var/www/gforge-projects/#{PROJ.rubyforge_name}/"
-
-    sh "rsync --delete -rulptzCF doc/ #{host}:#{remote_dir}"
-  end
-
-end  # namespace :website
-
-task :clobber => 'website:clobber'
-
-# EOF