cayuga 0.0.10 → 0.0.11

data/.rubocop.yml

@@ -19,6 +19,9 @@ Layout/SpaceAroundOperators:
 Layout/TrailingBlankLines:
   Enabled:  false
 
+Metrics/BlockLength:
+  ExcludedMethods: [ RSpec.describe ]
+
 Metrics/MethodLength:
   Enabled:  true
   Max: 15

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in cayuga.gemspec
 gemspec

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "cayuga"
+require 'bundler/setup'
+require 'cayuga'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "cayuga"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/cayuga/object/constants.rb

@@ -5,6 +5,7 @@ require 'cayuga'
 
 module Cayuga
   module Object
+    # noinspection RubyModuleAsSuperclassInspection
     class Constants < Singleton
       def constant(constant)
         constants[constant.symbolize]

data/lib/cayuga/object/factory.rb

@@ -60,19 +60,18 @@ module Cayuga
 
       def release(klass, name = nil)
         key = klass.symbolize
-        if registered?(key, name)
-          type = type(key)
-          case type
-            when :singleton #, :factory
-              instances.delete(key)
-            when :named
-              value = instances[key]
-              if value
-                value.delete(name)
-              end
-            else
-              raise "bad type '#{type}'"
-          end
+        return unless registered?(key, name)
+        type = type(key)
+        case type
+          when :singleton
+            instances.delete(key)
+          when :named
+            value = instances[key]
+            if value
+              value.delete(name)
+            end
+          else
+            raise "bad type '#{type}'"
         end
       end
 
@@ -83,15 +82,22 @@ module Cayuga
       private
 
       OBJECTS = {
-        singletons: %w(Cayuga::Object::Logger Cayuga::Object::Constants)
+        singletons: %w[Cayuga::Object::Logger Cayuga::Object::Constants]
       }.deep_freeze
 
       attr_reader :configuration, :types, :instances
 
       def initialize(config)
-        @configuration = JSON.parse(File.read(config), symbolize_names: true).deep_freeze
+        @configuration =
+          JSON.parse(File.read(config), symbolize_names: true).deep_freeze
         @configuration_name = configuration[:configuration_name]
         @logs_directory = configuration[:directories][:logs]
+        setup_types
+        @instances = {}
+        @directories = configuration[:directories].freeze
+      end
+
+      def setup_types
         @types = {}
         register_classes(configuration[:object_classes], :object)
         register_classes(OBJECTS[:singletons], :singleton)
@@ -99,8 +105,6 @@ module Cayuga
         register_classes(
           configuration[:named_object_classes], :named
         )
-        @instances = {}
-        @directories = configuration[:directories].freeze
       end
 
       def register_classes(list, type)
@@ -120,11 +124,6 @@ module Cayuga
 
       def create_instance(type, klass, name)
         case type
-          # when :factory
-          #   object = klass.create(self, configuration)
-          #   unless klass == LoggerFactory
-          #     log.info("factory #{klass} created ")
-          #   end
           when :object, :singleton
             object = klass.create(self, configuration)
           # log.info("singleton #{klass} created ")

data/lib/cayuga/object/logger.rb

@@ -5,10 +5,14 @@ require 'cayuga'
 
 module Cayuga
   module Object
+
+    # Cayuga Object Logger
+    # noinspection RubyModuleAsSuperclassInspection
     class Logger < Singleton
 
       def generic_log_file(name)
-        "#{factory.logs_directory}/#{name.stringify.filenamify('.log')}"
+        filename = name.stringify.filenamify('.log')
+        "#{factory.logs_directory}/#{filename}"
       end
 
       def log_names
@@ -21,60 +25,55 @@ module Cayuga
 
       alias [] log_filename
 
+      def log_appender_name(name)
+        name.stringify + annotation
+      end
+
       def log_appender(name)
-        all = SemanticLogger.appenders.select { |log| log.name == name.stringify }
-        count = all.count
-        raise RuntimeError, "More than one log with name #{name}" if count > 1
-        if count == 1
-          all[0]
-        else
-          nil
+        all = SemanticLogger.appenders.select do |log|
+          log.name == log_appender_name(name)
         end
+        count = all.count
+        raise "More than one log with name #{name}" if count > 1
+        count == 1 ? all[0] : nil
       end
 
       def log_log?(name)
-        not @logs[name.symbolize].nil?
+        !@logs[name.symbolize].nil?
       end
 
       def log_log!(name, filename: nil, stream: nil, filter: nil, level: :info)
-        symbol = name.symbolize
-        return log_filename(symbol) if log_log?(symbol)
-        if log_appender_exists?(symbol)
-          logger.warn('no entry for log', payload = { name: symbol })
-          logger.warn('no entry for log', payload = { log: log_names })
-          @logs[symbol] = filename || stream
-          if log_filename(symbol).nil?
-            @logs[symbol] = factory.logs_directory + '/' + name.classify.log_file
-          end
-          return
+        unless log_log?(name)
+          remove_any_orphan_appender(name)
+          make_appender(name, filename, stream, filter, level)
         end
