steno 0.0.3 → 0.0.5

data/lib/steno/config.rb

@@ -10,12 +10,25 @@ end
 
 class Steno::Config
   class << self
+    # Creates a config given a yaml file of the following form:
+    #
+    #     logging:
+    #       level:  <info, debug, etc>
+    #       file:   </path/to/logfile>
+    #       syslog: <syslog name>
+    #
+    # @param [String] path  Path to yaml config
+    # @param [Hash] overrides
+    #
+    # @return [Steno::Config]
     def from_file(path, overrides = {})
       h = YAML.load_file(path)
 
+      h = h["logging"] || {}
+
       opts = {
         :sinks => [],
-        :default_log_level => h["level"].to_sym,
+        :default_log_level => h["level"].nil? ? :info : h["level"].to_sym,
       }
 
       if h["file"]

data/lib/steno/version.rb

@@ -1,3 +1,3 @@
 module Steno
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/steno.rb

@@ -3,7 +3,6 @@ require "thread"
 require "steno/codec"
 require "steno/config"
 require "steno/context"
-require "steno/core_ext"
 require "steno/errors"
 require "steno/log_level"
 require "steno/logger"

data/spec/unit/config_spec.rb

@@ -0,0 +1,80 @@
+require "fileutils"
+require "yaml"
+
+require "spec_helper"
+
+describe Steno::Config do
+  describe ".from_file" do
+    before :each do
+      @tmpdir = Dir.mktmpdir
+      @config_path = File.join(@tmpdir, "config.yml")
+      @log_path = File.join(@tmpdir, "test.log")
+    end
+
+    after :each do
+      FileUtils.rm_rf(@tmpdir)
+    end
+
+    it "should return Steno::Config instance with sane defaults" do
+      write_config(@config_path, {})
+
+      config = Steno::Config.from_file(@config_path)
+
+      config.sinks.size.should == 1
+      config.sinks[0].class.should == Steno::Sink::IO
+
+      config.default_log_level.should == :info
+
+      config.context.should.class == Steno::Context::Null
+
+      config.codec.should.class == Steno::Codec::Json
+    end
+
+    it "should set the default_log_level if a key with the same name is supplied" do
+      write_config(@config_path, { "level" => "debug2" })
+
+      Steno::Config.from_file(@config_path).default_log_level.should == :debug2
+    end
+
+    it "should add a file sink if the 'file' key is specified" do
+      write_config(@config_path, { "file" => @log_path })
+      mock_sink = mock("sink")
+      mock_sink.stub(:codec=)
+
+      Steno::Sink::IO.should_receive(:for_file).with(@log_path).and_return(mock_sink)
+      config = Steno::Config.from_file(@config_path)
+      config.sinks.size.should == 1
+      config.sinks[0].should == mock_sink
+    end
+
+    it "should add a syslog sink if the 'syslog' key is specified" do
+      write_config(@config_path, { "syslog" => "test" })
+      mock_sink = mock("sink")
+      mock_sink.should_receive(:open).with("test")
+      mock_sink.stub(:codec=)
+
+      Steno::Sink::Syslog.should_receive(:instance).twice().and_return(mock_sink)
+
+      config = Steno::Config.from_file(@config_path)
+      config.sinks.size.should == 1
+      config.sinks[0].should == mock_sink
+    end
+
+    it "should merge supplied overrides with the file based config" do
+      write_config(@config_path, { "default_log_level" => "debug" })
+
+      context = Steno::Context::ThreadLocal.new
+      config = Steno::Config.from_file(@config_path,
+                                       :default_log_level => "warn",
+                                       :context => context)
+      config.context.should == context
+      config.default_log_level.should == :warn
+    end
+  end
+
+  def write_config(path, config)
+    File.open(path, "w+") do |f|
+      f.write(YAML.dump({ "logging" => config }))
+    end
+  end
+end

data/spec/{core_ext_spec.rb → unit/core_ext_spec.rb}

@@ -8,8 +8,13 @@ end
 describe Class do
   describe "#logger" do
     it "should request a logger named after the class" do
-      Steno.should_receive(:logger).with("Foo::Bar")
+      expect do
+        Foo::Bar.logger
+      end.to raise_error(/undefined/)
+
+      require "steno/core_ext"
       x = Foo::Bar.logger
+      x.should_not be_nil
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steno
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15618460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15618460
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15617860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15617860
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15617180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15617180
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15616200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15616200
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15615780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,15 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15615780
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15615360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -101,12 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15615360
 description: A thread-safe logging library designed to support multiple log destinations.
 email:
 - mpage@rbcon.com
@@ -137,12 +107,13 @@ files:
 - lib/steno/sink/syslog.rb
 - lib/steno/tagged_logger.rb
 - lib/steno/version.rb
-- spec/core_ext_spec.rb
 - spec/spec_helper.rb
 - spec/support/barrier.rb
 - spec/support/null_sink.rb
 - spec/support/shared_context_specs.rb
+- spec/unit/config_spec.rb
 - spec/unit/context_spec.rb
+- spec/unit/core_ext_spec.rb
 - spec/unit/http_handler_spec.rb
 - spec/unit/io_sink_spec.rb
 - spec/unit/json_codec_spec.rb
@@ -173,17 +144,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A logging library.
 test_files:
-- spec/core_ext_spec.rb
 - spec/spec_helper.rb
 - spec/support/barrier.rb
 - spec/support/null_sink.rb
 - spec/support/shared_context_specs.rb
+- spec/unit/config_spec.rb
 - spec/unit/context_spec.rb
+- spec/unit/core_ext_spec.rb
 - spec/unit/http_handler_spec.rb
 - spec/unit/io_sink_spec.rb
 - spec/unit/json_codec_spec.rb