reorganized bin/scripts dirs

Author: ndbroadbent

.cspell/project-words.txt

@@ -49,3 +49,4 @@ vercel
 wordlists
 xorshift
 yardoc
+TESTOPTS

.github/workflows/test.yml

@@ -25,29 +25,40 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
-          cache-dependency-path: |
-            package-lock.json
-            site/package-lock.json
 
-      - name: Install dependencies
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: latest
+
+      - name: Get pnpm store directory
+        shell: bash
         run: |
-          # Install root and site npm dependencies
-          npm ci
-          cd site && npm ci && cd ..
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
-          # Make sure bundler is using the correct Ruby version
-          ruby -v
+      - name: Install npm packages
+        run: |
+          # Install root and site pnpm dependencies
+          pnpm install --frozen-lockfile
+          cd site && pnpm install --frozen-lockfile && cd ..
 
       - name: Generate CSpell dictionaries from package lockfiles
         run: |
-          bin/generate_lockfile_words
+          scripts/generate_lockfile_words.sh
 
       - name: CSpell (Spellcheck)
-        run: bin/spellcheck
+        run: scripts/spellcheck.sh
 
       - name: Prettier (Formatting)
-        run: bin/prettier --check
+        run: scripts/prettier.sh --check
 
       - name: Tapioca (Verify RBI files)
         run: |
@@ -74,10 +85,10 @@ jobs:
           fi
 
       - name: RuboCop (Linting/Formatting)
-        run: bin/rubocop
+        run: scripts/rubocop.rb
 
       - name: Sorbet (Typecheck)
-        run: bin/typecheck
+        run: scripts/typecheck.sh
 
   site:
     name: 'Next.js Site Tests'
@@ -95,23 +106,39 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version: 20
-          cache: 'npm'
-          cache-dependency-path: 'site/package-lock.json'
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: latest
+
+      - name: Get pnpm store directory
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Setup pnpm cache
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
 
       - name: Install site dependencies
-        run: cd site && npm ci
+        run: cd site && pnpm install --frozen-lockfile
 
       - name: Export TypeScript types from LogStruct
         run: |
           scripts/export_typescript_types.rb
 
       - name: TypeScript type checking
         run: |
-          cd site && npx tsc --noEmit
+          cd site && pnpm exec tsc --noEmit
 
       - name: Run TypeScript tests
         run: |
-          cd site && npm test
+          cd site && pnpm test
 
   pilot:
     name: 'Pilot Test: Ruby 3.4 / Rails 8.0'
@@ -136,15 +163,15 @@ jobs:
 
       # Coverage: /coverage
       - name: Run tests
-        run: bin/test
+        run: scripts/test.rb
 
       # Coverage: /coverage_rails
       - name: Run Rails integration tests
-        run: bin/rails_tests
+        run: scripts/rails_tests.sh
 
       # Merges /coverage and /coverage_rails into /site/public/coverage/
       - name: Merge coverage reports
-        run: bin/merge_coverage
+        run: scripts/merge_coverage.sh
 
       # Save merged coverage data as an artifact for deploy workflow
       - name: Upload coverage reports
@@ -196,7 +223,7 @@ jobs:
           bundler-cache: true
 
       - name: Run Ruby tests
-        run: bin/test
+        run: scripts/test.rb
 
       - name: Run Rails integration tests
-        run: bin/rails_tests
+        run: scripts/rails_tests.sh

.rubocop.yml

@@ -21,6 +21,7 @@ AllCops:
     - sorbet/rbi/gems/**/*
     - sorbet/rbi/annotations/**/*
     - rails_test_app/logstruct_test_app/**/*
+    - bin/**/* # Exclude bundler-generated binstubs
 
 Layout/MultilineHashKeyLineBreaks:
   Enabled: true
@@ -92,6 +93,8 @@ Sorbet/TrueSigil:
     - 'test/**/*.rb'
     - 'rails_test_app/**/*.rb'
     - 'scripts/**/*.rb'
+  Exclude:
+    - 'scripts/test.rb' # Has dynamic code that Sorbet can't handle
   SuggestedStrictness: true
 
 # Don't try to validate typing on generated Sorbet RBI files

CLAUDE.md

@@ -2,45 +2,47 @@
 
 ## 🚨 CRITICAL RULES - MUST ALWAYS BE FOLLOWED 🚨
 
-1. **NEVER mark a feature as done until `./bin/all_check` is passing (all linters and tests)**
-2. **NO EXCEPTIONS to the above rules - features are NOT complete until all checks pass**
-3. **This rule must ALWAYS be followed no matter what**
+1. **NEVER mark a feature as done until `./scripts/all_check.sh` and `./scripts/all_tests.sh` are ALL passing**
+2. **ALWAYS run both `./scripts/all_check.sh` and `./scripts/all_tests.sh` before claiming completion**
+3. **NO EXCEPTIONS to the above rules - features are NOT complete until all checks pass**
+4. **This rule must ALWAYS be followed no matter what**
 
 ## Commands
 
 ### Core Commands
 