-        if filename.nil?
-          if stream.nil?
-            #must be a class
-            filename = factory.logs_directory + '/' + name.classify.log_file
-            log = SemanticLogger.add_appender(file_name: filename, filter: filter)
-          else
-            log = SemanticLogger.add_appender(io: stream, filter: filter)
-          end
-        else
-          log = SemanticLogger.add_appender(file_name: filename, filter: filter)
-        end
-        log.name = name.stringify
-        log.level = level
-        @logs[name.symbolize] = filename || stream || name.stringify
-        logger.info('logs', payload = { log_names: log_names })
-        logger.info('logs', payload = { count: SemanticLogger.appenders.count })
+        logger.info('log created', payload: { name: name })
+        logger.debug('logs', payload: { log_names: log_names })
+        logger.debug('logs', payload: { count: SemanticLogger.appenders.count })
+        log_filename(name)
       end
 
       private_class_method :new
 
       private
 
-      attr_reader :factory
+      attr_reader :annotation
 
       def initialize(factory, configuration)
         @factory = factory
+        @configuration = configuration
+        @configuration_name = factory.configuration_name
+        @annotation = fetch_annotation
         @logs = {}
+        create_logs
+      end
+
+      def fetch_annotation
+        value = configuration[:constants][:log_annotation_marker]
+        value.nil? ? '' : value
+      end
+
+      def create_logs
         log_log!(:console, stream: $stderr, level: :warn)
         log_log!(:main, filename: generic_log_file(:main))
         log_log!(factory.class, filter: Regexp.new(factory.class.stringify))
@@ -82,13 +81,30 @@ module Cayuga
       end
 
       def log_appender_exists?(name)
-        name = name.symbolize
-        log = log_appender(name)
-        if log.nil?
-          false
+        !log_appender(name.symbolize).nil?
+      end
+
+      def make_appender(name, filename, stream, filter, level)
+        if stream.nil?
+          if filename.nil?
+            filename = factory.logs_directory + '/' + name.classify.log_file
+          end
+          log = SemanticLogger.add_appender(file_name: filename, filter: filter)
         else
-          true
+          log = SemanticLogger.add_appender(io: stream, filter: filter)
         end
+        log.name = log_appender_name(name)
+        log.level = level
+        @logs[name.symbolize] = filename || stream || name.stringify
+        log
+      end
+
+      def remove_any_orphan_appender(name)
+        return if log_log?(name)
+        return unless log_appender_exists?(name)
+        logger.warn('log without registration', payload: { name: name })
+        logger.debug('log without registration', payload: { log: log_names })
+        SemanticLogger.remove_appender(log_appender(name))
       end
 
     end

data/lib/cayuga/object/named_object.rb

@@ -20,7 +20,9 @@ module Cayuga
       end
 
       def self.create(factory, configuration, name)
-        raise "#{self.stringify}[#{name}] already registered" if factory.registered?(self, name)
+        if factory.registered?(self, name)
+          raise "#{stringify}[#{name}] already registered"
+        end
         if primary?(name)
           primary = name
           alternate = nil

data/lib/cayuga/object/object.rb

@@ -9,6 +9,8 @@ module Cayuga
   RootObject = Object
 
   module Object
+
+    # Cayuga Object Object
     class Object
       include Tools::Loggable
 
@@ -28,10 +30,9 @@ module Cayuga
         @factory = factory
         @configuration = configuration
         @configuration_name = factory.configuration_name
-        factory[Logger].log_log!(
-          self.class,
-          filter: Regexp.new(self.class.stringify)
-        ) unless self.class == Logger
+        return if self.class == Logger
+        factory[Logger]
+          .log_log!(self.class, filter: Regexp.new(self.class.stringify))
       end
 
     end

data/lib/cayuga/object/singleton.rb

@@ -6,7 +6,7 @@ module Cayuga
     # Cayuga Object Singleton
     class Singleton < Object
       def self.create(factory, configuration)
-        raise "#{self.stringify} already registered" if factory.registered?(self)
+        raise "#{stringify} already registered" if factory.registered?(self)
         factory.register(new(factory, configuration), self)
       end
 

data/lib/cayuga/tools/class.rb

@@ -18,7 +18,7 @@ module Cayuga
         self
       end
 
-      def filenamify(extension=nil)
+      def filenamify(extension = nil)
         stringify.filenamify(extension)
       end
 

data/lib/cayuga/tools/loggable.rb

@@ -17,7 +17,7 @@ module Cayuga
           alias_method :log, :logger
 
           def self.log_file
-            "#{self.filenamify('.log')}"
+            filenamify('.log')
           end
 
         end

