scrolls 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba03f5638d03ddccf7fd077ba99b2f2c721b388
-  data.tar.gz: 7117b4c5893d4f2078a722bad7deeebda0abf45c
+  metadata.gz: 99c754c2a68b431572505ef7952e6be9c75fcd75
+  data.tar.gz: 36c1c30b50e7782370bb52ae8dda662776e3788c
 SHA512:
-  metadata.gz: 163aff47717815aaa7e5c45fa896b18b6c3a7a084be9dfd98829b86f22d35cb230b7695ccccabeaf0834fbd1c84fdebdeb3fc6f2bf534d0c5f474917c4429575
-  data.tar.gz: 7ae04fc36a20cc209015fecc560b5308ae8a06cd94261bb8bc14417ef0ccb4174e08b9f3e7e45695faae057be978cbf60db4f0f8ef736ed0e42abbc05feef36d
+  metadata.gz: f2b0754716f62af7b741473ad61167c8f9517f5c71e6b5a2968a2e2dfa3cca5cdd399d855ba1e993c35fe423458cc7d883293ea6b67c0b0647b995fb1660710d
+  data.tar.gz: 5320c43a79599e2e0c48de9e2c465a12b43f61bbfb57552205a36e6a3959382735a31322d3b2b69e8682df3f81a4f1e8196ec1162697252f60210962ee9ed398

data/lib/scrolls/log.rb

@@ -1,7 +1,6 @@
 require "scrolls/parser"
 require "scrolls/utils"
 require "scrolls/syslog"
-require "time"
 
 module Scrolls
 
@@ -48,6 +47,9 @@ module Scrolls
 
     def facility=(f)
       @facility = LOG_FACILITY_MAP[f] if f
+      if Scrolls::SyslogLogger.opened?
+        Scrolls::SyslogLogger.new(progname, facility)
+      end
     end
 
     def facility
@@ -57,7 +59,6 @@ module Scrolls
     def stream=(out=nil)
       @defined = out.nil? ? false : true
       if out == 'syslog'
-        progname = File.basename($0)
         @stream = Scrolls::SyslogLogger.new(progname, facility)
       else
         @stream = sync_stream(out)
@@ -225,6 +226,10 @@ module Scrolls
       end
     end
 
+    def progname
+      File.basename($0)
+    end
+
     def default_log_facility
       LOG_FACILITY
     end

data/lib/scrolls/parser.rb

@@ -1,3 +1,5 @@
+require 'time'
+
 module Scrolls
   module Parser
     extend self
@@ -13,7 +15,7 @@ module Scrolls
         elsif v.nil?
           "#{k}=nil"
         elsif v.is_a?(Time)
-          "#{k}=#{v.strftime("%FT%H:%M:%S%z")}"
+          "#{k}=#{v.iso8601}"
         else
           v = v.to_s
           has_single_quote = v.index("'")
@@ -58,6 +60,11 @@ module Scrolls
             v = false
           elsif v == "true"
             v = true
+          else
+            begin
+              v = Time.iso8601(v)
+            rescue ArgumentError
+            end
           end
 
           vals[match[0]] = v

data/lib/scrolls/syslog.rb

@@ -28,15 +28,19 @@ module Scrolls
   class SyslogLogger
     def initialize(ident = 'scrolls', facility = Syslog::LOG_USER)
       options = Syslog::LOG_PID|Syslog::LOG_CONS
-      begin
-        @syslog = Syslog.open(ident, options, facility)
-      rescue RuntimeError
+      if Syslog.opened?
         @syslog = Syslog.reopen(ident, options, facility)
+      else
+        @syslog = Syslog.open(ident, options, facility)
       end
     end
 
     def puts(data)
       @syslog.log(Syslog::LOG_INFO, "%s", data)
     end
+
+    def self.opened?
+      Syslog.opened?
+    end
   end
 end

data/lib/scrolls/version.rb

@@ -1,3 +1,3 @@
 module Scrolls
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/scrolls.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Logging, easier, more consistent.}
   gem.summary       = %q{When do we log? All the time.}
   gem.homepage      = "https://github.com/asenchi/scrolls"
-
+  gem.license       = 'MIT'
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/test/test_parser.rb

@@ -47,25 +47,27 @@ class TestScrollsParser < Test::Unit::TestCase
     assert_equal data.inspect, parse(unparse(data)).inspect
   end
 
-  def test_parse_constants
+  def test_unparse_constants
     data = { s1: :symbol, s2: Scrolls }
     assert_equal "s1=symbol s2=Scrolls", unparse(data)
   end
 
-  def test_parse_epoch_time
-    v = 1340118155
-    data = { t: Time.at(v) }
-    assert_equal "t=#{Time.at(v).strftime("%FT%H:%M:%S%z")}", unparse(data)
+  def test_unparse_nil
+    data = { n: nil }
+    assert_equal "n=nil", unparse(data)
   end
 
-  def test_parse_time_object
-    now = Time.now
-    data = { t: now }
-    assert_equal "t=#{now.strftime("%FT%H:%M:%S%z")}", unparse(data)
+  def test_unparse_time
+    time = Time.new(2012, 06, 19, 16, 02, 35, "+01:00")
+    data = { t: time }
+    assert_equal "t=2012-06-19T16:02:35+01:00", unparse(data)
   end
 
-  def test_parse_nil
-    data = { n: nil }
-    assert_equal "n=nil", unparse(data)
+  def test_parse_time
+    time = Time.new(2012, 06, 19, 16, 02, 35, "+01:00")
+    string = "t=2012-06-19T16:02:35+01:00"
+    data = parse(string)
+    assert_equal time, data[:t]
   end
+
 end

data/test/test_scrolls.rb

@@ -148,6 +148,12 @@ class TestScrolls < Test::Unit::TestCase
     assert_equal Syslog::LOG_LOCAL7, Scrolls.facility
   end
 
+  def test_setting_syslog_facility_after_instantiation
+    Scrolls.stream = 'syslog'
+    Scrolls.facility = 'local7'
+    assert_match /facility=184/, Scrolls.stream.inspect
+  end
+
   def test_add_timestamp
     Scrolls.add_timestamp = true
     Scrolls.log(:test => "foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrolls
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Curt Micol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-14 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies: []
 description: Logging, easier, more consistent.
 email:
@@ -18,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -36,7 +35,8 @@ files:
 - test/test_parser.rb
 - test/test_scrolls.rb
 homepage: https://github.com/asenchi/scrolls
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-
-matrix:
-  allow_failures:
-      - rvm: rbx
-
-  rvm:
-      - 1.8.7
-      - 1.9.2
-      - 1.9.3
-      - jruby
-      - rbx
-      - ree