legion-logging 0.3.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2b6f8eb657b6f10e4a02806f4faa9f2d50788a0aad4f2b64ca87b9836472d78
-  data.tar.gz: cac716412021a31196391741bd02a8304bcbde0da67216b078b36825e5d9f532
+  metadata.gz: 979499ffe521486bed7120fbd78e9bec1754440a536c40fa96eed1b34b744ef7
+  data.tar.gz: 49f500fa85f6e5740815126bbc432eea5975ce6612553c0523d7d4622ed63f13
 SHA512:
-  metadata.gz: aa80f207159a21c67a6624478f83bd4cae0c2dc850f50e56b0b0b594d6e6f345e6f38b047ddced0bdc08ee43ee24447858e3c9a3b4bdc72070f3479e148351ff
-  data.tar.gz: 9675b5e00fae346f39c23abd658029389d5584ce48be3b504b99461cd3086f14cb3588cd2e23e32bd0061f971bf14929ca1336dccfd7eee9b3c42a44068ba70a
+  metadata.gz: ef65f65c39df3a23dfb4e24745255ad4c88f18f4d350da527f876aeca155039905fb9dd71ff0578b7aeb5108d44d0b442d757c50870a3978a125607957e579fc
+  data.tar.gz: 52397bf857f760967064e6d4cd7d9f60598cc38f8466185ac3dd6fcf810dd60b6eeedf57b841ebc4c0af57df9121ca537228cb07467378462a3a4dda7ca1f196

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/.idea/legion-logging.iml

@@ -14,11 +14,10 @@
     <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="rake (v13.0.1, 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" />

data/.rubocop.yml

@@ -5,7 +5,7 @@ Metrics/MethodLength:
 Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
-  Max: 50
+  Max: 75
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:

data/bitbucket-pipelines.yml

@@ -1,24 +1,6 @@
-image: ruby:2.4.0
+image: ruby:2.5.0
 
 pipelines:
-  branches:
-    master:
-    - step:
-        caches:
-        - bundler
-        script:
-        - gem install bundle rubocop
-        - bundle install
-        - rubocop
-        - rake
-    - step:
-        name: Deploy to test gem server
-        deployment: test
-        script:
-        - gem install bundle geminabox
-        - bundle install
-        - gem build legion-logging.gemspec
-        - gem inabox legion-logging*.gem -g https://gems.whonodes.org/ -o
   default:
   - step:
       caches:

data/legion-logging.gemspec

@@ -22,18 +22,16 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   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,Metrics/CyclomaticComplexity
         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:        data[1].split('.')[0],
+              function:    data[1].split('`')[1].delete_suffix('\''),
+              line_number: data[1].split(':')[1]
+            }
+          end
+          string = "[#{datetime}][#{::Process.pid}]"
+          string.concat(options[:lex_name]) unless options[:lex_name].nil?
+          if runner_trace.is_a?(Hash) && (options[:extended] || severity == 'debug')
+            string.concat("[#{runner_trace[:type]}:#{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.3.1'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Esity
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-03-08 00:00:00.000000000 Z
+date: 2020-03-12 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