Fix OpenSSL version conflict + decouple Ruby & dependencies entirely from Apple base OS libraries

.editorconfig

@@ -0,0 +1,21 @@
+## shfmt configuration
+[*.sh]
+# -i=2
+indent_style = space
+indent_size = 2
+
+# --language-dialect
+shell_variant      = bash
+binary_next_line   = true
+# --case-indent
+switch_case_indent = true
+space_redirects    = true
+keep_padding       = false
+# --func-next-line
+function_next_line = false
+
+# Ignore directories when calling shfmt recursively
+[tmp/librarian/**]
+ignore = true
+[vendor/**]
+ignore = true

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-13, macos-14, macos-15]
+        os: [self-hosted-macos-12, macos-13, macos-14]
     steps:
       - name: DEBUG What is GitHub Actions IP?
         run: |
@@ -67,18 +67,18 @@ jobs:
           sudo tee -a ~root/.profile <<EOPROFILE
           SSH_AUTH_SOCK=${{ env.SSH_AUTH_SOCK }}
           EOPROFILE
-      - uses: ruby/setup-ruby@v1
-        with:
-          bundler-cache: true
-          cache-version: 1
-      - name: Set BREWFILE_PATH env var
-        run: |
-          echo "BREWFILE_PATH=${GITHUB_WORKSPACE}/test/fixtures/tmp/Brewfile.ci" >> $GITHUB_ENV
-      - name: DEBUG - GitHub Cache Paths BREWFILE_PATH
-        run: |
-          echo BREWFILE_PATH=$BREWFILE_PATH
-          echo GITHUB_WORKSPACE=$GITHUB_WORKSPACE
-        if: ${{ env.debug_ci == 'true' || runner.debug == '1' }}
+      # - uses: ruby/setup-ruby@v1
+      #   with:
+      #     bundler-cache: true
+      #     cache-version: 1
+      # - name: Set BREWFILE_PATH env var
+      #   run: |
+      #     echo "BREWFILE_PATH=${GITHUB_WORKSPACE}/test/fixtures/tmp/Brewfile.ci" >> $GITHUB_ENV
+      # - name: DEBUG - GitHub Cache Paths BREWFILE_PATH
+      #   run: |
+      #     echo BREWFILE_PATH=$BREWFILE_PATH
+      #     echo GITHUB_WORKSPACE=$GITHUB_WORKSPACE
+      #   if: ${{ env.debug_ci == 'true' || runner.debug == '1' }}
       - name: DEBUG - Print all shell env exports
         run: export -p
         if: ${{ env.debug_ci == 'true' || runner.debug == '1' }}
@@ -87,8 +87,8 @@ jobs:
           ls -lAR ${GITHUB_WORKSPACE}
           ls -lR /usr/local/Homebrew
         if: ${{ env.debug_ci == 'true' || runner.debug == '1' }}
-      - name: Generate Brewfile from soloistrc test fixture
-        run: make brewfile
+      # - name: Generate Brewfile from soloistrc test fixture
+      #   run: make brewfile
       - name: DEBUG - Where are Brewfiles?
         run: |
           find ${GITHUB_WORKSPACE} -iname 'Brewfile*'
@@ -128,3 +128,16 @@ jobs:
         run: |
           find ${GITHUB_WORKSPACE} \( -type d -a \( -name '*/nodes' -o -name '*/vendor' \) -prune \) -o -iname 'Brewfile*'
         if: ${{ env.debug_ci == 'true' || runner.debug == '1' }}
+      - name: Upload Logs on failure
+        if: ${{ failure() }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: Build failure logs
+          path: |
+            /var/log/install.log
+            ~/.rvm/log/**/*.log
+            ~/Library/Logs/Homebrew/**/*
+            ~/.rvm/rubies/ruby-*/lib/ruby/gems/*/extensions/**/mkmf.log
+            ~/.rvm/rubies/ruby-*/lib/ruby/gems/*/extensions/**/gem_make.out
+          overwrite: true
+          compression-level: 9

.gitignore

@@ -2,3 +2,4 @@ tmp/
 cookbooks/
 .bundle/
 vendor/bundle
+*.sublime-workspace

.kitchen.libvirt.qemu-tls.yml

@@ -22,7 +22,7 @@ driver:
   vagrantfiles:
     - 'test/fixtures/Vagrantfile.libvirt-qemu-tls'
   synced_folders:
-  - [".", "/tmp/kitchen/soloist", "disabled: false, type: 'rsync'"]
+  - [".", "/tmp/kitchen/soloist", "disabled: false, type: 'rsync', owner: 'vagrant', group: 'staff'"]
   # TODO: Find & fix bugs in Vagrant where it checks for vagrant-host path... needs to support remote NFS & 9p libvirt mounts
   # TODO: Fix mount: false setting for 9p
   # TODO: Fix auto-mount capability for Darwin / macOS... needs mount_9p support (see man mount_9p)
@@ -70,7 +70,8 @@ platforms:
   - name: macos-12-1
     driver:
       box: lyraphase-runner/macos-monterey-base
-      box_url: http://saturn.local:8888/lyraphase-runner-macos-monterey-base.box
+      # box_url: http://saturn.internal:8888/lyraphase-runner-macos-monterey-base.box
+      box_url: http://saturn.internal:8888/lyraphase-runner-macos-monterey-12-1-base.new-zstd-xz.box
       communicator: ssh
       gui: true
       customize:

.ruby-version

@@ -1 +1 @@
-3.1.0
+3.1.6

.rubygems-version

@@ -1 +1 @@
-3.3.4
+3.3.27

.sublime-text/sprout-wrap.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "../."
+		}
+	]
+}

