legion-logging 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ae78475a7bea256635df87959272baf4bbdeb0e3
-  data.tar.gz: e6e405c933b6871bfb7f806f9e6ebd5f37e77175
+SHA256:
+  metadata.gz: 9e4eb810ca54086e6576b5112dc6cbd62d9d9f419fd042509bd7877e43840393
+  data.tar.gz: e2fa3f8e451bb71ba06b124b06f3a78f48f584e9cc5facfbb91aee1fedc62059
 SHA512:
-  metadata.gz: 61a6eb2fa4c498614977fee08dc3967c9d1036a324f043cd70b9e9943a3e0ba00961236483d0d51168160babaf9b13ad70c9c6a21431c9580964cd7c26b25a0f
-  data.tar.gz: ddcaecb7edd883c308ef3e65ef5237cd7f8b035da1eff65a2859e3c9968a5b24780e7a2a7de0f9d6e8ebd153688e437b457564b07f656924593a9a0acb7dfca8
+  metadata.gz: 51a2011955b5c7fff7d61418413ebc133dfe63913cdfa0be9a752c78dc812008cf7bd6a8b9ed2575821cc16c52aefba772125fe0ec766a807be31ec98d23da56
+  data.tar.gz: '044719a5b9527e0b0ca40b0f15bc6005c05c2a2934ba4c52a2a8a4ca11a193a214207ee3c0c9c9bb4fad68661c053d985316c7b2369d540136dd1c2242bf48e6'

data/legion-logging.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'codecov'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

data/lib/legion/logging.rb

@@ -1,89 +1,24 @@
 require 'legion/logging/version'
-# require 'legion/logging/logger'
+require 'legion/logging/logger'
+require 'legion/logging/methods'
+require 'legion/logging/builder'
 
 require 'logger'
 require 'rainbow'
 
 module Legion
-  # Logging Module
   module Logging
-    attr_accessor :logger
-    attr_accessor :color
-    # Self Class
     class << self
-      attr_accessor :log, :logger
+      include Legion::Logging::Methods
+      include Legion::Logging::Builder
+      attr_reader :log, :color
 
       def setup(options = {})
-        @log = ::Logger.new($stdout) if options[:log_file].nil?
-        @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
+        output(options)
         log_level(options[:level])
         log_format(options)
-
-        @log
-      end
-
-      def log_format(_options)
-        @log.formatter = proc do |severity, datetime, _progname, msg|
-          "[#{datetime}][#{::Process.pid}] #{severity} #{msg}\n"
-        end
-      end
-
-      def log_level(level = 'debug')
-        if level == 'debug'
-          @log.level = ::Logger::DEBUG
-        elsif level == 'info'
-          @log.level = ::Logger::INFO
-        elsif level == 'warn'
-          @log.level = ::Logger::WARN
-        elsif level == 'error'
-          @log.level = ::Logger::ERROR
-        elsif level == 'fatal'
-          @log.level = ::Logger::FATAL
-        end
-      end
-
-      def get(options = {})
-        setup(options)
-      end
-    end
-
-    def self.debug(message)
-      start_logger if @logger.nil?
-      message = Rainbow(message).blue if @color
-      @logger.debug(message)
-    end
-
-    def self.info(message)
-      start_logger if @logger.nil?
-      message = Rainbow(message).green if @color
-      @logger.info(message)
-    end
-
-    def self.warn(message)
-      start_logger if @logger.nil?
-      message = Rainbow(message).yellow if @color
-      @logger.warn(message)
-    end
-
-    def self.error(message)
-      start_logger if @logger.nil?
-      message = Rainbow(message).red if @color
-      @logger.error(message)
-    end
-
-    def self.fatal(message)
-      start_logger if @logger.nil?
-      message = Rainbow(message).darkred if @color
-      @logger.fatal(message)
-    end
-
-    def self.start_logger
-      @color = true
-      log_location = $stdout
-      @logger = Logger.new(log_location)
-      @logger.level = Logger::DEBUG
-      @logger.formatter = proc do |severity, datetime, _progname, msg|
-        "[#{datetime}][#{::Process.pid}] #{severity} #{msg}\n"
+        @color = options[:color]
+        @color = true if options[:color].nil? && options[:log_file].nil?
       end
     end
   end

data/lib/legion/logging/builder.rb

@@ -0,0 +1,31 @@
+module Legion
+  module Logging
+    module Builder
+      def log_format(_options = {}, log = @log)
+        log.formatter = proc do |severity, datetime, _progname, msg|
+          "[#{datetime}][#{::Process.pid}] #{severity} #{msg}\n"
+        end
+      end
+
+      def output(options)
+        @log = ::Logger.new($stdout) if options[:log_file].nil?
+        @log = ::Logger.new(options[:log_file]) unless options[:log_file].nil?
+      end
+
+      def log_level(level = 'debug', log = @log)
+        if level == 'debug'
+          log.level = ::Logger::DEBUG
+        elsif level == 'info'
+          log.level = ::Logger::INFO
+        elsif level == 'warn'
+          log.level = ::Logger::WARN
+        elsif level == 'error'
+          log.level = ::Logger::ERROR
+        elsif level == 'fatal'
+          log.level = ::Logger::FATAL
+        end
+        @log = log
+      end
+    end
+  end
+end

data/lib/legion/logging/logger.rb

@@ -0,0 +1,20 @@
+require 'legion/logging/methods'
+require 'legion/logging/builder'
+
+module Legion
+  module Logging
+    class Logger
+      attr_reader :log, :color
+      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?
+      end
+    end
+  end
+end

data/lib/legion/logging/methods.rb

@@ -0,0 +1,35 @@
+module Legion
+  module Logging
+    module Methods
+      def debug(message, log = @log)
+        message = Rainbow(message).blue if @color
+        log.debug(message)
+      end
+
+      def info(message, log = @log)
+        message = Rainbow(message).green if @color
+        log.info(message)
+      end
+
+      def warn(message, log = @log)
+        message = Rainbow(message).yellow if @color
+        log.warn(message)
+      end
+
+      def error(message, log = @log)
+        message = Rainbow(message).red if @color
+        log.error(message)
+      end
+
+      def fatal(message, log = @log)
+        message = Rainbow(message).darkred if @color
+        log.fatal(message)
+      end
+
+      def unknown(message, log = @log)
+        message = Rainbow(message).purple if @color
+        log.unknown(message)
+      end
+    end
+  end
+end

data/lib/legion/logging/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Logging
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: legion-logging
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Esity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,9 @@ files:
 - bitbucket-pipelines.yml
 - legion-logging.gemspec
 - lib/legion/logging.rb
+- lib/legion/logging/builder.rb
+- lib/legion/logging/logger.rb
+- lib/legion/logging/methods.rb
 - lib/legion/logging/version.rb
 homepage: https://bitbucket.org/legion-io/legion-logging
 licenses: []
@@ -172,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: The Legion::Logging class