legion-logging 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f387ef9184be856c4ffc9537e33a5ada72bb1965808d3859d8bd91d5d0da386f
-  data.tar.gz: d7948d81c2c14e6d7213bcdacfa8d2c925765bb060460bcbaff2d244c4204a12
+  metadata.gz: c76a87ff53da3ca6a79f77c2b89ca354a55aebc63fdc93f605baf1bbfc1a4234
+  data.tar.gz: 0506f2b9fdbe0235c98578417b6440df5a74e969015667b59332453008645e4e
 SHA512:
-  metadata.gz: b342fab8eaf45c2e28c6c31e1e12ea5ab998d12b43fc71174d574498148f5e893e6de081e4439856a2903fd905bd761251f6e05972191cbcdfd81fda7f6188a8
-  data.tar.gz: 46e9b83f72aa20890a981b38ecebd98d6a97d412435f729f0409b41d485838063070feea5c18c20fe3497e962df1df8964fecb7a48f6bc97d348aeef91890002
+  metadata.gz: dd20f424acc7c9ec70142345de8c6765442918c1eb798f89f5802526be056d1008820f022c78438ab904cd5bfcba11c9896d4958facc363613bffed8b8b7f535
+  data.tar.gz: 4c9c8f9d90093e492285e5067c300284b64bb129de5cde78067d40dde15c4cacadab30961b8767b6edfb8a1b920255c9de0d27075a94e63b0b08fefbf0538562

data/.circleci/config.yml

@@ -1,167 +1,61 @@
-version: 2 # use CircleCI 2.0
+version: 2.1
+orbs:
+  ruby: circleci/ruby@0.2.1
+
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.5-node
     steps:
       - checkout
-      - run: gem install rubocop
+      - ruby/load-cache
+      - ruby/install-deps
       - run:
           name: Run Rubocop
-          command: rubocop
-      - store_test_results:
-          path: test_results
-  "ruby-2.0":
-    docker:
-      - image: circleci/ruby:2.0
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.1":
-    docker:
-      - image: circleci/ruby:2.1
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.2":
-    docker:
-      - image: circleci/ruby:2.2
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-
-  "ruby-2.3":
-    docker:
-      - image: circleci/ruby:2.3
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-
-  "ruby-2.4":
+          command: bundle exec rubocop
+      - ruby/save-cache
+  "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.4-node
+      - image: circleci/ruby:2.5
+      - image: memcached:1.5-alpine
     steps:
       - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.5":
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.6
+      - image: memcached:1.5-alpine
     steps:
       - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "ruby-2.6":
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
+  "ruby-two-seven":
     docker:
-      - image: circleci/ruby:2.6-node
+      - image: circleci/ruby:2.7
+      - image: memcached:1.5-alpine
     steps:
       - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
-  "jruby-9.2":
-    docker:
-      - image: circleci/jruby:9.2
-    steps:
-      - checkout
-      - run:
-          name: Bundle Install
-          command: bundle install
-      - run:
-          name: Run RSpec
-          command: bundle exec rspec --format progress --format RspecJunitFormatter -o test-results/rspec/results.xml
-          when: always
-      - store_test_results:
-          path: test-results
+      - ruby/load-cache
+      - ruby/install-deps
+      - ruby/run-tests
+      - ruby/save-cache
 
 workflows:
   version: 2
-  cop_rake_deploy:
+  rubocop-rspec:
     jobs:
       - rubocop
-#      - ruby-2.2:
-#          requires:
-#            - ruby-2.4
-#          filters:
-#            branches:
-#              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.3:
-          requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.4:
+      - ruby-two-five:
           requires:
             - rubocop
-      - ruby-2.5:
-          requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - ruby-2.6:
+      - ruby-two-six:
           requires:
-            - ruby-2.4
-          filters:
-            branches:
-              only: /\bdevelop\b|\bmaster\b/
-      - jruby-9.2:
+            - ruby-two-five
+      - ruby-two-seven:
           requires:
-            #- ruby-2.2
-            - ruby-2.3
-            - ruby-2.4
-            - ruby-2.5
-            - ruby-2.6
+            - ruby-two-five

data/.rubocop.yml

@@ -16,6 +16,6 @@ Layout/HashAlignment:
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
 Style/FrozenStringLiteralComment:
   Enabled: false

