twiglet 3.5.4 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8ba648b25202c2ee3c47bdd3885e879681ec1b4e3685edf97905b16a6caeb7
-  data.tar.gz: 78547321be656034d05e9dfacb29f913214a5ed540355d4050675e55b5302ac0
+  metadata.gz: 76f00aef2cd70ee47d990053fe16f449a5634b31665773d577888db89964cb25
+  data.tar.gz: 5d341c7f95bd99d88258121e25f1946e34d25951962082f9e3dc966738d07de0
 SHA512:
-  metadata.gz: a9c8563acaa808a3491c386a5c57025089d83033cf35d38baf92b4abb2d9cb88ee52827155c03504c4d012d50df8acecb084b649239e558dbeca2817b016734d
-  data.tar.gz: 97d2797e525c3dd2dd19d9a6e5fde20226fa2675d40be1d3e7c2ba57dc6833dcb601ebe1e62f7c7827113f9a260cb642c40b3cfbc32bed0db9ba4b5d76f0dd61
+  metadata.gz: c5c6a7a188f8f4a5e0ac35f07d86dd2327fb630b232bd1c3f2d57f6ae638c4dd73f560ade3e5307f0b370b782d959b50e91b5c30d31b090a9784265af7a8eac5
+  data.tar.gz: 398bcd53aba62e0b97893735928efeb6b9c50c3a3ae6464ad124ba09a62280b0db11caf7dc9d71f0d50bfc352546504e7cf9733e95eb6b552c75a5c6caa3678f

data/.github/workflows/dobby-actions.yml

@@ -7,23 +7,8 @@ permissions:
   contents: read
 jobs:
   pr_commented:
-    runs-on: ubuntu-20.04
-    if: startsWith(github.event.comment.body, '/dobby')
-    env:
-      BUNDLE_WITHOUT: "development:test"
-    steps:
-      - name: Chekcout action
-        uses: actions/checkout@v3
-        with:
-          repository: 'simplybusiness/dobby'
-          ref: 'v3.0.0'
-      - name: Set up ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-      - name: Bump version
-        uses: simplybusiness/dobby@v3.0.1
-        env:
-          DOBBY_APP_ID: ${{ secrets.DOBBY_APP_ID }}
-          DOBBY_PRIVATE_KEY: ${{ secrets.DOBBY_PRIVATE_KEY }}
-          VERSION_FILE_PATH: lib/twiglet/version.rb
+      uses: simplybusiness/github-action-reusable-workflows/.github/workflows/dobby.yaml@v1
+      with:
+        version_file_path: ./lib/twiglet/version.rb
+      secrets: inherit
+

data/lib/twiglet/logger.rb

@@ -42,17 +42,26 @@ module Twiglet
       @validator.custom_error_handler = block
     end
 
+    def debug(message_or_error = nil, &block)
+      message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
+
+      super(message, &block)
+    end
+
+    def info(message_or_error = nil, &block)
+      message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
+
+      super(message, &block)
+    end
+
+    def warn(message_or_error = nil, &block)
+      message = message_or_error.is_a?(Exception) ? error_message(message_or_error) : message_or_error
+
+      super(message, &block)
+    end
+
     def error(message = nil, error = nil, &block)
-      if error
-        error_fields = {
-          error: {
-            type: error.class.to_s,
-            message: error.message
-          }
-        }
-        add_stack_trace(error_fields, error)
-        message = Message.new(message).merge(error_fields)
-      end
+      message = error_message(error, message) if error
 
       super(message, &block)
     end
@@ -76,6 +85,18 @@ module Twiglet
 
     private
 
+    def error_message(error, message = nil)
+      error_fields = {
+        error: {
+          type: error.class.to_s,
+          message: error.message
+        }
+      }
+      add_stack_trace(error_fields, error)
+      message = error.message if message.nil? || message.empty?
+      Message.new(message).merge(error_fields)
+    end
+
     def add_stack_trace(hash_to_add_to, error)
       hash_to_add_to[:error][:stack_trace] = error.backtrace if error.backtrace
     end

data/lib/twiglet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Twiglet
-  VERSION = '3.5.4'
+  VERSION = '3.6.1'
 end

data/test/logger_test.rb

@@ -361,6 +361,31 @@ describe Twiglet::Logger do
 
       assert_equal 'StandardError', actual_log[:error][:type]
     end
+
+    it 'can log just an error as "error", if no message is given' do
+      e = StandardError.new('some error')
+      @logger.error(nil, e)
+
+      actual_log = read_json(@buffer)
+
+      assert_equal 'some error', actual_log[:message]
+      assert_equal 'StandardError', actual_log[:error][:type]
+      assert_equal 'some error', actual_log[:error][:message]
+    end
+
+    [:debug, :info, :warn].each do |level|
+      it "can log an error with type, error message etc.. as '#{level}'" do
+        error_message = "error to be logged as #{level}"
+        e = StandardError.new(error_message)
+        @logger.public_send(level, e)
+
+        actual_log = read_json(@buffer)
+
+        assert_equal error_message, actual_log[:message]
+        assert_equal 'StandardError', actual_log[:error][:type]
+        assert_equal error_message, actual_log[:error][:message]
+      end
+    end
   end
 
   describe 'text logging' do
@@ -420,6 +445,15 @@ describe Twiglet::Logger do
         assert_equal 'a block log message', actual_log[:message]
       end
     end
+
+    it 'should ignore the given progname if a block is also given' do
+      block = proc { 'a block log message' }
+      @logger.info('my-program-name', &block)
+      actual_log = read_json(@buffer)
+
+      assert_equal 'info', actual_log[:log][:level]
+      assert_equal 'a block log message', actual_log[:message]
+    end
   end
 
   describe 'dotted keys' do

data/twiglet.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |gem|
   gem.description           = 'Like a log, only smaller.'
 
   gem.files                 = `git ls-files`.split("\n")
-  gem.test_files            = `git ls-files -- {test}/*`.split("\n")
 
   gem.require_paths         = ['lib']
   gem.required_ruby_version = '>= 2.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twiglet
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.6.1
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-11 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema