termite 0.0.10 → 0.0.20

data/test/stderr_log_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "test_helper.rb")
 
-class EcologyLogTest < Scope::TestCase
+class StderrLogTest < Scope::TestCase
   context "with a custom ecology" do
     setup do
       Ecology.reset
@@ -10,7 +10,8 @@ class EcologyLogTest < Scope::TestCase
   "application": "MyApp",
   "logging": {
     "stdout_level": "warn",
-    "stderr_level": "fatal"
+    "stderr_level": "fatal",
+    "stdout_color": "green"
   }
 }
 ECOLOGY_CONTENTS
@@ -18,17 +19,21 @@ ECOLOGY_CONTENTS
 
     context "with a default termite logger" do
       setup do
+        @stdout_logger = mock("STDOUT logger")
+        ::Logger.expects(:new).with(STDOUT).returns(@stdout_logger)
+        @stderr_logger = mock("STDERR logger")
+        ::Logger.expects(:new).with(STDERR).returns(@stderr_logger)
         @logger = Termite::Logger.new
       end
 
-      should "log fatal errors to STDERR" do
-        expect_console_add(STDERR, 2, 'oh no!', :application => "MyApp", :method => :puts, :extra_args => [])
+      should "log fatal errors to STDERR with default color" do
+        @stderr_logger.expects(:<<).with("oh no!\n".color(:red))
         STDOUT.expects(:puts).never
         @logger.fatal("oh no!")
       end
 
-      should "log warnings to STDOUT" do
-        expect_console_add(STDOUT, 4, 'oh no!', :application => "MyApp", :method => :puts, :extra_args => [])
+      should "log warnings to STDOUT with overridden color" do
+        @stdout_logger.expects(:<<).with("oh no!\n".color(:green))
         STDERR.expects(:puts).never
         @logger.warn("oh no!")
       end

data/test/termite_logger_test.rb

@@ -8,7 +8,11 @@ class TermiteLoggerTest < Scope::TestCase
 
       set_up_ecology <<ECOLOGY_TEXT
 {
-  "application": "foo_app"
+  "application": "foo_app",
+  "logging":
+    {
+      "default_component": "whatcomponent"
+    }
 }
 ECOLOGY_TEXT
     end
@@ -20,47 +24,47 @@ ECOLOGY_TEXT
       end
 
       should "correctly send logs to Syslog" do
-        expect_add(@logger.socket, 2, "foo! {}")
+        expect_add(2, "foo! {}")
         @logger.add(Logger::FATAL, "foo!", {})
       end
 
       should "correctly alias log to add" do
-        expect_add(@logger.socket, 2, "foo! {}")
+        expect_add(2, "foo! {}")
         @logger.log(Logger::FATAL, "foo!", {})
       end
 
       should "treat << as add-with-info" do
-        expect_add(@logger.socket, 6, "foo! {}")
+        expect_add(6, "foo! {}")
         @logger << "foo!"
       end
 
       should "correctly send an alert to Syslog" do
-        expect_add(@logger.socket, 1, "foo! {}")
+        expect_add(1, "foo! {}")
         @logger.add(Logger::UNKNOWN, "foo!", {})
       end
 
       should "correctly send a critical event to Syslog" do
-        expect_add(@logger.socket, 2, "foo! {}")
+        expect_add(2, "foo! {}")
         @logger.fatal("foo!")
       end
 
       should "correctly send an error event to Syslog" do
-        expect_add(@logger.socket, 3, "foo! {}")
+        expect_add(3, "foo! {}")
         @logger.error("foo!")
       end
 
       should "correctly send a warning event to Syslog" do
-        expect_add(@logger.socket, 4, "foo! {}")
+        expect_add(4, "foo! {}")
         @logger.warn("foo!")
       end
 
       should "correctly send an info event to Syslog" do
-        expect_add(@logger.socket, 6, "foo! {}")
+        expect_add(6, "foo! {}")
         @logger.info("foo!")
       end
 
       should "correctly send a debug event to Syslog" do
-        expect_add(@logger.socket, 7, "foo! {}")
+        expect_add(7, "foo! {}")
         @logger.debug("foo!")
       end
     end
@@ -70,14 +74,19 @@ ECOLOGY_TEXT
         @logger = Termite::Logger.new("/tmp/test_log_output.txt")  # Test with output file
       end
 
-      should "allow overriding application name" do
-        expect_add(@logger.socket, 2, "foo! {}", :application => "bar_app")
+      should "override application name from ecology" do
+        expect_add(2, "foo! {}", :application => "bar_app:whatcomponent")
         @logger.fatal("foo!", {}, :application => "bar_app")
       end
 