.vscode/sprout-wrap.code-workspace

@@ -4,5 +4,12 @@
 			"path": ".."
 		}
 	],
-	"settings": {}
+	"settings": {
+		"shellformat.useEditorConfig": true
+	},
+	"extensions": {
+		"recommendations": [
+			"foxundermoon.shell-format"
+		]
+	}
 }

Cheffile → Berksfile

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
-site 'https://supermarket.getchef.com/api/v1'
+solver :gecode
+source 'https://supermarket.chef.io'
 
 cookbook 'sprout-rbenv',
   :github => 'pivotal-sprout/sprout-rbenv'
@@ -40,7 +41,7 @@ cookbook 'sprout-ssh',
 cookbook 'plist',
  :github => 'carsomyr/chef-plist',
  :ref => 'master',
- :path => 'vendor/cookbooks/plist'
+ :rel => 'vendor/cookbooks/plist'
 
 cookbook 'lyraphase_workstation', '~> 3.4',
  :github => 'LyraPhase/lyraphase_workstation'

Berksfile.lock

@@ -0,0 +1,98 @@
+DEPENDENCIES
+  build-essential (= 3.2.0)
+  homebrew (~> 5.3.0)
+  lyraphase_workstation
+    git: https://github.com/LyraPhase/lyraphase_workstation.git
+    revision: 21b54cbb315c00bc878d1ebc8e40ef3ed33241f8
+  mingw (= 0.1.1)
+  osx
+    git: https://github.com/pivotal-sprout/osx.git
+    revision: 57820f0c0f4b08e9cff82a57a7489f9dcc9345f7
+  plist
+    git: https://github.com/carsomyr/chef-plist.git
+    revision: b66cf5a243c26b33a8e822c69fd5beb20bf60836
+    ref: master
+    rel: vendor/cookbooks/plist
+  sprout-base
+    git: https://github.com/pivotal-sprout/sprout-base.git
+    revision: a7f515dd6ec08e682c9fb0637c8a153fa275e19f
+  sprout-git
+    git: https://github.com/pivotal-sprout/sprout-git.git
+    revision: 4b9cbcad5cfc88b7324f00a78439117e8c7a7e77
+  sprout-jetbrains-editors
+    git: https://github.com/pivotal-sprout/sprout-jetbrains-editors.git
+    revision: bcfcb62c1095a9ef33477f896ebda47918ad7618
+  sprout-mysql
+    git: https://github.com/pivotal-sprout/sprout-mysql.git
+    revision: 12a264fe5418ae9fc6f5300fe56abec058f4a743
+  sprout-osx-apps
+    git: https://github.com/pivotal-sprout/sprout-osx-apps.git
+    revision: abe74e25ac963746f6178cb8e371d51c8bbd9de0
+  sprout-osx-settings
+    git: https://github.com/pivotal-sprout/sprout-osx-settings.git
+    revision: 62630bea50cea7b24058854a5a216c3a4dbbe4ef
+  sprout-postgresql
+    git: https://github.com/pivotal-sprout/sprout-postgresql.git
+    revision: 97558d741bc7f0e1ea6c2f896dd2a3706b26c7ec
+  sprout-rbenv
+    git: https://github.com/pivotal-sprout/sprout-rbenv.git
+    revision: aacfd19f867511715e6070988013ed453d268efb
+  sprout-ruby
+    git: https://github.com/pivotal-sprout/sprout-ruby.git
+    revision: 2fc7d5273fccd978321450b61088bbd608867dfc
+  sprout-ssh
+    git: https://github.com/pivotal-sprout/sprout-ssh.git
+    revision: b3ac3a04d9b9494b32514e69b33720fd51f46224
+  sprout-terminal
+    git: https://github.com/pivotal-sprout/sprout-terminal.git
+    revision: 6d9be928aa0041f455d3721b14c89c5e068f5e04
+
+GRAPH
+  build-essential (3.2.0)
+    seven_zip (>= 0.0.0)
+  dmg (4.1.1)
+  homebrew (5.3.8)
+  lyraphase_workstation (3.4.1)
+    homebrew (>= 0.0.0)
+    osx (>= 0.0.0)
+    plist (~> 0.9)
+    sprout-base (>= 0.0.0)
+  mingw (0.1.1)
+    seven_zip (>= 0.0.0)
+  osx (0.1.0)
+  plist (0.9.4)
+  seven_zip (4.2.11)
+  sprout-base (0.7.0)
+    homebrew (>= 0.0.0)
+  sprout-git (0.4.0)
+    homebrew (>= 0.0.0)
+    sprout-base (>= 0.0.0)
+  sprout-jetbrains-editors (0.1.0)
+    homebrew (>= 0.0.0)
+    sprout-base (>= 0.0.0)
+  sprout-mysql (0.1.0)
+    homebrew (>= 0.0.0)
+    sprout-base (>= 0.0.0)
+  sprout-osx-apps (0.2.0)
+    dmg (>= 0.0.0)
+    homebrew (>= 1.6.6)
+    sprout-base (>= 0.0.0)
+    sprout-osx-settings (>= 0.0.0)
+  sprout-osx-settings (0.1.0)
+    homebrew (>= 0.0.0)
+    osx (>= 0.0.0)
+    sprout-base (>= 0.0.0)
+  sprout-postgresql (0.1.0)
+    homebrew (>= 1.5.4)
+    sprout-base (>= 0.0.0)
+  sprout-rbenv (0.1.0)
+    homebrew (>= 0.0.0)
+    sprout-base (>= 0.0.0)
+  sprout-ruby (0.1.0)
+    sprout-base (>= 0.0.0)
+  sprout-ssh (0.1.0)
+    sprout-base (>= 0.0.0)
+    sprout-osx-settings (>= 0.0.0)
+  sprout-terminal (0.1.0)
+    osx (>= 0.0.0)
+    sprout-base (>= 0.0.0)

Brewfile

@@ -2,3 +2,19 @@
 tap "homebrew/cask"
 
 cask 'chef-workstation'
+brew 'rust'
+brew 'rustup-init'
+brew 'jemalloc'
+brew 'xz'
+brew 'gdbm'
+brew 'openssl@3'
+brew 'readline'
+brew 'ncurses'
+brew 'libyaml'
+brew 'libksba'
+brew 'pkg-config'
+brew 'libffi'
+brew 'libxml2'
+brew 'libxslt'
+brew 'libiconv'
+brew 'zlib'