Merge pull request #115 from github/ruby-updates

Author: GrantBirki

.bundle/config

@@ -0,0 +1,7 @@
+---
+BUNDLE_BIN: "bin"
+BUNDLE_PATH: "vendor/gems"
+BUNDLE_CACHE_PATH: "vendor/cache"
+BUNDLE_CACHE_ALL: "true"
+BUNDLE_SPECIFIC_PLATFORM: "true"
+BUNDLE_NO_INSTALL: "true"

.github/workflows/lint.yml

@@ -22,5 +22,8 @@ jobs:
         with:
           bundler-cache: true
 
+      - name: bootstrap
+        run: script/bootstrap
+
       - name: lint
-        run: bundle exec rubocop -c .rubocop.yml lib/ spec/
+        run: script/lint

.github/workflows/release.yml

@@ -28,7 +28,7 @@ jobs:
         run: script/bootstrap
 
       - name: lint
-        run: bundle exec rubocop -c .rubocop.yml lib/ spec/
+        run: script/lint
 
       - name: test
         run: script/test

.github/workflows/test.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '3.1.2', '3.1.4', '3.2.2', '3.2.3', '3.3.0', '3.3.1' ]
+        ruby: [ '3.1.2', '3.1.4', '3.2.2', '3.2.3', '3.3.0', '3.3.1', '3.4.0', '3.4.2' ]
 
     steps:
       - name: checkout
@@ -26,5 +26,8 @@ jobs:
           bundler-cache: true
           ruby-version: ${{ matrix.ruby }}
 
+      - name: bootstrap
+        run: script/bootstrap
+
       - name: test
-        run: script/test -k
+        run: script/test

.gitignore

@@ -1,4 +1,3 @@
-.bundle
 bin
 coverage
 logs

.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.2

lib/version.rb

@@ -2,6 +2,6 @@
 
 module RedactingLogger
   module Version
-    VERSION = "1.4.0"
+    VERSION = "1.4.1"
   end
 end

script/bootstrap

@@ -1,54 +1,16 @@
 #! /usr/bin/env bash
 
-# COLORS
-OFF='\033[0m'
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-BLUE='\033[0;34m'
-PURPLE='\033[0;35m'
+set -e # prevent any kind of script failures
 
-set -e # Prevent any kind of script failures
+source script/env "$@"
 
-# if any of the following env vars are set, use them for the APP_ENV value
-if [ -n "$APP_ENV" ]; then
-  export APP_ENV="$APP_ENV"
-elif [ -n "$ENV" ]; then
-  export APP_ENV="$ENV"
-elif [ -n "$ENVIRONMENT" ]; then
-  export APP_ENV="$ENVIRONMENT"
-elif [ -n "$RAILS_ENV" ]; then
-  export APP_ENV="$RAILS_ENV"
-elif [ -n "$RACK_ENV" ]; then
-  export APP_ENV="$RACK_ENV"
-fi
-
-# set the working directory to the root of the project
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
-
-# set the ruby version to the one specified in the .ruby-version file
-[ -z "$RBENV_VERSION" ] && export RBENV_VERSION=$(cat "$DIR/.ruby-version")
-
-# set the app environment to development if it's not set
-[ -z "$APP_ENV" ] && export APP_ENV="development"
-
-# set the path to include the rbenv shims if they exist
-[ -d "/usr/share/rbenv/shims" ] && export PATH=/usr/share/rbenv/shims:$PATH
-
-TRASHDIR=$(mktemp -d /tmp/bootstrap.XXXXXXXXXXXXXXXXX)
-cleanup() {
-  rm -rf "$TRASHDIR"
-  # Remove empty directory
-  rmdir "$DIR/vendor/cache" 2>/dev/null || true
-}
-trap cleanup EXIT
-
-# Bootstrap gem dependencies.
-if [ "$APP_ENV" == "production" ]; then
-  echo -e "💎 ${BLUE}Installing Gems for ${GREEN}production${BLUE}...${OFF}"
-  BUNDLE_WITHOUT=development bundle install --local
-  BUNDLE_WITHOUT=development bundle binstubs --all
+# bootstrap gem dependencies
+if [ "$BUNDLE_WITHOUT" == "" ]; then
+  echo -e "${BLUE}Installing Gems for ${PURPLE}development${BLUE}...${OFF}"
 else
-  echo -e "💎 ${BLUE}Installing Gems for ${PURPLE}development${BLUE}...${OFF}"
-  bundle install --local
-  bundle binstubs --all
+  echo -e "${BLUE}Installing Gems for ${GREEN}production${BLUE}...${OFF}"
 fi
+
+# what gets installed is set via the BUNDLE_WITHOUT env var in the script/env file
+bundle install --local
+bundle binstubs --all

script/env

@@ -0,0 +1,57 @@
+#! /usr/bin/env bash
+
+set -e # prevent any kind of script failures
+
+# COLORS
+export OFF='\033[0m'
+export RED='\033[0;31m'
+export GREEN='\033[0;32m'
+export BLUE='\033[0;34m'
+export PURPLE='\033[0;35m'
+
+# set RUBY_ENV to development (as a default) if not set
+: "${RUBY_ENV:=development}"
+
+export RUBY_ENV
+
+# set the working directory to the root of the project
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )"
+export DIR
+
+# The name of the repository is the name of the directory (usually)
+REPO_NAME=$(basename "$PWD")
+export REPO_NAME
+
+# set the ruby version to the one specified in the .ruby-version file
+[ -z "$RBENV_VERSION" ] && RBENV_VERSION=$(cat "$DIR/.ruby-version")
+export RBENV_VERSION
+
+# set the path to include the rbenv shims if they exist
+[ -d "/usr/share/rbenv/shims" ] && export PATH=/usr/share/rbenv/shims:$PATH
+
+# detect OS version and architecture
+if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    PLATFORM="linux"
+    VERSION=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d '=' -f2 || echo "unknown")
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    PLATFORM="macos"
+    VERSION=$(sw_vers -productVersion || echo "unknown")
+else
+    PLATFORM="unknown"
+    VERSION="unknown"
+fi
+
+ARCH=$(uname -m || echo "unknown")
+
+export PLATFORM
+export VERSION
+export ARCH
+
+shopt -s nocasematch # enable case-insensitive matching
+if [[ "$RUBY_ENV" == "production" ]]; then
+  export BUNDLE_WITHOUT="development"
+fi
+shopt -u nocasematch # disable case-insensitive matching
+
+# make the vendor/cache directory if it doesn't exist
+mkdir -p "$DIR/vendor/cache"

script/lint

@@ -0,0 +1,10 @@
+#! /usr/bin/env bash
+
+set -e
+
+source script/env "$@"
+
+# run linter
+echo -e "\n🤖 ${BLUE}Running Rubocop: $(date "+%H:%M:%S")${OFF}\n"
+
+bundle exec rubocop -c .rubocop.yml lib/ spec/ "$@"