data/lib/cayuga/tools/string.rb

@@ -22,7 +22,7 @@ module Cayuga
 
       def filenamify(extension = nil)
         # noinspection RubyResolve
-        result = pathize.gsub('/', '#')
+        result = pathize.tr('/', '#')
         unless extension.nil? || extension.empty?
           result += extension[0] == '.' ? '' : '.'
           result += extension.stringify

data/lib/cayuga/tools/symbol.rb

@@ -15,12 +15,12 @@ module Cayuga
       end
 
       def classify
-        klass = Object.const_get(self.to_s)
-        raise(NameError,"wrong class name '#{klass}'") unless klass.kind_of?(Class)
+        klass = Object.const_get(to_s)
+        raise NameError, "wrong class name '#{klass}'" unless klass.is_a?(Class)
         klass
       end
 
-      def filenamify(extension=nil)
+      def filenamify(extension = nil)
         stringify.filenamify(extension)
       end
 

data/lib/cayuga/version.rb

@@ -1,3 +1,3 @@
 module Cayuga
-  VERSION = "0.0.10"
+  VERSION = '0.0.11'.freeze
 end

data/test_script.rb

@@ -7,8 +7,8 @@ filename = File.expand_path('development.log')
 SemanticLogger.add_appender(file_name: filename)
 SemanticLogger.add_appender(io: $stderr)
 buffer = StringIO.new
-SemanticLogger.add_appender(io: buffer) #, formatter: :json)
-tail_lines =3
+SemanticLogger.add_appender(io: buffer) # , formatter: :json)
+tail_lines = 3
 
 log.info 'start'
 # puts buffer.string
@@ -26,31 +26,30 @@ top = 2 ** 23
   # array[i] = i
   now = Time.now
   elapsed = now - last
-  if (elapsed > 5) && (now.sec % 5).zero?
+  next unless (elapsed > 5) && (now.sec % 5).zero?
+  stats = "#{now}: #{format('%.6f', (i / 1e6))}" \
+  ", #{format('%.2f', elapsed)}s" \
+  ", #{format('%.2f', (now - start))}s" \
+  ", #{format('%.6f', ((i - old) / 1e6))}"
+  puts stats
+  log.info(stats)
+  # puts buffer.string
+  last = now
+  old = i
+  # end
+  # rubocop: disable Style/Next
+  if (now - start > 1800) || (i == top - 1)
+    duration = now - start
     stats = "#{now}: #{format('%.6f', (i / 1e6))}" \
-    ", #{format('%.2f', elapsed)}s" \
-    ", #{format('%.2f', (now - start))}s" \
-    ", #{format('%.6f', ((i - old) / 1e6))}"
+  ", #{format('%.2f', duration)}s" \
+  ", #{format('%.6f', set.size / 1e6)}" \
+  ", #{format('%.6f', array.size / 1e6)}"
     puts stats
-    log.info(stats)
+    log.info stats
     # puts buffer.string
-    last = now
-    old = i
-    # end
-    # rubocop: disable Style/Next
-    if (now - start > 1800) || (i == top - 1)
-      duration = now - start
-      stats = "#{now}: #{format('%.6f', (i / 1e6))}" \
-    ", #{format('%.2f', duration)}s" \
-    ", #{format('%.6f', set.size / 1e6)}" \
-    ", #{format('%.6f', array.size / 1e6)}"
-      puts stats
-      log.info stats
-      # puts buffer.string
-      break
-    end
-    # rubocop: enable Style/Next
+    break
   end
+  # rubocop: enable Style/Next
 end
 now = Time.now
 # last = now
@@ -70,18 +69,24 @@ puts format('%.2fs', duration)
 puts format('%.2fs', (Time.now - now))
 puts format('%.2fs', (Time.now - start))
 
-log.info('finish', set_size: set.size / 1e6, load: duration, analyze: Time.now - now, total: Time.now - start)
+log.info(
+  'finish',
+  set_size: set.size / 1e6,
+  load: duration,
+  analyze: Time.now - now,
+  total: Time.now - start
+)
 SemanticLogger.flush
 puts '*****FILE*****'
-File.open(filename) do |aLog|
-  aLog.extend(File::Tail)
-  puts aLog.backward(tail_lines).tail(tail_lines)
+File.open(filename) do |a_log|
+  a_log.extend(File::Tail)
+  puts a_log.backward(tail_lines).tail(tail_lines)
 end
 puts '*****BUFFER*****'
 puts buffer.string
 # sleep(1)
 puts '*****FILE*****'
-File.open(filename) do |aLog|
-  aLog.extend(File::Tail)
-  puts aLog.backward(tail_lines).tail(tail_lines)
+File.open(filename) do |a_log|
+  a_log.extend(File::Tail)
+  puts a_log.backward(tail_lines).tail(tail_lines)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cayuga
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - patrick
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic_logger