legion-logging 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c23b52e80d98a8fe9dd57a6c035ae3a1dbf944c36df1dcb75e4a40579cc6877
-  data.tar.gz: f033aaa8333c5b732bf8d7fea044f3b1a763f93e1e6e6f505fd96bbe5c3fa9f3
+  metadata.gz: 55dd24d5d41069814f94578074efb34ff836d58e6eaa57275ec7da040de84b85
+  data.tar.gz: d17d87bd089075b217aff583e3aba1ee8fc1e14270a6b97e2f8783590b484dd9
 SHA512:
-  metadata.gz: b41978935615219e45cdf4df3c3c519fd2a5bcce8a56b435f6b582e6d0ae7c54ec76ca31aa1da431f705909572c1afccfd59b91979e9d934559a5ac4180a8b2a
-  data.tar.gz: 2ab09da5cb65c19b11ea68501b96bf358ad2d3c1db6fe590460e5cdf242f63b6de0a9987a67c31e9bafbf0e6c9287f9255db273f180d12d8fb8cc7c6fb338db2
+  metadata.gz: 172072cc4546bc984fb1c3399290066fd0dd41cfc8099a5c744eb9e3324753560ff24e94ab1850db683efea53e7e80ce33454322c56e11a931e8b57398f21c6c
+  data.tar.gz: d6339b22d9a50eb9a72022c35e4679ef0efa0326ba3b6ab6b7f1b9174eb796ec122878b23056ff2d0cc7ee0e0ed4be6230bd0bb40c97e556bd2d7abd0a49cdca

data/.circleci/config.yml

@@ -1,67 +1,90 @@
 version: 2.1
 orbs:
-  ruby: circleci/ruby@0.2.1
-  sonarcloud: sonarsource/sonarcloud@1.0.1
+  ruby: circleci/ruby@1.1.2
+  sonarcloud: sonarsource/sonarcloud@1.0.2
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.7-node
+      - image: cimg/ruby:2.7
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - run: bundle exec rubocop --format=json --out=rubocop-result.json
+      - store_test_results:
+          path: rubocop-result.json
+      - sonarcloud/scan
+      - run: bundle exec rubocop
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
   "ruby-two-five":
     docker:
-      - image: circleci/ruby:2.5
+      - image: cimg/ruby:2.5
     steps:
       - checkout
-      - ruby/load-cache
-      - run:
-          name: update bundler
-          command: gem update bundler
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-six":
     docker:
-      - image: circleci/ruby:2.6
+      - image: cimg/ruby:2.6
     steps:
       - checkout
-      - ruby/load-cache
-      - run:
-          name: update bundler
-          command: gem update bundler
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
   "ruby-two-seven":
     docker:
       - image: circleci/ruby:2.7
-      - image: memcached:1.5-alpine
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - ruby/save-cache
-  "sonarcloud":
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
+      - sonarcloud/scan
+  "ruby-three":
     docker:
-      - image: circleci/ruby:2.7
+      - image: circleci/ruby:3
     steps:
       - checkout
-      - ruby/load-cache
-      - ruby/install-deps
-      - ruby/run-tests
-      - run:
-          name: Run Rubocop
-          command: bundle exec rubocop --format=json --out=rubocop-result.json
+      - restore_cache:
+          key: "bundler cache mri"
+      - run: bundle update
+      - save_cache:
+          key: "bundler cache mri"
+          paths:
+            - "/usr/local/bundle"
+      - run: bundle exec rspec --format progress --format RspecJunitFormatter -o rspec-results.xml
+      - store_test_results:
+          path: rspec-results.xml
       - sonarcloud/scan
-      - ruby/save-cache
 
 workflows:
   version: 2
@@ -77,7 +100,6 @@ workflows:
       - ruby-two-seven:
           requires:
             - ruby-two-five
-      - sonarcloud:
+      - ruby-three:
           requires:
-            - ruby-two-seven
-            - ruby-two-six
+            - ruby-two-five

data/.rubocop.yml

