right_support 2.9.6 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784e365570d8832b9718214c099ad0f40020fa63
-  data.tar.gz: 427965d24c11d2823b1d508f5b22551b66a123c7
+  metadata.gz: 45713709a34db9049a788ea3bd6e371bc9cdcb2c
+  data.tar.gz: 9ae79e61f4b120b3bdc15c03da6df873d8bed016
 SHA512:
-  metadata.gz: 943ca36fe874bc93fcaf06e1857ce9b5f205aafa74997af1bd14c4695fc1cc514008b6b2289db63702c0b918bbf85d1724bf869b22654d1ebea6b80020a7e2a0
-  data.tar.gz: ea0023efde28f576eb66ecbc0d0cd0042d51902e175ab6f3c6fb8daef59792d15786a9b3eea5a7d7110384a4136f71f02a1f584aa4ce9e407140131edf750df0
+  metadata.gz: b4eef7bc6bc87bcd4c275935533be46b4f222291fce03e48a995595c952d0d8116cba0ce6fe1769ec660b3ec92536a112aa3008a40a4283c4f9a4ea4d9c2017a
+  data.tar.gz: 5074d0f87841daa8df2a59dfcf4f9ca0e724ee0c9cdc1748ebe07719b1fa7e513722e8bb24b92eb4aee3047c44d5fe45cf553bd5d3c24411ecd89ceb200ec84c

data/.travis.yml

@@ -3,11 +3,7 @@ cache: bundler
 branches:
   only:
     - master
-    - staging
-    - production
 rvm:
-  - 1.8
-  - 1.9
   - 2.0
   - 2.1
 script:

data/Gemfile.lock

@@ -47,7 +47,7 @@ GEM
       nokogiri (>= 1.5.10)
       rake
       rdoc
-    json (1.8.1)
+    json (1.8.3)
     jwt (0.1.11)
       multi_json (>= 1.5)
     linecache (0.46)
@@ -150,4 +150,4 @@ DEPENDENCIES
   uuidtools (~> 2.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/VERSION

@@ -1 +1 @@
-2.9.6
+2.10.1

data/lib/right_support/log.rb

@@ -35,3 +35,4 @@ require 'right_support/log/null_logger'
 require 'right_support/log/multiplexer'
 require 'right_support/log/exception_logger'
 require 'right_support/log/mixin'
+require 'right_support/log/step_level_logger'

data/lib/right_support/log/filter_logger.rb

@@ -67,6 +67,7 @@ module RightSupport::Log
     # See #info for more information.
     def debug(message = nil, &block)
       severity, message = filter(DEBUG, message_to_string(message))
+      return true if severity.nil?
       meth = SEVERITY_TO_METHOD[severity]
       raise ArgumentError, "Filter emitted unknown severity #{severity.inspect}" unless meth
       @actual_logger.__send__(meth, message, &block)
@@ -78,6 +79,7 @@ module RightSupport::Log
     # See #info for more information.
     def info(message = nil, &block)
       severity, message = filter(INFO, message_to_string(message))
+      return true if severity.nil?
       meth = SEVERITY_TO_METHOD[severity]
       raise ArgumentError, "Filter emitted unknown severity #{severity.inspect}" unless meth
       @actual_logger.__send__(meth, message, &block)
@@ -89,6 +91,7 @@ module RightSupport::Log
     # See #info for more information.
     def warn(message = nil, &block)
       severity, message = filter(WARN, message_to_string(message))
+      return true if severity.nil?
       meth = SEVERITY_TO_METHOD[severity]
       raise ArgumentError, "Filter emitted unknown severity #{severity.inspect}" unless meth
       @actual_logger.__send__(meth, message, &block)
@@ -100,6 +103,7 @@ module RightSupport::Log
     # See #info for more information.
     def error(message = nil, &block)
       severity, message = filter(ERROR, message_to_string(message))
+      return if severity.nil?
       meth = SEVERITY_TO_METHOD[severity]
       raise ArgumentError, "Filter emitted unknown severity #{severity.inspect}" unless meth
       @actual_logger.__send__(meth, message, &block)
@@ -111,6 +115,7 @@ module RightSupport::Log
     # See #info for more information.
     def fatal(message = nil, &block)
       severity, message = filter(FATAL, message_to_string(message))
+      return true if severity.nil?
       meth = SEVERITY_TO_METHOD[severity]
       raise ArgumentError, "Filter emitted unknown severity #{severity.inspect}" unless meth
       @actual_logger.__send__(meth, message, &block)
@@ -144,6 +149,7 @@ module RightSupport::Log
       end
 
       severity, message = filter(severity, message_to_string(message))
+      return true if severity.nil?
       return @actual_logger.add(severity, message) if message
     end
 
@@ -185,14 +191,15 @@ module RightSupport::Log
     protected
 
     # Filter a log line, transforming its severity and/or message before it is
-    # passed to the underlying logger.
+    # passed to the underlying logger. Overridable.
     #
     # === Parameters
     # severity(Integer):: one of the severity constants defined by Logger
     # message(String):: the log message
     #
     # === Return
-    # Returns a pair consisting of the filtered [severity, message].
+    # Returns a pair consisting of the filtered [severity, message] or nil to
+    #  indicate that the message has been filtered out
     def filter(severity, message)
       return [severity, message]
     end

data/lib/right_support/log/step_level_logger.rb

@@ -0,0 +1,58 @@
+#
+# Copyright (c) 2016 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# 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 RightSupport::Log
+  # a decorator that provides a step-level filter such that it can decorate a
+  # logger of more detailed level while allowing only messages of a less
+  # detailed level. for example, a logger can be associated with a database and
+  # omit debug-level messages from the db driver while allowing any errors,
+  # warnings, etc. to pass through to the web application logger. this allows
+  # for a unified log with specific level filtering for specific use cases.
+  #
+  # setting log level on this kind of logger does not set the level of the
+  # underlying logger (hence the name step-level).
+  class StepLevelLogger < FilterLogger
+    # declare accessor to prevent setting decorated logger level
+    attr_accessor :level
+
+    def initialize(*args)
+      super
+      @level = ::Logger::DEBUG
+    end
+
+    protected
+
+    # Uses step-level to filter messages before invoking decorated logger.
+    #
+    # === Parameters
+    # severity(Integer):: one of the severity constants defined by Logger
+    # message(String):: the log message
+    #
+    # === Return
+    # Returns a pair consisting of the filtered [severity, message] or nil to
+    #  indicate that the message has been filtered out
+    def filter(severity, message)
+      return nil if severity < level
+      super
+    end
+  end
+end

data/right_support.gemspec

@@ -2,20 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: right_support 2.9.6 ruby lib
+# stub: right_support 2.10.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.9.6"
+  s.version = "2.10.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2016-04-22"
+  s.date = "2016-06-01"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
-    "CHANGELOG.rdoc",
     "LICENSE",
     "README.md"
   ]
