qb 0.3.24 → 0.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca30bc6181a0452746aeb8fa262a1fe8e5b0537
-  data.tar.gz: 6a94b47657b966b02c9b0de3dbb6acbfe4a33c65
+  metadata.gz: e003d57b3df40cfe17e1d4200423a7dec88583cf
+  data.tar.gz: 96bedb7ba58a2f2278f18dde6ead2c34533d105c
 SHA512:
-  metadata.gz: 80c25333f1c2c26f865bf7ef6879b5dfbd10f203ca1f4df1f37c08a8f5fb26627581e4bb408e94d1e1b99f5b7168f5f73e53cfbba8295fae1b6be9ed6da167f3
-  data.tar.gz: ff848dc6e1f90c134d518f810f30dab66526c811890692fdc84941c88a3248cae042c6fdfe582732fa26318021c32d3e112d94bf4f411eafc0030052133ebe0b
+  metadata.gz: d0211a56f9a20f60664bf169120b771283735b4eb9c68b6a2c26886b9d880cf0548720c3a09150748a1e06ec56e87ea926c44845d35d7207fe774df105e4fd99
+  data.tar.gz: fc2fba112a5e43f3cdd41b7d8686d4a8e7d51070fd6a82838d6f4dae038594c6718a9f1bb63ecf3078bc82e2ef7959e96ecb1b494a5c6b6ed5afc6c78ae30e5f

data/VERSION

@@ -1 +1 @@
-0.3.24
+0.3.25

data/exe/.qb_interop_receive

@@ -29,7 +29,7 @@ require 'qb'
 if ENV['QB_STDIO_ERR']
   $stderr = UNIXSocket.new ENV['QB_STDIO_ERR']
   
-  QB::Util::Logging.setup
+  NRSER::Logging.setup_for_cli! application: 'qb'
   
   QB.debug "Connected to QB stderr stream at #{ ENV['QB_STDIO_ERR'] } #{ $stderr.path }."
 end

data/exe/qb

@@ -37,10 +37,10 @@ using NRSER
 
 def main *args
   Thread.current.name = 'main'
-  logger = SemanticLogger['qb/exe/qb#main']
+  logger = NRSER::Logging['qb/exe/qb#main']
   
   QB::CLI.set_debug! args
-  QB::Util::Logging.setup sync: true, dest: $stderr
+  NRSER::Logging.setup_for_cli! application: 'qb'
   
   logger.debug args: args
   

data/lib/qb/util.rb

@@ -1,4 +1,3 @@
-require_relative './util/logging'
 require_relative './util/stdio'
 require_relative './util/interop'
 require_relative './util/bundler'

data/qb.gemspec

@@ -195,7 +195,7 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   # My guns
-  spec.add_dependency "nrser",            '< 0.3', '>= 0.2.0.pre.3'
+  spec.add_dependency "nrser",            '~> 0.2.0'
   
   # My favorite wrapper
   spec.add_dependency "cmds",             '~> 0.2.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qb
 version: !ruby/object:Gem::Version
-  version: 0.3.24
+  version: 0.3.25
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,22 +118,16 @@ dependencies:
   name: nrser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: cmds
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +303,6 @@ files:
 - lib/qb/util/bundler.rb
 - lib/qb/util/docker_mixin.rb
 - lib/qb/util/interop.rb
-- lib/qb/util/logging.rb
 - lib/qb/util/resource.rb
 - lib/qb/util/stdio.rb
 - lib/qb/version.rb

data/lib/qb/util/logging.rb