@@ -7,14 +7,7 @@ Metrics/ClassLength:
 Metrics/BlockLength:
   Max: 75
 Metrics/CyclomaticComplexity:
-  Max: 10
-Layout/SpaceAroundEqualsInParameterDefault:
-  EnforcedStyle: space
-Style/SymbolArray:
-  Enabled: true
-Layout/HashAlignment:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
+  Max: 9
 Style/Documentation:
   Enabled: false
 AllCops:

data/README.md

@@ -27,15 +27,9 @@ This library is utilized by Legion to log messages
 
 This gem can be viewed and download from [RubyGems - Legion-Logging](https://rubygems.org/gems/legion-logging)
 
-## Development
-
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec install`. 
-
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://bitbucket.org/legion-io/legion-logging/issues This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on Bitbucket at https://bitbucket.org/legion-io/legion-logging/issues This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/bitbucket-pipelines.yml

@@ -1,18 +1,17 @@
-image: ruby:2.7.0
+image: ruby:2.7
 
 pipelines:
-  branches:
-    master:
+  tags:
+    "v*":
       - step:
           name: Push to RubyGems
           deployment: RubyGems
           script:
-            - gem install bundler gem-release rake rspec
-            - bundle install
-            - rake build
-            - mkdir .gem
-            - (umask  077 ; echo $gem_creds | base64 --decode > .gem/credentials)
+            - gem install gem-release
+            - (umask  077 ; echo $gem_creds | base64 --decode > ~/.gem/credentials)
             - gem release
-            - gem tag --push
           artifacts:
             - pkg/**
+definitions:
+  caches:
+    bundler: /usr/local/bundle

data/legion-logging.gemspec

@@ -22,16 +22,13 @@ Gem::Specification.new do |spec|
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  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'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'simplecov', '< 0.18.0'
 
   spec.add_dependency 'rainbow', '~> 3'

data/lib/legion/logging.rb

@@ -14,9 +14,9 @@ module Legion
       attr_reader :color
 
       def setup(level: 'info', **options)
-        output(options)
+        output(**options)
         log_level(level)
-        log_format(options)
+        log_format(**options)
         @color = options[:color]
         @color = true if options[:color].nil? && options[:log_file].nil?
       end

data/lib/legion/logging/builder.rb

@@ -1,29 +1,30 @@
 module Legion
   module Logging
     module Builder
-      def log_format(options = {}) # rubocop:disable Metrics/AbcSize
+      def log_format(include_pid: false, **options) # rubocop:disable Metrics/AbcSize
         log.formatter = proc do |severity, datetime, _progname, msg|
-          options[:lex_name] = options.key?(:lex) ? "[lex-#{options[:lex]}]" : nil
+          options[:lex_name] = options.key?(: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('\''),
+              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 = "[#{datetime}]"
+          string.concat("[#{::Process.pid}]") if include_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]}]")
+            string.concat("[#{runner_trace[:type]}:#{runner_trace[:file]}:#{runner_trace[:function]}:#{runner_trace[:line_number]}]") # rubocop:disable Layout/LineLength
           end
           string.concat(" #{severity} #{msg}\n")
           string
         end
       end
 
-      def output(options)
+      def output(**options)
         @log = ::Logger.new($stdout) if options[:log_file].nil?
         @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
       end
@@ -42,9 +43,7 @@ module Legion
 
       def log_level(level = 'info')
         log.level = case level
-                    when 'trace'
-                      ::Logger::DEBUG
-                    when 'debug'
+                    when 'trace', 'debug'
                       ::Logger::DEBUG
                     when 'info'
                       ::Logger::INFO

data/lib/legion/logging/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Logging
-    VERSION = '1.1.3'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Esity
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-22 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +140,7 @@ metadata:
   homepage_uri: https://bitbucket.org/legion-io/legion-logging
   source_code_uri: https://bitbucket.org/legion-io/legion-logging
   wiki_uri: https://bitbucket.org/legion-io/legion-logging/wiki/Home
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -183,8 +155,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: The Legion::Logging class
 test_files: []