data/Gemfile

@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 
+# Specify your gem's dependencies in legion-logging.gemspec
 gemspec

data/legion-logging.gemspec

@@ -28,12 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codecov'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'simplecov'
 
-  spec.add_dependency 'logger', '~> 1.3'
   spec.add_dependency 'rainbow', '~> 3'
 end

data/lib/legion/logging.rb

@@ -13,6 +13,10 @@ module Legion
       include Legion::Logging::Builder
       attr_reader :log, :color
 
+      def level
+        @log.level
+      end
+
       def setup(options = {})
         output(options)
         log_level(options[:level])

data/lib/legion/logging/builder.rb

@@ -1,9 +1,25 @@
 module Legion
   module Logging
     module Builder
-      def log_format(_options = {}, log = @log)
+      def log_format(options = {}, log = @log) # rubocop:disable Metrics/AbcSize
         log.formatter = proc do |severity, datetime, _progname, msg|
-          "[#{datetime}][#{::Process.pid}] #{severity} #{msg}\n"
+          options[:lex_name] = options.key?(:lex) ? "[lex-#{options[:lex]}]" : nil
+          unless options[:lex_name].nil?
+            data = caller_locations[4].to_s.split('/').last(2)
+            runner_trace = {
+              type:        data[0],
+              file:        file = data[1].split('.')[0], # rubocop:disable Lint/UselessAssignment
+              function:    data[1].split('`')[1].delete_suffix('\''),
+              line_number: line_number = data[1].split(':')[1] # rubocop:disable Lint/UselessAssignment
+            }
+          end
+          string = "[#{datetime}][#{::Process.pid}]"
+          string.concat(options[:lex_name]) unless options[:lex_name].nil?
+          if runner_trace.is_a?(Hash) && options[:extended]
+            string.concat("[#{runner_trace[:file]}:#{runner_trace[:line_number]}]")
+          end
+          string.concat(" #{severity} #{msg}\n")
+          string
         end
       end
 
@@ -12,8 +28,10 @@ module Legion
         @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
       end
 
-      def log_level(level = 'debug', log = @log)
-        if level == 'debug'
+      def log_level(level = 'debug', log = @log) # rubocop:disable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        if level == 'trace'
+          log.level = ::Logger::INFO
+        elsif level == 'debug'
           log.level = ::Logger::DEBUG
         elsif level == 'info'
           log.level = ::Logger::INFO

data/lib/legion/logging/logger.rb

@@ -4,16 +4,19 @@ require 'legion/logging/builder'
 module Legion
   module Logging
     class Logger
-      attr_reader :log, :color
+      attr_accessor :log, :color, :level, :lex, :log_file, :trace_enabled, :extended
       include Legion::Logging::Methods
       include Legion::Logging::Builder
 
-      def initialize(options = {})
-        output(options)
-        log_level(options[:level])
-        log_format(options)
-        @color = options[:color]
-        @color = true if options[:color].nil? && options[:log_file].nil?
+      def initialize(level: 'info', log_file: nil, lex: nil, trace: false, extended: false, trace_size: 4, **opts) # rubocop:disable Metrics/ParameterLists
+        output(logfile: log_file)
+        log_level(level)
+        log_format(lex: lex, extended: extended, **opts)
+        @color = opts[:color]
+        @color = true if opts[:color].nil? && log_file.nil?
+        @trace_enabled = trace
+        @trace_size = trace_size
+        @extended = extended
       end
     end
   end

data/lib/legion/logging/methods.rb

@@ -1,31 +1,55 @@
 module Legion
   module Logging
     module Methods
+      def trace(raw_message = nil, log = @log, size: @trace_size, log_caller: true) # rubocop:disable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
+        return unless @trace_enabled
+
+        raw_message = yield if raw_message.nil? && block_given?
+        message = Rainbow('Tracing: ').cyan
+        message.concat Rainbow(raw_message + ' ').cyan
+        if log_caller && size.nil?
+          message.concat Rainbow(caller_locations).cyan.underline
+        elsif log_caller
+          message.concat Rainbow(caller_locations[0..size]).cyan.underline
+        end
+        log.unknown(message)
+      end
+
       def debug(message = nil, log = @log)