-      should "allow setting a component" do
-        expect_add(@logger.socket, 2, "foo! {}", :application => "foo_app:whatcomponent")
-        @logger.fatal("foo!", {}, :component => "whatcomponent")
+      should "override component from ecology" do
+        expect_add(2, "foo! {}", :application => "foo_app:thatcomponent")
+        @logger.fatal("foo!", {}, :component => "thatcomponent")
+      end
+
+      should "override application and component from ecology" do
+        expect_add(2, "foo! {}", :application => "bar_app:thatcomponent")
+        @logger.fatal("foo!", {}, :application => "bar_app", :component => "thatcomponent")
       end
     end
 

data/test/termite_subclass_test.rb

@@ -21,7 +21,7 @@ ECOLOGY_TEXT
       end
 
       should "correctly send logs to Syslog" do
-        @logger.socket.expects(:send)
+        expect_add(2, "foo! {}", :application => "foo_app")
         @logger.add(Logger::FATAL, "foo!", {})
       end
     end

data/test/test_helper.rb

@@ -7,13 +7,10 @@ require "minitest/autorun"
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
 
 require "termite"
+require "ecology/test_methods"
 
 class Scope::TestCase
-  def set_up_ecology(file_contents, filename = "some.ecology")
-    ENV["ECOLOGY_SPEC"] = filename
-    File.expects(:exist?).with(filename).returns(true)
-    File.expects(:read).with(filename).returns(file_contents)
-  end
+  include Ecology::Test
 
   def initialize_environment
     unless @initialized_test_env
@@ -28,12 +25,20 @@ class Scope::TestCase
 
   # This adds the Mocha expectation for this call.  Technically it also
   # returns the expectation, so you could modify it later if you wanted.
-  def expect_add(socket, severity_num, message, options = {})
+  def expect_add(severity_num, message, options = {})
     initialize_environment
 
-    app = options[:application] || "foo_app"
-    string = "<#{Syslog::LOG_LOCAL6 + severity_num}>Sep  7 15:09:20 samplehost #{app} [1234]: [main] #{message}"
+    app = options[:application] || "foo_app:whatcomponent"
+    syslog_mock = mock("Syslog connection")
+    Syslog.expects(:open).with(app, Syslog::LOG_PID | Syslog::LOG_CONS).yields(syslog_mock)
 
+    syslog_mock.expects(Termite::Logger::SYSLOG_SEVERITY_MAP.invert[severity_num]).with(message)
+  end
+
+  def expect_udp(socket, severity_num, message, options = {})
+    initialize_environment
+    app = options[:application] || "foo_app:whatcomponent"
+    string = "<#{Syslog::LOG_LOCAL6 + severity_num}>Sep  7 15:09:20 samplehost #{app} [1234]: [main] #{message}"
     options[:method] ||= :send
     options[:extra_args] ||= [0, "0.0.0.0", 514]
     socket.expects(options[:method]).with(string, *options[:extra_args])
@@ -46,6 +51,6 @@ class Scope::TestCase
 
     options[:method] ||= :send
     options[:extra_args] ||= [0, "0.0.0.0", 514]
-    socket.expects(options[:method]).with(message, *options[:extra_args])
+    socket.expects(:<<).with(message + "\n", *options[:extra_args])
   end
 end

metadata

@@ -1,99 +1,144 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: termite
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.20
   prerelease: 
-  version: 0.0.10
 platform: ruby
-authors: 
+authors:
 - Noah Gibbs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ecology
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ecology
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.0.10
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: scope
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
+  name: scope
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: |
-  Termite wraps syslog with a format for extra data, and for
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! 'Termite wraps syslog with a format for extra data, and for
+
   what you wish it would send automatically.
 
-email: 
+'
+email:
 - noah@ooyala.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
-- Gemfile.lock
+- lib/termite/hastur_logger.rb
+- lib/termite/syslog_logger.rb
 - lib/termite/version.rb
+- lib/termite/version.rb~
 - lib/termite.rb
 - LICENSE
 - Rakefile
@@ -101,8 +146,11 @@ files:
 - termite.gemspec
 - test/ecology_log_test.rb
 - test/extra_logger_test.rb
+- test/hastur_logger_test.rb
+- test/level_test.rb
 - test/log_locally.rb
 - test/rescue_test.rb
+- test/sinks_test.rb
 - test/stderr_log_test.rb
 - test/termite_logger_test.rb
 - test/termite_subclass_test.rb
@@ -111,37 +159,38 @@ files:
 - .gitignore
 homepage: http://www.ooyala.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: termite
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby logging based on Syslog
-test_files: 
+test_files:
 - test/ecology_log_test.rb
 - test/extra_logger_test.rb
+- test/hastur_logger_test.rb
+- test/level_test.rb
 - test/log_locally.rb
 - test/rescue_test.rb
+- test/sinks_test.rb
 - test/stderr_log_test.rb
 - test/termite_logger_test.rb
 - test/termite_subclass_test.rb
 - test/test_helper.rb
+has_rdoc: