noddy 0.0.3 → 0.0.4

data/README.md

@@ -6,8 +6,7 @@ This is very much a work in progress, but is still usable.
 
 TODO:
 
- - Specify log output e.g. STDERR, STDOUT, File
- - Sepcifiy log format
+ - Sepcifiy log format (text, json etc)
 
 ## Installation
 
@@ -31,6 +30,8 @@ require "noddy"
 Noddy.log_level = Noddy::DEBUG # Default: Noddy::INFO
 Noddy.colour = true # Default: false
 Noddy.timestamp = false # Default: true
+Noddy.outputs = [STDOUT, Noddy::FILE] # Default [STDERR]
+Noddy.outputs = [STDOUT, '/var/log/dca/test.log'] # Using a custom log path
 
 Noddy.debug "I am just a debug message"
 Noddy.info "I am an info message"

data/lib/noddy.rb

@@ -4,10 +4,6 @@ require "noddy/string"
 
 module Noddy
   class << self
-    def log_level=( level )
-      @level = level
-    end
-
     def debug( msg )
       log_message( msg, DEBUG )
     end
@@ -29,6 +25,10 @@ module Noddy
     end
 
 
+    def log_level=( level )
+      @level = level
+    end
+
     def colour=( colour )
       @colour = colour
     end
@@ -37,14 +37,52 @@ module Noddy
       @timestamp = timestamp
     end
 
+    def outputs=( outputs = [] )
+      @outputs = outputs
+    end
+
     private
     def log_message( msg, level )
-
-      msg.colour!( level ) if @colour || COLOUR_DEFAULT
+      outputs = @outputs || OUTPUTS_DEFAULT
 
       msg.timestamp! if @timestamp || TIMESTAMP_DEFAULT
 
-      puts msg if level <= (@level || DEFAULT_LEVEL )
+      outputs.each do |output|
+        case output
+        when STDOUT
+          if @colour || COLOUR_DEFAULT
+            STDOUT.puts msg.colour( level ) if level <= (@level || DEFAULT_LEVEL )
+          else
+            STDOUT.puts msg if level <= (@level || DEFAULT_LEVEL )
+          end
+        when STDERR
+          if @colour || COLOUR_DEFAULT
+            STDERR.puts msg.colour( level ) if level <= (@level || DEFAULT_LEVEL )
+          else
+            STDERR.puts msg if level <= (@level || DEFAULT_LEVEL )
+          end
+        when String
+          write_log_file( output, msg, level )
+        else
+          raise "Unknow output type of class #{output.class}"
+        end
+      end
     end
+
+    def write_log_file( output, msg, level )
+      log_dir = File.dirname output
+      raise "Log file directory #{log_dir} does not exist" unless Dir.exist? log_dir
+
+      begin
+        File.open(output, 'a', 0644) do |f|
+          f.flock(File::LOCK_EX)
+          f.write msg + "\n"
+          f.flush
+        end
+      rescue Errno::EACCES => e
+        raise "Permissioned denided writing to #{output}"
+      end
+    end
+
   end
 end

data/lib/noddy/constants.rb

@@ -12,4 +12,8 @@ module Noddy
 
   TIMESTAMP_DEFAULT = true
 
+  OUTPUTS_DEFAULT = [STDERR]
+
+  FILE = '/var/log/' + File.basename($0).gsub(/\.\w+$/, '') + '.log'
+
 end

data/lib/noddy/version.rb

@@ -1,3 +1,3 @@
 module Noddy
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/noddy.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Dave Avent"]
   spec.email         = ["davent@lumux.co.uk"]
   spec.summary       = %q{Noddy Logger logging library.}
-  spec.description   = %q{Handles logging to stdout, stderr and file as well as log levels, timestamping and compression.}
+  spec.description   = %q{Noddy Logger is a very simple library to quickly output logs from your scripts and applications using colours, timestamps etc.}
   spec.homepage      = "https://github.com/davent/noddy"
   spec.license       = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: noddy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-11 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,8 +43,8 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Handles logging to stdout, stderr and file as well as log levels, timestamping
-  and compression.
+description: Noddy Logger is a very simple library to quickly output logs from your
+  scripts and applications using colours, timestamps etc.
 email:
 - davent@lumux.co.uk
 executables: []