@@ -150,7 +149,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "https://github.com/rightscale/right_support"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.5"
+  s.rubygems_version = "2.2.5"
   s.summary = "Reusable foundation code."
 
   if s.respond_to? :specification_version then

data/spec/log/step_level_logger_spec.rb

@@ -0,0 +1,49 @@
+require ::File.expand_path('../../spec_helper', __FILE__)
+require 'stringio'
+
+describe RightSupport::Log::StepLevelLogger do
+  context 'with a decorated logger' do
+    let(:buffer) { ::StringIO.new }
+
+    let(:decorated_logger) { ::Logger.new(buffer) }
+
+    def try_all_levels(l)
+      l.debug('debug')
+      l.info('info')
+      l.warn('warn')
+      l.error('error')
+      l.fatal('fatal')
+    end
+
+    context 'with default level' do
+      subject { described_class.new(decorated_logger) }
+
+      it 'passes all messages' do
+        try_all_levels(subject)
+        buffer.string.should =~ /debug.+info.+warn.+error.+fatal/m
+      end
+    end
+
+    context 'with error level' do
+      subject do
+        s = described_class.new(decorated_logger)
+        s.level = ::Logger::ERROR
+        s
+      end
+
+      it 'passes error and fatal messages' do
+        try_all_levels(subject)
+        buffer.string.should_not =~ /debug/
+        buffer.string.should_not =~ /info/
+        buffer.string.should_not =~ /warn/
+        buffer.string.should =~ /error.+fatal/m
+      end
+
+      it 'does not change level of decorated logger' do
+        try_all_levels(decorated_logger)
+        buffer.string.should =~ /debug.+info.+warn.+error.+fatal/m
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_support
 version: !ruby/object:Gem::Version
-  version: 2.9.6
+  version: 2.10.1
 platform: ruby
 authors:
 - Tony Spataro
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -90,7 +90,6 @@ email: support@rightscale.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- CHANGELOG.rdoc
 - LICENSE
 - README.md
 files:
@@ -145,6 +144,7 @@ files:
 - lib/right_support/log/mixin.rb
 - lib/right_support/log/multiplexer.rb
 - lib/right_support/log/null_logger.rb
+- lib/right_support/log/step_level_logger.rb
 - lib/right_support/log/syslog/remote.rb
 - lib/right_support/log/system_logger.rb
 - lib/right_support/net.rb
@@ -197,6 +197,7 @@ files:
 - spec/log/mixin_spec.rb
 - spec/log/multiplexer_spec.rb
 - spec/log/null_logger_spec.rb
+- spec/log/step_level_logger_spec.rb
 - spec/log/system_logger_spec.rb
 - spec/net/address_helper_spec.rb
 - spec/net/balancing/health_check_spec.rb
@@ -241,9 +242,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Reusable foundation code.
 test_files: []
-has_rdoc: