yell-adapters-syslog 0.4.1 → 0.6.0

data/README.md

@@ -1,9 +1,13 @@
-Yell Adapters Syslog - Syslog Adapter for Your Extensible Logging Library
+Syslog Adapter for Yell - Your Extensible Logging Library
 
 If you are not yet familiar with **Yell - Your Extensible Logging Library** 
 check out the githup project under https://github.com/rudionrails/yell or jump 
 directly into the Yell wiki at https://github.com/rudionrails/yell/wiki.
 
+[![Build Status](https://secure.travis-ci.org/rudionrails/yell-adapters-syslog.png?branch=master)](http://travis-ci.org/rudionrails/yell-adapters-syslog)
+
+The Syslog adapter for Yell works and is tested with ruby 1.8.7, 1.9.x, jruby 1.8 and 1.9 mode, rubinius 1.8 and 1.9 as well as ree.
+
 ## Installation
 
 System wide:

data/lib/yell/adapters/syslog/version.rb

@@ -4,7 +4,7 @@ module Yell #:nodoc:
   module Adapters #:nodoc:
 
     class Syslog
-      VERSION = "0.4.1"
+      VERSION = "0.6.0"
 
     end
   end

data/lib/yell/adapters/syslog.rb

@@ -56,29 +56,47 @@ module Yell #:nodoc:
         :local7   => ::Syslog::LOG_LOCAL7
       }
 
-      def initialize( options = {}, &block )
-        ident options[:ident] || $0
-        options options[:options] || [:pid, :cons]
-        facility options[:facility]
-
-        super( options, &block )
+      setup do |options|
+        self.ident    = options[:ident] || $0
+        self.options  = options[:options] || [:pid, :cons]
+        self.facility = options[:facility]
       end
 
-      def stream
-        @stream ||= _new_stream
+      write do |event|
+        stream.log( SeverityMap[event.level], clean(event.message) )
       end
 
-      def close
-        @stream.close if @stream.respond_to? :close
-      rescue
-        # do nothing
-      ensure
-        @stream = nil
+      close do
+        begin
+          @stream.close if @stream.respond_to? :close
+        rescue Exception
+          # do nothing
+        ensure
+          @stream = nil
+        end
       end
 
-      # Identify the calling program
+
+      # Access the Syslog ident
+      attr_accessor :ident
+
+      # Access the Syslog options
+      attr_reader :options
+
+      # Access the Syslog facility
+      attr_reader :facility
+
+
+      # Deprecated: use :ident= in future
       def ident( val = nil )
-        @ident = val
+        if val.nil?
+          @ident
+        else
+          # deprecate, but should still work
+          Yell._deprecate( "0.6.0", "Use :ident= for setting the Syslog ident" )
+
+          self.ident = val
+        end
       end
 
       # Set the log facility for Syslog
@@ -86,48 +104,69 @@ module Yell #:nodoc:
       # See {Yell::Adapters::Syslog::OptionMap OptionMap} for allowed values.
       #
       # @example Direct or Symbol
-      #   facility( Syslog::LOG_NDELAY )
-      #   facility( :ndelay )
+      #   options = Syslog::LOG_CONS
+      #   options = :cons
       #
       # @example Multiple
-      #   facility( :ndelay, Syslog::LOG_NDELAY ):
-      def options( *values )
-        @syslog_options = values.flatten.map do |v|
+      #   options = [:ndelay, Syslog::LOG_NDELAY]
+      def options=( *values )
+        @options = values.flatten.map do |v|
           v.is_a?(Symbol) ? OptionMap[v] : v
         end.inject { |a, b| a | b }
       end
 
+      # Deprecated: use options= in future
+      def options( *values )
+        if values.empty?
+          @options
+        else
+          # deprecate, but should still work
+          Yell._deprecate( "0.6.0", "Use :options= for setting the Syslog options" )
+
+          self.options = values
+        end
+      end
+
+
       # Set the log facility for Syslog
       #
       # See {Yell::Adapters::Syslog::FacilityMap FacilityMap} for allowed values.
+      #
       # @example Direct or Symbol
-      #  facility( :user  )
-      #  facility( Syslog::LOG_CONSOLE )
+      #  facility = :user
+      #  facility = Syslog::LOG_CONSOLE
       #
       # @example Multiple
-      #   facility( :user, Syslog::LOG_CONSOLE )
-      def facility( *values )
+      #   facility = [:user, Syslog::LOG_CONSOLE]
+      def facility=( *values )
         @facility = values.flatten.map do |v|
           v.is_a?(Symbol) ? FacilityMap[v] : v
         end.inject { |a, b| a | b }
       end
 
+      # Deprecated, use facility= in future
+      def facility( *values )
+        if values.empty?
+          @facility
+        else
+          # deprecate, but should still work
+          Yell._deprecate( "0.6.0", "Use :facility= for setting the Syslog facility" )
+
+          self.facility = values
+        end
+      end
 
-      private
 
-      def write!( event )
-        stream.log( SeverityMap[event.level], clean(event.message) )
-      rescue Exception => e
-        close
+      private
 
-        # re-raise the exception
-        raise( e )
+      def stream
+        @stream ||= _new_stream
       end
 
       def _new_stream
         return ::Syslog if ::Syslog.opened?
 
-        ::Syslog.open( @ident, @syslog_options, @facility )
+        ::Syslog.open( @ident, @options, @facility )
       end
 
       # Borrowed from [SyslogLogger](https://github.com/seattlerb/sysloglogger)

data/lib/yell-adapters-syslog.rb

@@ -21,13 +21,10 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+module Yell #:nodoc:
+end
 
 require 'syslog'
-
 require 'yell'
 
 require File.dirname(__FILE__) + '/yell/adapters/syslog'
-
-module Yell #:nodoc:
-end
-

data/spec/yell/adapters/syslog_spec.rb

@@ -25,9 +25,9 @@ describe Yell::Adapters::Syslog do
   context "a new Yell::Adapters::Syslog instance" do
     subject { Yell::Adapters::Syslog.new }
 
-    it { subject.instance_variable_get(:@ident).should == $0 }
-    it { subject.instance_variable_get(:@syslog_options).should == (Syslog::LOG_PID | Syslog::LOG_CONS) }
-    it { subject.instance_variable_get(:@facility).should be_nil }
+    it { subject.ident.should == $0 }
+    it { subject.options.should == (Syslog::LOG_PID | Syslog::LOG_CONS) }
+    it { subject.facility.should be_nil }
   end
 
   context "OptionMap" do
@@ -75,7 +75,7 @@ describe Yell::Adapters::Syslog do
     it "should be passed" do
       mock.proxy( Syslog ).open( "my ident", anything, anything )
 
-      subject.ident "my ident"
+      subject.ident = "my ident"
       subject.write Yell::Event.new("INFO", "Hello World")
     end
   end
@@ -86,14 +86,14 @@ describe Yell::Adapters::Syslog do
     it "should be passed" do
       mock.proxy( Syslog ).open( anything, Syslog::LOG_NDELAY, anything )
 
-      subject.options :ndelay
+      subject.options = :ndelay
       subject.write Yell::Event.new("INFO", "Hello World")
     end
 
     it "should work with multiple params" do
       mock.proxy( Syslog ).open( anything, Syslog::LOG_PID|Syslog::LOG_NDELAY, anything )
 
-      subject.options :pid, :ndelay
+      subject.options = [:pid, :ndelay]
       subject.write Yell::Event.new("INFO", "Hello World")
     end
   end
@@ -104,14 +104,14 @@ describe Yell::Adapters::Syslog do
     it "should be passed" do
       mock.proxy( Syslog ).open( anything, anything, Syslog::LOG_USER )
 
-      subject.facility :user
+      subject.facility = :user
       subject.write Yell::Event.new("INFO", "Hello World")
     end
 
     it "should work with multiple params" do
       mock.proxy( Syslog ).open( anything, anything, Syslog::LOG_DAEMON|Syslog::LOG_USER )
 
-      subject.facility :daemon, :user
+      subject.facility = [:daemon, :user]
       subject.write Yell::Event.new("INFO", "Hello World")
     end
   end

data/yell-adapters-syslog.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "yell", "~> 0.4"
+  s.add_runtime_dependency "yell", "~> 0.6"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rr"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yell-adapters-syslog
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-01 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
-  requirement: &70313191826040 !ruby/object:Gem::Requirement
+  requirement: &6751140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *70313191826040
+  version_requirements: *6751140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70313191825640 !ruby/object:Gem::Requirement
+  requirement: &6750600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313191825640
+  version_requirements: *6750600
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70313191825180 !ruby/object:Gem::Requirement
+  requirement: &7067360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70313191825180
+  version_requirements: *7067360
 description: Syslog adapter for Yell
 email: 
 executables: []
@@ -82,11 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: yell
-rubygems_version: 1.8.17
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Yell - Your Extensible Logging Library
-test_files:
-- spec/spec_helper.rb
-- spec/yell/adapters/syslog_spec.rb
-has_rdoc: 
+test_files: []