twiglet 3.3.3 → 3.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9deeab3ebe1ca91277b1eaec6980a61e5bb4434ae4a8c4ee7025f2ead0bed7e3
-  data.tar.gz: 0c18af6ba979be04841730db5ee2418037d8e77728d5ee1495bce4522fee334b
+  metadata.gz: affcc4431661c8c826b37295be9d87c5051e760ec29748eec7ffa3ac6dec3f2f
+  data.tar.gz: 363651efac38ad6a78953d1083e1c3aed3e36cf10730dcfd839a29f182853636
 SHA512:
-  metadata.gz: 25a067c8e8ab1f751b5ffcec83542da3fac87aaeec59456938dfd3b33a6a6b9b0be5890b5ab4456ee7081ddc111d1953d23b86e4bf4931540515ab64838c1c2b
-  data.tar.gz: 379a36f5274f6025bdcefb48ea6e51db39ad4d8e675c21e87efb59adbc0e42829146bfc2c07f39dd5faa40ce61e554d051a54ad1eca4e2258b282a55638d271a
+  metadata.gz: 2f5d7d70a7dd94bf992a4e821c336b97601fc0e2c52a2b7c241553834ce5ccc21db0fb3944b5a52f631e22829cf6257e91e0e1551f6d6db8eeaa51294622f349
+  data.tar.gz: 5730b46609a5dc5d3ff9f85ad174aef2e811e1c3875c0960ac848b443053e2dbc8c11b8f141675aeac2adb927f5907881ef4c7a490c1c619c343340f921a4f08

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '42 8 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

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

@@ -1,4 +1,5 @@
-name: "dobby action"
+
+name: "Dobby action"
 on:
   issue_comment:
     types: [created]
@@ -6,10 +7,20 @@ jobs:
   pr_commented:
     runs-on: ubuntu-20.04
     if: startsWith(github.event.comment.body, '/dobby')
-
+    env:
+      BUNDLE_WITHOUT: "development:test"
     steps:
-      - name: bump version
-        uses: simplybusiness/dobby@v2.1.0
+      - name: Chekcout action
+        uses: actions/checkout@v2
+        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.0
         env:
           DOBBY_APP_ID: ${{ secrets.DOBBY_APP_ID }}
           DOBBY_PRIVATE_KEY: ${{ secrets.DOBBY_PRIVATE_KEY }}

data/catalog-info.yaml

@@ -3,10 +3,6 @@ kind: Component
 metadata:
   name: twiglet
   description: simple logging
-  annotations:
-    github.com/project-slug: "simplybusiness/twiglet-ruby"
-    backstage.io/source-location: url:https://github.com/simplybusiness/twiglet-ruby/
-    backstage.io/techdocs-ref: url:https://github.com/simplybusiness/twiglet-ruby/
 spec:
   type: library
   lifecycle: production

data/lib/twiglet/logger.rb

@@ -46,7 +46,7 @@ module Twiglet
       if error
         error_fields = {
           error: {
-            type: error.class,
+            type: error.class.to_s,
             message: error.message
           }
         }

data/lib/twiglet/version.rb

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

data/test/logger_test.rb

@@ -242,6 +242,16 @@ describe Twiglet::Logger do
       assert_equal 'StandardError', actual_log[:error][:type]
       assert_equal 'Unknown error', actual_log[:error][:message]
     end
+
+    it 'should log error type properly even when active_support/json is required' do
+      require 'active_support/json'
+      e = StandardError.new('Unknown error')
+      @logger.error('Artificially raised exception with string message', e)
+
+      actual_log = read_json(@buffer)
+
+      assert_equal 'StandardError', actual_log[:error][:type]
+    end
   end
 
   describe 'text logging' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twiglet
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.7
 platform: ruby
 authors:
 - Simply Business
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
 - ".github/dependabot.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/dobby-actions.yml"
 - ".github/workflows/gem-publish.yml"
 - ".github/workflows/ruby.yml"