legion-logging 0.2.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76a87ff53da3ca6a79f77c2b89ca354a55aebc63fdc93f605baf1bbfc1a4234
-  data.tar.gz: 0506f2b9fdbe0235c98578417b6440df5a74e969015667b59332453008645e4e
+  metadata.gz: 9b1efb3d106b47fa7884d216f0e819c43b34ea467fff711b8bbe36e3f1be4f94
+  data.tar.gz: 20dbffbebd7804d5ad1e7bd21fbc141fb486d99f1a06973acc1099d1e1e53b3c
 SHA512:
-  metadata.gz: dd20f424acc7c9ec70142345de8c6765442918c1eb798f89f5802526be056d1008820f022c78438ab904cd5bfcba11c9896d4958facc363613bffed8b8b7f535
-  data.tar.gz: 4c9c8f9d90093e492285e5067c300284b64bb129de5cde78067d40dde15c4cacadab30961b8767b6edfb8a1b920255c9de0d27075a94e63b0b08fefbf0538562
+  metadata.gz: 5f9bef85e2f2d2dd84989c57f7b210f17cb54d62bc9e82dfd19ac0bc8ab001e15716efd8391c3318b9dffde62c22d4218b454aa5c7024dd97bebaffbd771bece
+  data.tar.gz: bbb5b895500262914283b570dcd70ecfacb852bf35656e5bdffce7188e902204f3ee0312a19a24c57e38d630a1acda584959b69ad3de48fa9fc9c438236d44cc

data/.circleci/config.yml

@@ -1,11 +1,12 @@
 version: 2.1
 orbs:
   ruby: circleci/ruby@0.2.1
+  sonarcloud: sonarsource/sonarcloud@1.0.1
 
 jobs:
   "rubocop":
     docker:
-      - image: circleci/ruby:2.5-node
+      - image: circleci/ruby:2.7-node
     steps:
       - checkout
       - ruby/load-cache
@@ -17,20 +18,24 @@ jobs:
   "ruby-two-five":
     docker:
       - image: circleci/ruby:2.5
-      - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
   "ruby-two-six":
     docker:
       - image: circleci/ruby:2.6
-      - image: memcached:1.5-alpine
     steps:
       - checkout
       - ruby/load-cache
+      - run:
+          name: update bundler
+          command: gem update bundler
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
@@ -44,6 +49,19 @@ jobs:
       - ruby/install-deps
       - ruby/run-tests
       - ruby/save-cache
+  "sonarcloud":
+    docker:
+      - image: circleci/ruby:2.7
+    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
+      - sonarcloud/scan
+      - ruby/save-cache
 
 workflows:
   version: 2
@@ -58,4 +76,8 @@ workflows:
             - ruby-two-five
       - ruby-two-seven:
           requires:
-            - ruby-two-five
+            - ruby-two-five
+      - sonarcloud:
+          requires:
+            - ruby-two-seven
+            - ruby-two-six

data/.gitignore

@@ -9,6 +9,7 @@
 /tmp/
 /rspec/
 /test-results/
+.idea
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -1,11 +1,11 @@
-Metrics/LineLength:
+Layout/LineLength:
   Max: 120
 Metrics/MethodLength:
   Max: 30
 Metrics/ClassLength:
   Max: 1500
 Metrics/BlockLength:
-  Max: 50
+  Max: 75
 Layout/SpaceAroundEqualsInParameterDefault:
   EnforcedStyle: space
 Style/SymbolArray:
@@ -16,6 +16,7 @@ Layout/HashAlignment:
 Style/Documentation:
   Enabled: false
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.5
+  NewCops: enable
 Style/FrozenStringLiteralComment:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Legion::Logging Changelog
 
+## v1.1.1
+* Updating default log level to info instead of debug
+* Cleaning up some RSpec tests
+
 ## v0.1.3
 * Updating `.rubocop.yml`
 * Adding in logic for LOGGING-1 LOGGING-5

data/Gemfile

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

data/bitbucket-pipelines.yml

