locd 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 630061e7d172448491a1da49c70cfac510519d26
-  data.tar.gz: 417ac04a01d1bc9e6e888f3e8a1e847407d7b017
+  metadata.gz: 9c5204f4e2f4bcd01e4af0c6532c1505b117cadd
+  data.tar.gz: 7268adf8c6b457a0ea347fede69c923202baba32
 SHA512:
-  metadata.gz: f3bf11b09b944869c254175fd90984f54959596c9506220d9a79ec49fe6a4ee7d7beb355bff2773b6db552d7bec74f69d3e1c3fb7a313550790ff3334384f72e
-  data.tar.gz: 5c03efd66d67973b72a2608ee21c695b2e9aa473c7f9659c713da8a13736799e8941406a2c4d5b2f24ddcfff56915badb785c5ef7c949c580c728d3b49e3d5e5
+  metadata.gz: e6d3f99a7a47678345bdfd2785c56e48cd291b026a9c215be9bfdd6117fafbad96cd2d4a65225b1b3feb48f04219c9d8b31ddd5a8c0a10f6ef3ebd4eb4c83364
+  data.tar.gz: '029dae728f2d37236167b21e6ff03c35289cace83e38d18a59fea4f1f71f66a2dfd274e1f1a87eebb1bcaa88106a67acf7fd78606459816288f3d822ba6010a5'

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/exe/locd

@@ -6,7 +6,7 @@ require 'locd'
 
 # Setup logging *before* including {Locd::CLI} so that we can get
 # trace/debug output from that setup if enabled via ENV vars
-Locd::Logging.setup dest: $stderr, sync: true
+NRSER::Logging.setup! application: 'Locd', dest: $stderr, sync: true
 
 # Logger for this file
 logger = SemanticLogger[__FILE__]

data/lib/locd/agent.rb

@@ -51,7 +51,7 @@ class Locd::Agent
   # ==========================================================================
   
   # Add {.logger} and {#logger} methods
-  include SemanticLogger::Loggable
+  include NRSER::Logging::Mixin
   
   # Make agents sortable by label
   include Comparable

data/lib/locd/cli/command/main.rb

@@ -128,11 +128,31 @@ class Locd::CLI::Command::Main < Locd::CLI::Command::Base
         }.to_sym
       end
       
-      Locd::Logging.level = level unless level.nil?
-      Locd::Logging.set_config_levels
+      NRSER::Logging.level = level unless level.nil?
       
-      if [:trace, :debug].include? Locd::Logging.level
-        logger.send Locd::Logging.level, "Hello! We about to start the show..."
+      if levels = Locd.config[:log, :levels]
+        levels.each do |name, level|
+          const = begin
+            NRSER.to_const name
+          rescue
+            next
+          end
+          
+          level = level.to_sym
+          
+          self.logger.debug "Setting logger level",
+            logger: const.logger,
+            level: level
+          
+          const.logger.level = level
+          
+          self.logger.debug "Logger level set",
+            logger: const.logger
+        end
+      end
+      
+      if [:trace, :debug].include? NRSER::Logging.level
+        logger.send NRSER::Logging.level, "Hello! We about to start the show..."
       end
     end
     

data/lib/locd/launchctl.rb

@@ -60,7 +60,7 @@ module Locd::Launchctl
   # ============================================================================
   
   # Add {.logger} method
-  include SemanticLogger::Loggable
+  include NRSER::Logging::Mixin
   
   
   # Classes

data/lib/locd/newsyslog.rb

@@ -29,7 +29,7 @@ using NRSER::Types
 # 
 module Locd::Newsyslog
   
-  include SemanticLogger::Loggable
+  include NRSER::Logging::Mixin
   
   
   # Default place to work out of.

data/lib/locd/proxy.rb

@@ -43,7 +43,7 @@ module Locd::Proxy
   # ============================================================================
   
   # Add {.logger} and {#logger} methods
-  include SemanticLogger::Loggable
+  include NRSER::Logging::Mixin
   
   
   # Module Methods

data/lib/locd.rb

