bixby-common 0.3.8 → 0.3.9

data/Gemfile.lock

@@ -28,10 +28,12 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: dc2f30da10945323a3e8f377311b6df54f46ad4c
+  revision: ad59542db1fca57018dd771d19b1d636252e4c98
   specs:
-    test_guard (0.1.2)
+    test_guard (0.2.0)
       awesome_print
+      debugger
+      debugger-pry
       growl
       guard
       simplecov
@@ -42,61 +44,72 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
+    addressable (2.3.3)
     ansi (1.4.3)
     awesome_print (1.1.0)
-    bouncy-castle-java (1.5.0146.1)
-    coderay (1.0.8)
+    bouncy-castle-java (1.5.0147)
+    coderay (1.0.9)
     colorize (0.5.8)
+    columnize (0.3.6)
     crack (0.3.2)
     curb (0.8.3)
-    ffi (1.3.1)
-    ffi (1.3.1-java)
+    debugger (1.5.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-pry (0.1.1)
+      debugger (~> 1)
+      pry (>= 0.9.9)
+    debugger-ruby_core_source (1.2.0)
+    ffi (1.6.0)
+    ffi (1.6.0-java)
+    formatador (0.2.4)
     git (1.2.5)
     growl (1.0.3)
-    guard (1.6.2)
+    guard (1.7.0)
+      formatador (>= 0.2.4)
       listen (>= 0.6.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
-      terminal-table (>= 1.4.3)
       thor (>= 0.14.6)
     hirb (0.7.1)
-    httpclient (2.3.2)
-    jruby-openssl (0.8.2)
-      bouncy-castle-java (>= 1.5.0146.1)
+    httpclient (2.3.3)
+    jruby-openssl (0.8.7)
+      bouncy-castle-java (>= 1.5.0147)
     json (1.7.7)
     json (1.7.7-java)
-    listen (0.7.2)
+    listen (0.7.3)
     little-plugger (1.1.3)
     logging (1.8.1)
       little-plugger (>= 1.1.3)
       multi_json (>= 1.3.6)
-    lumberjack (1.0.2)
+    lumberjack (1.0.3)
     metaclass (0.0.1)
     method_source (0.8.1)
-    minitest (4.6.0)
-    mocha (0.13.2)
+    minitest (4.7.0)
+    mocha (0.13.3)
       metaclass (~> 0.0.1)
-    multi_json (1.5.1)
-    oj (2.0.4)
-    pry (0.9.11.4)
+    multi_json (1.7.2)
+    oj (2.0.10)
+    pry (0.9.12)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.11.4-java)
+    pry (0.9.12-java)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
       spoon (~> 0.0)
     rack (1.5.2)
-    rake (10.0.3)
+    rake (10.0.4)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
     rcov (1.0.0)
-    rdoc (3.12.1)
+    rdoc (4.0.1)
       json (~> 1.4)
     simplecov-console (0.1.1)
       colorize
@@ -105,17 +118,17 @@ GEM
     simplecov-html (0.7.1)
     single_test (0.5.2)
       rake (> 0.9)
-    slop (3.4.3)
-    spoon (0.0.1)
-    terminal-table (1.4.5)
+    slop (3.4.4)
+    spoon (0.0.3)
+      ffi
     test-unit (2.5.4)
-    thor (0.17.0)
+    thor (0.18.1)
     turn (0.9.6)
       ansi
-    webmock (1.9.0)
+    webmock (1.11.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
-    yard (0.8.4.1)
+      crack (>= 0.3.2)
+    yard (0.8.5.2)
 
 PLATFORMS
   java

data/VERSION

@@ -1 +1 @@
-0.3.8
+0.3.9

data/bixby-common.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "bixby-common"
-  s.version = "0.3.8"
+  s.version = "0.3.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-03-23"
+  s.date = "2013-04-06"
   s.description = "Bixby Common files/libs"
   s.email = "chetan@pixelcop.net"
   s.files = [

data/lib/bixby_common/command_spec.rb

@@ -39,7 +39,7 @@ class CommandSpec
       raise CommandNotFound.new("repo = #{@repo}; bundle = #{@bundle}; command = #{@command}")
     end
     if self.digest != expected_digest then
-      raise BundleNotFound, "digest does not match ('#{self.digest}' != '#{expected_digest}'", caller
+      raise BundleNotFound, "digest does not match ('#{self.digest}' != '#{expected_digest}')", caller
     end
     return true
   end

data/lib/bixby_common/util/log.rb

@@ -27,22 +27,35 @@ module Bixby
 
     # Setup logging
     #
-    # @param [Symbol] level       Log level to use (default = :warn)
-    # @param [String] pattern     Log pattern
-    def self.setup_logger(level=nil, pattern=nil)
+    # @param [Hash] opts                  Options for the rolling file appender
+    # @option opts [String] :filename     Filename to log to
+    # @option opts [Symbol] :level        Log level to use (default = :warn)
+    # @option opts [String] :pattern      Log pattern
+    def self.setup_logger(opts={})
+
       # set level: ENV flag overrides; default to warn
-      level = :debug if ENV["BIXBY_DEBUG"]
-      level ||= :warn
-
-      pattern ||= '%.1l, [%d] %5l -- %c: %m\n'
-
-      # TODO always use stdout for now
-      Logging.appenders.stdout(
-        :level  => level,
-        :layout => Logging.layouts.pattern(:pattern => pattern)
-        )
-      Logging::Logger.root.add_appenders(Logging.appenders.stdout)
-      Logging::Logger.root.level = level
+      opts[:level] = :debug if ENV["BIXBY_DEBUG"]
+      opts[:level] ||= :warn
+
+      pattern = opts.delete(:pattern) || '%.1l, [%d] %5l -- %c: %m\n'
+      layout = Logging.layouts.pattern(:pattern => pattern)
+
+      opts[:filename] ||= Bixby.path("var", "bixby-agent.log")
+      FileUtils.mkdir_p(File.dirname(opts[:filename]))
+
+      options = {
+        :keep          => 7,
+        :roll_by       => 'date',
+        :age           => 'daily',
+        :truncate      => false,
+        :auto_flushing => true,
+        :layout        => layout
+      }.merge(opts)
+
+      Logging.appenders.rolling_file("file", options)
+
+      Logging::Logger.root.add_appenders("file")
+      Logging::Logger.root.level = opts[:level]
     end
 
   end # Log

data/test/util/log_test.rb

@@ -16,7 +16,7 @@ class TestLog < MiniTest::Unit::TestCase
     assert_equal 2, Logging::Logger.root.level # warn
 
     ENV.delete("BIXBY_DEBUG")
-    Bixby::Log.setup_logger(:info)
+    Bixby::Log.setup_logger(:level => :info)
     assert_equal 1, Logging::Logger.root.level # info
   end
 

metadata

@@ -2,14 +2,14 @@
 name: bixby-common
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -430,7 +430,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      hash: -31160847080355140
+      hash: -739099892354726925
       segments:
       - 0
       version: '0'