@@ -1,33 +1,18 @@
-image: ruby:2.4.0
+image: ruby:2.7.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:
-      - bundler
-      script:
-      - gem install bundle rubocop
-      - bundle install
-      - rubocop
-      - rake
-definitions:
-  caches:
-    bundler: vendor/bundle
+      - 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 release
+            - gem tag --push
+          artifacts:
+            - pkg/**

data/legion-logging.gemspec

@@ -18,11 +18,10 @@ Gem::Specification.new do |spec|
   spec.metadata['homepage_uri'] = 'https://bitbucket.org/legion-io/legion-logging'
   spec.metadata['source_code_uri'] = 'https://bitbucket.org/legion-io/legion-logging'
   spec.metadata['wiki_uri'] = 'https://bitbucket.org/legion-io/legion-logging/wiki/Home'
-
+  spec.required_ruby_version = '>= 2.5.0'
   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']
 
@@ -32,7 +31,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rspec_junit_formatter'
   spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'simplecov', '< 0.18.0'
 
   spec.add_dependency 'rainbow', '~> 3'
 end

data/lib/legion/logging.rb

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

data/lib/legion/logging/builder.rb

@@ -8,15 +8,15 @@ module Legion
             data = caller_locations[4].to_s.split('/').last(2)
             runner_trace = {
               type:        data[0],
-              file:        file = data[1].split('.')[0], # rubocop:disable Lint/UselessAssignment
+              file:        data[1].split('.')[0],
               function:    data[1].split('`')[1].delete_suffix('\''),
-              line_number: line_number = data[1].split(':')[1] # rubocop:disable Lint/UselessAssignment
+              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]
-            string.concat("[#{runner_trace[:file]}:#{runner_trace[:line_number]}]")
+          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
@@ -28,18 +28,19 @@ module Legion
         @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
       end
 
-      def log_level(level = 'debug', log = @log) # rubocop:disable  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-        if level == 'trace'
+      def log_level(level = 'info', log = @log)
+        case level
+        when 'trace'
           log.level = ::Logger::INFO
-        elsif level == 'debug'
+        when 'debug'
           log.level = ::Logger::DEBUG
-        elsif level == 'info'
+        when 'info'
           log.level = ::Logger::INFO
-        elsif level == 'warn'
+        when 'warn'
           log.level = ::Logger::WARN
-        elsif level == 'error'
+        when 'error'
           log.level = ::Logger::ERROR
-        elsif level == 'fatal'
+        when 'fatal'
           log.level = ::Logger::FATAL
         end
         @log = log

data/lib/legion/logging/logger.rb

@@ -5,6 +5,7 @@ module Legion
   module Logging
     class Logger
       attr_accessor :log, :color, :level, :lex, :log_file, :trace_enabled, :extended
+
       include Legion::Logging::Methods
       include Legion::Logging::Builder
 

data/lib/legion/logging/methods.rb

@@ -1,12 +1,12 @@
 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
+      def trace(raw_message = nil, log = @log, size: @trace_size, log_caller: true) # rubocop:disable  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
+        message.concat Rainbow("#{raw_message} ").cyan
         if log_caller && size.nil?
           message.concat Rainbow(caller_locations).cyan.underline
         elsif log_caller
@@ -68,7 +68,7 @@ module Legion
         { success: false, message: exc.message, backtrace: exc.backtrace }.merge(opts)
       end
 
-      def thread(kvl: false)
+      def thread(kvl: false, **_opts)
         if kvl
           "thread=#{Thread.current.object_id}"
         else

data/lib/legion/logging/version.rb

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

data/sonar-project.properties

@@ -0,0 +1,12 @@
+sonar.projectKey=legion-io_legion-logging
+sonar.organization=legion-io
+sonar.projectName=Legion::Logging
+sonar.sources=.
+sonar.exclusions=vendor/**
+sonar.coverage.exclusions=spec/**
+sonar.ruby.coverage.reportPath=coverage/.resultset.json
+sonar.ruby.file.suffixes=rb,ruby
+sonar.ruby.coverage.framework=RSpec
+sonar.ruby.rubocopConfig=.rubocop.yml
+sonar.ruby.rubocop.reportPath=rubocop-result.json
+sonar.ruby.rubocop.filePath=.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Esity
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +148,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - README.md
 - Rakefile
 - bitbucket-pipelines.yml
@@ -143,6 +158,7 @@ files:
 - lib/legion/logging/logger.rb
 - lib/legion/logging/methods.rb
 - lib/legion/logging/version.rb
+- sonar-project.properties
 homepage: https://bitbucket.org/legion-io/legion-logging
 licenses: []
 metadata:
@@ -152,7 +168,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
@@ -160,15 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: The Legion::Logging class
 test_files: []