@@ -13,7 +13,6 @@ require 'shellwords'
 # Deps
 # -----------------------------------------------------------------------
 require 'nrser'
-require 'semantic_logger'
 require 'cmds'
 
 # Project / Package
@@ -22,7 +21,6 @@ require 'locd/version'
 require 'locd/errors'
 require 'locd/config'
 require 'locd/util'
-require 'locd/logging'
 require 'locd/label'
 require 'locd/pattern'
 require 'locd/launchctl'
@@ -59,7 +57,7 @@ module Locd
   # ============================================================================
   
   # Add {.logger} and {#logger} methods
-  include SemanticLogger::Loggable
+  include NRSER::Logging::Mixin
   
   
   # Module Methods

data/locd.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |spec|
   # ----------------------------------------------------------------------------
   
   # My guns
-  spec.add_dependency "nrser", '>= 0.2.0.pre.2'
+  spec.add_dependency "nrser", '~> 0.2.1'
   
   # Used to process command templates from projects' `//dev/locd.yml` files
   spec.add_dependency "cmds", ">= 0.2.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: locd
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - nrser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,16 +112,16 @@ dependencies:
   name: nrser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.2
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0.pre.2
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: cmds
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +226,6 @@ files:
 - lib/locd/errors.rb
 - lib/locd/label.rb
 - lib/locd/launchctl.rb
-- lib/locd/logging.rb
 - lib/locd/newsyslog.rb
 - lib/locd/pattern.rb
 - lib/locd/proxy.rb

data/lib/locd/logging.rb

@@ -1,399 +0,0 @@
-# Requirements
-# =======================================================================
-
-# Stdlib
-# -----------------------------------------------------------------------
-require 'forwardable'
-
-# Deps
-# -----------------------------------------------------------------------
-require 'awesome_print'
-require 'semantic_logger'
-
-# Project / Package
-# -----------------------------------------------------------------------
-
-
-# Refinements
-# =======================================================================
-
-using NRSER
-using NRSER::Types
-
-
-# Definitions
-# =======================================================================
-
-# Utility methods to setup logging with [semantic_logger][].
-# 
-# [semantic_logger]: http://rocketjob.github.io/semantic_logger/
-# 
-module Locd::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_config_level
-    if Locd.config[:trace].truthy?
-      return :trace
-    elsif Locd.config[:debug].truthy?
-      return :debug
-    elsif level = Locd.config[:log, :level]
-      return level.to_sym
-    end
-    
-    nil
-  end
-  
-  
-  def self.set_config_levels
-    if levels = Locd.config[:log, :levels]
-      levels.each do |name, level|
-        const = begin
-          NRSER.to_const name
-        rescue
-          next
-        end
-        
-        level = level.to_sym
-        
-        self.logger.debug "Setting logger level",
-          logger: const.logger,
-          level: level
-        
-        const.logger.level = level
-        
-        self.logger.debug "Logger level set",
-          logger: const.logger
-      end
-    end
-  end
-  
-  
-  # Setup logging.
-  # 
-  # @param [Symbol?] level:
-  #   Optional log level. If provided, it takes precedence. Otherwise, we will
-  #   look for log levels in the ENV vars. If nothing is found, no default
-  #   log level will be set - it will remain whatever default it already is
-  #   (usually `:info` unless something else has changed it).
-  # 
-  # @param [Boolean] sync:
-  #   When `true`, we will hack out Semantic Logger's async (threaded)
-  #   processor and install a synchronous one, which is what you want when
-  #   running from the CLI so that output is in order with execution (we don't
-  #   care about the performance implications there).
-  # 
-  # @param [IO | Hash | String] dest:
-  #   Set the appender, see {.appender=}.
-  # 
-  # @return [true]
-  #   If logging was setup.
-  # 
-  # @return [false]
-  #   If logging has already been setup (warning will be logged as well).
-  # 
-  def self.setup level: nil, sync: false, dest: nil
-    if setup?
-      logger.warn "Logging is already setup!"
-      return false
-    end
-    
-    SemanticLogger.application = 'locd'
-    
-    level = get_config_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 Locd::Logging