-- Setup: `bin/setup`
-- Run all checks: `bin/all` (runs typecheck, export, lint, test, etc.)
-- Interactive console: `bin/console`
+- Setup: `scripts/setup.sh`
+- Run all checks: `scripts/all_check.sh` (runs typecheck, export, lint, test, etc.)
+- Run all checks with auto-fix: `scripts/all_write.sh`
+- Interactive console: `scripts/console.rb`
 
 ### Testing Commands
 
-- Run all tests (unit + Rails integration): `bin/all_tests`
-- Run all Ruby unit tests: `bin/test`
-- Run single test file: `bin/test test/path_to_test.rb`
-- Run test at specific line: `bin/test test/path_to_test.rb:LINE_NUMBER`
-- Run test by name: `bin/test -n=test_method_name`
+- Run all tests (unit + Rails integration): `scripts/all_tests.sh`
+- Run all Ruby unit tests: `scripts/test.rb`
+- Run single test file: `scripts/test.rb test/path_to_test.rb`
+- Run test at specific line: `scripts/test.rb test/path_to_test.rb:LINE_NUMBER`
+- Run test by name: `scripts/test.rb -n=test_method_name`
 - Debug a specific test: Add `debugger` statements (developer only)
-- Run Rails integration tests: `bin/rails_tests`
-- Merge coverage reports: `bin/merge_coverage`
+- Run Rails integration tests: `scripts/rails_tests.sh`
+- Merge coverage reports: `scripts/merge_coverage.sh`
 - Run Next.js TypeScript tests: `cd site && npm test`
 
 ### Quality Commands
 
-- Ruby typecheck: `bin/typecheck`
-- Next.js typecheck: `cd site && npx tsc --noEmit`
-- Lint Ruby: `bin/rubocop`
-- Format Ruby: `bin/rubocop -A`
-- Format JS/TS/JSON: `bin/prettier --write`
-- Lint JS/TS/JSON: `bin/prettier --check`
-- Spellcheck: `bin/spellcheck`
+- Ruby typecheck: `scripts/typecheck.sh`
+- Next.js typecheck: `cd site && pnpm exec tsc --noEmit`
+- Lint Ruby: `scripts/rubocop.rb`
+- Format Ruby: `scripts/rubocop.rb -A`
+- Format JS/TS/JSON: `scripts/prettier.sh --write`
+- Lint JS/TS/JSON: `scripts/prettier.sh --check`
+- Spellcheck: `scripts/spellcheck.sh`
 
 ### Development Commands
 
-- Generate Sorbet RBI files: `bin/tapioca`
-- Generate spellcheck dictionary: `bin/generate_lockfile_words`
-- Generate TypeScript types from Ruby log structs: `ruby scripts/export_typescript_types.rb`
+- Generate Sorbet RBI files: `scripts/tapioca.rb`
+- Generate spellcheck dictionary: `scripts/generate_lockfile_words.sh`
+- Generate TypeScript types from Ruby log structs: `scripts/export_typescript_types.rb`
 
 # Core Dependencies
 

DEVELOPMENT.md

@@ -107,9 +107,9 @@ And you always need to check for any third-party gems that are not part of Rails
 - Follow test-driven development principles
 - Write tests for all new features
 - Ensure all tests pass before submitting a pull request
-- Regular tests: `bin/test`
-- Rails integration tests: `bin/test_with_rails`
-- You can specify Rails version for integration tests: `RAILS_VERSION=7.1.3 bin/test_with_rails`
+- Regular tests: `scripts/test.rb`
+- Rails integration tests: `scripts/rails_tests.sh`
+- You can specify Rails version for integration tests: `RAILS_VERSION=7.1.3 scripts/rails_tests.sh`
 
 ## Working with Sorbet and Tapioca
 

Rakefile

@@ -19,7 +19,7 @@ Dir.glob("tasks/*.rake").each { |r| load r }
 # Rails application integration tests
 desc "Run Rails integration tests"
 task :rails_tests do
-  script_path = File.expand_path("bin/rails_tests", __dir__)
+  script_path = File.expand_path("scripts/rails_tests.sh", __dir__)
   system(script_path) || abort("Rails tests failed")
 end
 

bin/bundle

@@ -0,0 +1,109 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+  module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a.match?(Gem::Version::ANCHORED_VERSION_PATTERN)
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, ".locked")
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_requirement
+    @bundler_requirement ||=
+      env_var_version ||
+      cli_arg_version ||
+      bundler_requirement_for(lockfile_version)
+  end
+
+  def bundler_requirement_for(version)
+    return "#{Gem::Requirement.default}.a" unless version
+
+    bundler_gem_version = Gem::Version.new(version)
+
+    bundler_gem_version.approximate_recommendation
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    activate_bundler
+  end
+
+  def activate_bundler
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_requirement
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

bin/rails

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'rails' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300).include?("This file was generated by Bundler")
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("railties", "rails")