+        return unless log.level < 1
+
         message = yield if message.nil? && block_given?
         message = Rainbow(message).blue if @color
         log.debug(message)
       end
 
       def info(message = nil, log = @log)
+        return unless log.level < 2
+
         message = yield if message.nil? && block_given?
         message = Rainbow(message).green if @color
         log.info(message)
       end
 
       def warn(message = nil, log = @log)
+        return unless log.level < 3
+
         message = yield if message.nil? && block_given?
         message = Rainbow(message).yellow if @color
         log.warn(message)
       end
 
       def error(message = nil, log = @log)
+        return unless log.level < 4
+
         message = yield if message.nil? && block_given?
         message = Rainbow(message).red if @color
         log.error(message)
       end
 
       def fatal(message = nil, log = @log)
+        return unless log.level < 5
+
         message = yield if message.nil? && block_given?
         message = Rainbow(message).darkred if @color
         log.fatal(message)
@@ -36,6 +60,21 @@ module Legion
         message = Rainbow(message).purple if @color
         log.unknown(message)
       end
+
+      def runner_exception(exc, **opts)
+        Legion::Logging.error exc.message
+        Legion::Logging.error exc.backtrace
+        Legion::Logging.error opts
+        { success: false, message: exc.message, backtrace: exc.backtrace }.merge(opts)
+      end
+
+      def thread(kvl: false)
+        if kvl
+          "thread=#{Thread.current.object_id}"
+        else
+          Thread.current.object_id.to_s
+        end
+      end
     end
   end
 end

data/lib/legion/logging/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Logging
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Esity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,30 +42,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -145,12 +131,6 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
-- ".idea/.rakeTasks"
-- ".idea/legion-logging.iml"
-- ".idea/misc.xml"
-- ".idea/modules.xml"
-- ".idea/vagrant.xml"
-- ".idea/workspace.xml"
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
@@ -187,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: The Legion::Logging class

data/.idea/.rakeTasks

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Settings><!--This file was automatically generated by Ruby plugin.
-You are allowed to: 
-1. Remove rake task
-2. Add existing rake tasks
-To add existing rake tasks automatically delete this file and reload the project.
---><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build legion-logging-0.1.3.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install legion-logging-0.1.3.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install legion-logging-0.1.3.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.3 and build and push legion-logging-0.1.3.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/.idea/legion-logging.iml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="ModuleRunConfigurationManager">
-    <shared />
-  </component>
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="PROVIDED" name="ast (v2.4.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="bundler (v2.1.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="codecov (v0.1.16, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.3, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="docile (v1.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="jaro_winkler (v1.5.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="json (v2.3.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="logger (v1.4.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parallel (v1.19.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="parser (v2.7.0.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rainbow (v3.0.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rake (v10.5.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.4, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.9.0, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.9.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.9.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rspec_junit_formatter (v0.4.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="rubocop (v0.80.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="ruby-progressbar (v1.10.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov (v0.18.5, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="simplecov-html (v0.12.2, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v1.6.1, RVM: ruby-2.6.3) [gem]" level="application" />
-    <orderEntry type="library" scope="PROVIDED" name="url (v0.3.2, RVM: ruby-2.6.3) [gem]" level="application" />
-  </component>
-</module>

data/.idea/misc.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="ES6" />
-  </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="RVM: ruby-2.6.3" project-jdk-type="RUBY_SDK" />
-</project>

data/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/legion-logging.iml" filepath="$PROJECT_DIR$/.idea/legion-logging.iml" />
-    </modules>
-  </component>
-</project>

data/.idea/vagrant.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VagrantProjectSettings">
-    <option name="instanceFolder" value="" />
-    <option name="provider" value="" />
-  </component>
-</project>

data/.idea/workspace.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CoverageOptionsProvider">
-    <option name="myAddOrReplace" value="0" />
-  </component>
-  <component name="Git.Settings">
-    <option name="PUSH_AUTO_UPDATE" value="true" />
-    <option name="ROOT_SYNC" value="DONT_SYNC" />
-  </component>
-  <component name="ProjectId" id="1Yl3Ni6NlUlB0HwEdc23TcNXMXO" />
-  <component name="PropertiesComponent">
-    <property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.vagrant" />
-  </component>
-</project>