@@ -1,366 +0,0 @@
-# Requirements
-# =======================================================================
-
-# Stdlib
-# -----------------------------------------------------------------------
-require 'forwardable'
-
-# Deps
-# -----------------------------------------------------------------------
-require 'awesome_print'
-require 'semantic_logger'
-
-# Project / Package
-# -----------------------------------------------------------------------
-
-
-# Refinements
-# =======================================================================
-
-using NRSER
-using NRSER::Types
-
-
-# Declarations
-# =======================================================================
-
-module QB::Util; end
-
-
-# Definitions
-# =======================================================================
-
-# Utility methods to setup logging with [semantic_logger][].
-# 
-# [semantic_logger]: http://rocketjob.github.io/semantic_logger/
-# 
-module QB::Util::Logging
-  include SemanticLogger::Loggable
-  
-  
-  # @todo document Formatters module.
-  module Formatters
-    
-    # Custom tweaked color formatter (for CLI output).
-    # 
-    # -   Turns on multiline output in Awesome Print by default.
-    # 
-    class Color < SemanticLogger::Formatters::Color
-      
-      # Constants
-      # ======================================================================
-      
-      
-      # Class Methods
-      # ======================================================================
-      
-      
-      # Attributes
-      # ======================================================================
-      
-      
-      # Constructor
-      # ======================================================================
-      
-      # Instantiate a new `ColorFormatter`.
-      def initialize **options
-        super ap: { multiline: true },
-              color_map: SemanticLogger::Formatters::Color::ColorMap.new(
-                debug: SemanticLogger::AnsiColors::MAGENTA,
-                trace: "\e[1;30m", # "Dark Gray"
-              ),
-              **options
-      end # #initialize
-      
-      
-      # Instance Methods
-      # ======================================================================
-      
-      
-      # Upcase the log level.
-      # 
-      # @return [String]
-      # 
-      def level
-        "#{ color }#{ log.level.upcase }#{ color_map.clear }"
-      end
-      
-      
-      # Create the log entry text. Overridden to customize appearance -
-      # generally reduce amount of info and put payload on it's own line.
-      # 
-      # We need to replace *two* super functions, the first being
-      # [SemanticLogger::Formatters::Color#call][]:
-      # 
-      #     def call(log, logger)
-      #       self.color = color_map[log.level]
-      #       super(log, logger)
-      #     end
-      # 
-      # [SemanticLogger::Formatters::Color#call]: https://github.com/rocketjob/semantic_logger/blob/v4.2.0/lib/semantic_logger/formatters/color.rb#L98
-      # 
-      # which doesn't do all too much, and the next being it's super-method,
-      # [SemanticLogger::Formatters::Default#call][]:
-      #     
-      #     # Default text log format
-      #     #  Generates logs of the form:
-      #     #    2011-07-19 14:36:15.660235 D [1149:ScriptThreadProcess] Rails -- Hello World
-      #     def call(log, logger)
-      #       self.log    = log
-      #       self.logger = logger
-      #     
-      #       [time, level, process_info, tags, named_tags, duration, name, message, payload, exception].compact.join(' ')
-      #     end
-      # 
-      # [SemanticLogger::Formatters::Default#call]: https://github.com/rocketjob/semantic_logger/blob/v4.2.0/lib/semantic_logger/formatters/default.rb#L64
-      # 
-      # which does most the real assembly.
-      # 
-      # @param [SemanticLogger::Log] log
-      #   The log entry to format.
-      #   
-      #   See [SemanticLogger::Log](https://github.com/rocketjob/semantic_logger/blob/v4.2.0/lib/semantic_logger/log.rb)
-      # 
-      # @param [SemanticLogger::Logger] logger
-      #   The logger doing the logging (pretty sure, haven't checked).
-      #   
-      #   See [SemanticLogger::Logger](https://github.com/rocketjob/semantic_logger/blob/v4.2.0/lib/semantic_logger/logger.rb)
-      # 
-      # @return [String]
-      #   The full log string.
-      # 
-      def call log, logger
-        # SemanticLogger::Formatters::Color code
-        self.color = color_map[log.level]
-        
-        # SemanticLogger::Formatters::Default code
-        self.log    = log
-        self.logger = logger
-        
-        is_info = log.level == :info
-        
-        [
-          level,
-          tags,
-          named_tags,
-          duration,
-          (is_info ? nil : name),
-          message,
-          payload,
-          exception,
-        ].compact.join(' ')
-        
-      end # #call
-      
-      
-    end # class Color
-    
-  end # module Formatters
-  
-  
-  module Appender
-    # Replacement for {SemanticLogger::Appender::Async} that implements the
-    # same interface but just logs synchronously in the current thread.
-    # 
-    class Sync
-      extend Forwardable
-      
-      # The appender we forward to, which is a {SemanticLogger::Processor}
-      # in practice, since it wouldn't make any sense to wrap a regular
-      # appender in a Sync.
-      # 
-      # @return [SemanticLogger::Processor]
-      #     
-      attr_accessor :appender
-
-      # Forward methods that can be called directly
-      def_delegator :@appender, :name
-      def_delegator :@appender, :should_log?
-      def_delegator :@appender, :filter
-      def_delegator :@appender, :host
-      def_delegator :@appender, :application
-      def_delegator :@appender, :level
-      def_delegator :@appender, :level=
-      def_delegator :@appender, :logger
-      # Added for sync
-      def_delegator :@appender, :log
-      def_delegator :@appender, :on_log
-      def_delegator :@appender, :flush
-      def_delegator :@appender, :close
-      
-      class FakeQueue
-        def self.size
-          0
-        end
-      end
-
-      # Appender proxy to allow an existing appender to run asynchronously in a separate thread.
-      #
-      # Parameters:
-      #   name: [String]
-      #     Name to use for the log thread and the log name when logging any errors from this appender.
-      #
-      #   lag_threshold_s [Float]
-      #     Log a warning when a log message has been on the queue for longer than this period in seconds.
-      #     Default: 30
-      #
-      #   lag_check_interval: [Integer]
-      #     Number of messages to process before checking for slow logging.
-      #     Default: 1,000
-      def initialize(appender:,
-                     name: appender.class.name)
-
-        @appender           = appender
-      end
-      
-      # Needs to be there to support {SemanticLogger::Processor.queue_size},
-      # which gets the queue and returns it's size (which will always be zero
-      # for us).
-      # 
-      # We return {FakeQueue}, which only implements a `size` method that
-      # returns zero.
-      # 
-      # @return [#size]
-      # 
-      def queue; FakeQueue; end
-      
-      def lag_check_interval; -1; end
-      
-      def lag_check_interval= value
-        raise "Can't set `lag_check_interval` on Sync appender"
-      end
-      
-      def lag_threshold_s; -1; end
-      
-      def lag_threshold_s= value
-        raise "Can't set `lag_threshold_s` on Sync appender"
-      end
-      
-      # @return [false] Sync appender is of course not size-capped.
-      def capped?; false; end
-
-      # The {SemanticLogger::Appender::Async} worker thread is exposed via
-      # this method, which creates it if it doesn't exist and returns it, but
-      # it doesn't seem like the returned value is ever used; the method
-      # call is just invoked to start the thread.
-      # 
-      # Hence it seems to make most sense to just return `nil` since we don't
-      # have a thread, and figure out what to do if that causes errors (so far
-      # it seems fine).
-      #
-      # @return [nil]
-      # 
-      def thread; end
-      
-      # @return [true] Sync appender is always active
-      def active?; true; end
-
-    end # class Sync
-  end # module Appenders
-  
-  
-  # Module (Class) Methods
-  # =====================================================================
-  
-  
-  def self.level
-    SemanticLogger.default_level
-  end
-  
-  
-  def self.level= level
-    SemanticLogger.default_level = level
-  end
-  
-  
-  def self.setup?
-    !!@setup
-  end
-  
-  
-  def self.get_env_level
-    if ENV['QB_TRACE'].truthy?
-      return :trace
-    elsif ENV['QB_DEBUG'].truthy?
-      return :debug
-    elsif ENV['QB_LOG_LEVEL']
-      return ENV['QB_LOG_LEVEL'].to_sym
-    end
-    
-    nil
-  end
-  
-  
-  # Setup logging.
-  # 
-  # @param [type] arg_name
-  #   @todo Add name param description.
-  # 
-  # @return [return_type]
-  #   @todo Document return value.
-  # 
-  def self.setup level: nil, sync: false, dest: nil
-    if setup?
-      logger.warn "Logging is already setup!"
-      return false
-    end
-    
-    SemanticLogger.application = 'qb'
-    
-    level = get_env_level if level.nil?
-    self.level = level if level
-    self.appender = dest if dest
-    
-    if sync
-      # Hack up SemanticLogger to do sync logging in the main thread
-      
-      # Create a {Locd::Logging::Appender::Sync}, which implements the
-      # {SemanticLogger::Appender::Async} interface but just forwards directly
-      # to it's appender in the same thread, and point it where
-      # {SemanticLogger::Processor.instance} (which is an Async) points.
-      # 
-      sync_appender = Appender::Sync.new \
-        appender: SemanticLogger::Processor.instance.appender
-      
-      # Swap our sync in for the async
-      SemanticLogger::Processor.instance_variable_set \
-        :@processor,
-        sync_appender
-    end
-    
-    @setup = true
-    
-    true
-  end # .setup
-  
-  
-  def self.appender
-    @appender
-  end
-  
-  
-  def self.appender= value
-    # Save ref to current appender (if any) so we can remove it after adding
-    # the new one.
-    old_appender = @appender
-    
-    @appender = case value
-    when Hash
-      SemanticLogger.add_appender value
-    when String
-      SemanticLogger.add_appender file_name: value
-    else
-      SemanticLogger.add_appender \
-        io: value,
-        formatter: Formatters::Color.new
-    end
-    
-    # Remove the old appender (if there was one). This is done after adding
-    # the new one so that failing won't result with no appenders.
-    SemanticLogger.remove_appender( old_appender ) if old_appender
-    
-    @appender
-  end
-  
-  
-end # module QB::Util::Logging