gembrew 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe9b9cc5e9535cca862d2adf23aa7887bf0608fa14104d8aa7c3db046358ac61
-  data.tar.gz: 7242264cbf2fa6c438445dd180ec73fec06c37513a5d67889ac47dddb748985b
+  metadata.gz: 1b5f610bdf10a353ade54ab13743f154b56d0af7e5aceac0d6b3364135520f97
+  data.tar.gz: dd0daaec17e0f724b80f477b0f2c0ab68e5e02ebfef7248ca5cb8a4cd1164390
 SHA512:
-  metadata.gz: 412fd3b8bc7d1d92ae3358902eacb1e89d6d5a1c2eee5fbb21512b6ea549d1035e438d45855ee8091eda01b9f92f22603c8a089324e82485bafcb124afe4723c
-  data.tar.gz: 5fdb7789ec71ce6838cdc82973765441ada2a2c100b9b73ac121c1d3e8aaa77885477d61b578336e6a92b78fc72e6a3acb0bac3cea9be8a2937a8c7710302919
+  metadata.gz: 6a09ac710d80edfb925b6e8935df241c05b3cec090f9ae21c24fb19ab9b0d7fcb04ef867c8b6959303e4d276d00f82acfe65b1d31acf40d3eb81c030a6567ca6
+  data.tar.gz: a458d322068a01abbb692df5919efb9be8bec07edcf1e518d569bfa019befde0dd3d03e7916b7656f831de5a6391b7b402ab47b47ffc1a749bf610fc2aa92fdb

data/README.md

@@ -21,9 +21,10 @@ gembrew check
 ```
 
 `init` creates a tap repository containing `README.md`, `gembrew/`, `Formula/`,
-and a GitHub Actions workflow that styles, audits, installs, tests, and checks
-the linkage of every formula on Linux and macOS. It accepts an empty directory
-or an existing tap containing `Formula/`.
+and a GitHub Actions workflow that uses Homebrew's `test-bot` on Linux, Apple
+Silicon, and Intel macOS. Pull requests test changed formulae; pushes, scheduled
+runs, and manual runs test every formula. It accepts an empty directory or an
+existing tap containing `Formula/`.
 Supplying a gem name also creates its first configuration. The gem name is
 optional, so `gembrew init` can prepare an empty tap or add Gembrew to an
 existing one. Existing README and workflow files are never overwritten.
@@ -36,27 +37,34 @@ README.md
   workflows/
     test.yml
 gembrew/
-  example.yml
+  example/
+    formula.yml
+    test.rb
 Formula/
 ```
 
-`gembrew/example.yml` contains:
+`gembrew/example/formula.yml` contains the gem metadata and source:
 
 ```yaml
 gem: example
+version: "" # required
+source:
+  type: rubygems
+```
 
-test: |-
-  system bin/"example", "--version"
+`gembrew/example/test.rb` contains the generated default test:
+
+```ruby
+system bin/"example", "--version"
 ```
 
-Edit the configuration as needed, then generate `Formula/example.rb`:
+Edit these files as needed, then generate `Formula/example.rb`:
 
 ```shell
 gembrew build
 ```
 
-Each YAML file under `gembrew/` describes one formula. Add more published gems
-with:
+Each directory under `gembrew/` describes one formula. Add more published gems with:
 
 ```shell
 gembrew add another-gem
@@ -69,10 +77,9 @@ generate just one:
 gembrew build example
 ```
 
-The required settings are `gem`, `version`, `source`, and exactly one of `test`
-or `test_from_file`.
+The required settings in `formula.yml` are `gem`, `version`, and `source`.
 The output defaults to `Formula/NAME.rb`, where `NAME` is the configuration
-filename. Relative paths are resolved from the tap root.
+directory name. Relative output paths are resolved from the tap root.
 
 ```yaml
 gem: example
@@ -89,20 +96,29 @@ executable: example
 # Optional additional Homebrew formula dependencies:
 dependencies:
   - bash
+  - bash :macos_only
   - libffi :system_on_macos
 
-# Optional output override. The default for gembrew/example.yml is shown here.
+# Optional output override. The default for gembrew/example is shown here.
 output: Formula/example.rb
+```
 
-test: |-
-  system bin/"example", "--version"
+Tag a dependency with `:system_on_macos` when macOS provides it and Homebrew
+should install its formula only on other platforms. Tag it with `:macos_only`
+when Homebrew should install it only on macOS.
+
+You may add these optional Ruby hook files beside `formula.yml`:
 
-# Use this instead of `test` to load the test body from another file:
-# test_from_file: support/test.rb
+```text
+install_extra.rb  Runs after the standard gem installation
+test.rb           Defines the formula test
 ```
 
-Tag a dependency with `:system_on_macos` when macOS provides it and Homebrew
-should install its formula only on other platforms.
+Gembrew generates a basic `COMMAND --version` test when `test.rb` is absent.
+`gembrew init GEM` and `gembrew add GEM` create that test file so it can be
+replaced with a meaningful functional test. Gembrew inserts `install_extra.rb`
+at the end of the formula's `install` method, after installing the gem and
+creating its executable wrapper.
 
 To build the root gem from a GitHub tag while continuing to fetch its
 dependencies from RubyGems, use:
@@ -133,15 +149,16 @@ The repository is mounted as a local tap, so formulae can be addressed by gem
 name inside the shell:
 
 ```shell
-brew style example
-brew audit --new --online example
-brew install --build-from-source example
-brew test example
-brew linkage --test example
+brew style gembrew/tap/example
+brew audit --new --online gembrew/tap/example
+brew install --build-from-source gembrew/tap/example
+brew test gembrew/tap/example
+brew linkage --test gembrew/tap/example
 ```
 
-To test a published tap without mounting the local repository, open a pristine
-Homebrew shell:
+To use a stock, current Homebrew container without mounting the local
+repository or changing Homebrew's update, API, or cleanup behavior, open a
+pristine shell:
 
 ```shell
 gembrew shell --pristine

data/lib/gembrew/adder.rb

@@ -18,18 +18,22 @@ module Gembrew
         raise Error, "Directory is not a Homebrew tap: #{project_path} (Formula/ does not exist)"
       end
 
-      config_directory.mkpath
-      raise Error, "Gem configuration already exists: #{config_path}" if config_path.exist?
+      gembrew_directory.mkpath
+      raise Error, "Gem configuration already exists: #{config_directory}" if config_directory.exist?
 
+      config_directory.mkpath
       config_path.write render
-      config_path
+      test_path.write %[system bin/"#{gem_name}", "--version"\n]
+      config_directory
     end
 
   private
 
     def formula_path = project_path/'Formula'
-    def config_directory = project_path/'gembrew'
-    def config_path = config_directory/"#{gem_name}.yml"
+    def gembrew_directory = project_path/'gembrew'
+    def config_directory = gembrew_directory/gem_name
+    def config_path = config_directory/'formula.yml'
+    def test_path = config_directory/'test.rb'
 
     def render
       template = Pathname(__dir__)/'templates/gembrew.yml.erb'

data/lib/gembrew/commands/build.rb

@@ -4,7 +4,7 @@ require 'gembrew/generator'
 module Gembrew
   module Commands
     class Build < MisterBin::Command
-      help 'Generate Homebrew formulae from gembrew/*.yml'
+      help 'Generate Homebrew formulae from gembrew/*/formula.yml'
 
       usage 'gembrew build [GEM]'
       usage 'gembrew build (-h|--help)'

data/lib/gembrew/commands/shell.rb

@@ -9,7 +9,7 @@ module Gembrew
       usage 'gembrew shell [--pristine]'
       usage 'gembrew shell (-h|--help)'
 
-      option '-p --pristine', 'Open without mounting the local tap'
+      option '-p --pristine', 'Open a stock, current Homebrew container'
 
       def run
         DockerShell.new.call pristine: args['--pristine']

data/lib/gembrew/config.rb

@@ -6,19 +6,21 @@ module Gembrew
   class Config
     Dependency = Data.define(:name, :tags) do
       def system_on_macos? = tags.include? :system_on_macos
+      def macos_only? = tags.include? :macos_only
     end
 
-    DEPENDENCY_TAGS = %w[:system_on_macos].freeze
+    DEPENDENCY_TAGS = %w[:macos_only :system_on_macos].freeze
     DIRECTORY = 'gembrew'
+    FILENAME = 'formula.yml'
     ALLOWED_KEYS = %w[
-      gem version source output desc homepage license executable dependencies test test_from_file
+      gem version source output desc homepage license executable dependencies
     ].freeze
 
     attr_reader :path, :project_path
 
     def self.all(project_path = Pathname.pwd)
       project_path = Pathname(project_path).expand_path
-      paths = (project_path/DIRECTORY).glob('*.yml').sort
+      paths = (project_path/DIRECTORY).glob("*/#{FILENAME}").sort
       raise Error, "No gem configurations found in #{project_path/DIRECTORY}" if paths.empty?
 
       paths.map { |path| new path, project_path: project_path }
@@ -27,7 +29,7 @@ module Gembrew
     def self.find(name, project_path = Pathname.pwd)
       validate_name! name
       project_path = Pathname(project_path).expand_path
-      new project_path/DIRECTORY/"#{name}.yml", project_path: project_path
+      new project_path/DIRECTORY/name/FILENAME, project_path: project_path
     end
 
     def self.validate_name!(name)
@@ -43,7 +45,7 @@ module Gembrew
       validate
     end
 
-    def name = path.basename('.yml').to_s
+    def name = path.dirname.basename.to_s
     def gem_name = data.fetch('gem').to_s
     def version = data['version']&.to_s
     def source = data.fetch('source')
@@ -61,16 +63,8 @@ module Gembrew
       @dependencies ||= data.fetch('dependencies', []).map { |value| parse_dependency value }
     end
 
-    def test_body
-      @test_body ||= if data.has_key?('test')
-        data.fetch('test').to_s
-      else
-        test_path = project_path/data.fetch('test_from_file')
-        raise Error, "Test file does not exist: #{test_path}" unless test_path.file?
-
-        test_path.read
-      end
-    end
+    def install_extra_body = hook_body 'install_extra.rb'
+    def test_body = hook_body 'test.rb'
 
   private
 
@@ -95,10 +89,6 @@ module Gembrew
       require_value 'source'
       validate_source
       validate_dependencies
-
-      return unless data.has_key?('test') == data.has_key?('test_from_file')
-
-      raise Error, 'Provide exactly one of test or test_from_file'
     end
 
     def require_value(key)
@@ -169,5 +159,13 @@ module Gembrew
 
       Dependency.new(name:, tags: values.map { |tag| tag.delete_prefix(':').to_sym }.freeze)
     end
+
+    def hook_body(filename)
+      hook_path = path.dirname/filename
+      return unless hook_path.file?
+
+      body = hook_path.read
+      body unless body.strip.empty?
+    end
   end
 end

data/lib/gembrew/docker_check.rb

@@ -24,16 +24,17 @@ module Gembrew
       <<~BASH
         caption() { printf '\\n\\033[1;34m==> gembrew: %s\\033[0m\\n' "$1"; }
         formula=#{formula}
+        qualified_formula="gembrew/tap/$formula"
         caption "styling $formula"
-        brew style "$formula"
+        brew style "$qualified_formula"
         caption "auditing $formula"
-        brew audit --new --online "$formula"
+        brew audit --new --online "$qualified_formula"
         caption "installing $formula"
-        brew install --build-from-source "$formula"
+        brew install --build-from-source "$qualified_formula"
         caption "testing $formula"
-        brew test "$formula"
+        brew test "$qualified_formula"
         caption "checking linkage for $formula"
-        brew linkage --test "$formula"
+        brew linkage --test "$qualified_formula"
       BASH
     end
   end

data/lib/gembrew/docker_runner.rb

@@ -14,6 +14,7 @@ module Gembrew
 
     def call(*command, interactive: false, pristine: false)
       docker_command = ['docker', 'run', '--rm', '--init', '--name', container_name]
+      docker_command << '--pull=always' if pristine
       docker_command << '-it' if interactive
       docker_command.concat environment(interactive: interactive, pristine: pristine)
       unless pristine
@@ -31,11 +32,15 @@ module Gembrew
     attr_reader :command_runner
 
     def environment(interactive:, pristine:)
-      result = %w[
-        --env HOMEBREW_NO_AUTO_UPDATE=1
-        --env HOMEBREW_NO_INSTALL_CLEANUP=1
-        --env HOMEBREW_NO_INSTALL_FROM_API=1
-      ]
+      result = if pristine
+        []
+      else
+        %w[
+          --env HOMEBREW_NO_AUTO_UPDATE=1
+          --env HOMEBREW_NO_INSTALL_CLEANUP=1
+          --env HOMEBREW_NO_INSTALL_FROM_API=1
+        ]
+      end
       prompt = pristine ? 'homebrew' : 'gembrew'
       result.push '--env', "PS1=\\n\\n#{prompt} $ " if interactive
       result

data/lib/gembrew/generator.rb

@@ -35,19 +35,24 @@ module Gembrew
 
     def metadata(spec)
       {
-        description:    config.description || spec.summary,
-        homepage:       config.homepage || inferred_homepage(spec),
-        license:        config.license || spec.license || spec.licenses.first,
-        executable:     config.executable || spec.executables.first || spec.name,
-        source_type:    config.source_type,
-        source_repo:    config.source_repo,
-        source_tag:     config.source_tag,
-        source_gemspec: config.source_gemspec,
-        dependencies:   formula_dependencies,
-        test_body:      config.test_body,
+        description:        config.description || spec.summary,
+        homepage:           config.homepage || inferred_homepage(spec),
+        license:            config.license || spec.license || spec.licenses.first,
+        executable:         executable(spec),
+        source_type:        config.source_type,
+        source_repo:        config.source_repo,
+        source_tag:         config.source_tag,
+        source_gemspec:     config.source_gemspec,
+        dependencies:       formula_dependencies,
+        install_extra_body: config.install_extra_body,
+        test_body:          config.test_body || %[system bin/#{executable(spec).inspect}, "--version"\n],
       }
     end
 
+    def executable(spec)
+      config.executable || spec.executables.first || spec.name
+    end
+
     def formula_dependencies
       ([Config::Dependency.new(name: 'ruby', tags: [])] + config.dependencies)
         .uniq(&:name)

data/lib/gembrew/templates/README.md.erb

@@ -23,6 +23,11 @@ Install [Gembrew](https://github.com/DannyBen/gembrew):
 gem install gembrew
 ```
 
+The generated GitHub Actions workflow uses Homebrew's `test-bot` on Linux,
+Apple Silicon, and Intel macOS. Pull requests test changed formulae; pushes,
+and manual runs test every formula. Homebrew style checks apply only to files in
+`Formula/`; Gembrew's Ruby hook files are not standalone Homebrew formulae.
+
 Generate all formulae:
 
 ```shell
@@ -48,6 +53,14 @@ Add another Ruby gem:
 gembrew add another-gem
 ```
 
+Each gem has a `gembrew/NAME/formula.yml` configuration. You may add these
+optional Ruby hook files beside it:
+
+```text
+install_extra.rb  Runs after the standard gem installation
+test.rb           Defines the formula test
+```
+
 Open an interactive Homebrew environment:
 
 ```shell

data/lib/gembrew/templates/formula.rb.erb

@@ -9,17 +9,26 @@ class <%= formula_name %> < Formula
   sha256 "<%= sha256 %>"
   license <%= license.inspect %>
 
-<% formula_dependencies = dependencies.reject(&:system_on_macos?) -%>
+<% formula_dependencies = dependencies.reject { |dependency| dependency.system_on_macos? || dependency.macos_only? } -%>
 <% macos_dependencies = dependencies.select(&:system_on_macos?) -%>
+<% macos_only_dependencies = dependencies.select(&:macos_only?) -%>
 <% formula_dependencies.each do |dependency| -%>
   depends_on <%= dependency.name.inspect %>
 <% end -%>
-<% if formula_dependencies.any? && macos_dependencies.any? -%>
+<% if formula_dependencies.any? && (macos_dependencies.any? || macos_only_dependencies.any?) -%>
 
 <% end -%>
 <% macos_dependencies.each do |dependency| -%>
   uses_from_macos <%= dependency.name.inspect %>
 <% end -%>
+<% if macos_only_dependencies.any? -%>
+
+  on_macos do
+<% macos_only_dependencies.each do |dependency| -%>
+    depends_on <%= dependency.name.inspect %>
+<% end -%>
+  end
+<% end -%>
 <% resources.each do |resource| -%>
 
   resource <%= resource.name.inspect %> do
@@ -45,13 +54,14 @@ class <%= formula_name %> < Formula
       "--ignore-dependencies", "--install-dir", libexec, "--no-document"
 <% end -%>
 
-    rm libexec.glob("extensions/*/*/*/mkmf.log")
-    deuniversalize_machos if OS.mac?
-
     (bin/<%= executable.inspect %>).write_env_script libexec/"bin/<%= executable %>", GEM_HOME: ENV.fetch("GEM_HOME")
+<% if install_extra_body -%>
+
+<%= install_extra_body.lines(chomp: true).map { |line| line.strip.empty? ? '' : "    #{line}" }.join("\n") %>
+<% end -%>
   end
 
   test do
-<%= test_body.lines.map { |line| "    #{line}" }.join %>
+<%= test_body.lines(chomp: true).map { |line| line.strip.empty? ? '' : "    #{line}" }.join("\n") %>
   end
 end

data/lib/gembrew/templates/gembrew.yml.erb

@@ -12,9 +12,6 @@ source:
 #   tag: v1.2.3                    # optional; defaults to vVERSION
 #   gemspec: <%= gem_name %>.gemspec  # optional; defaults to GEMNAME.gemspec
 
-test: |-
-  system bin/"<%= gem_name %>", "--version"
-
 # Optional metadata and formula overrides:
 # desc: Example command-line application
 # homepage: https://example.com
@@ -23,7 +20,10 @@ test: |-
 # output: Formula/<%= gem_name %>.rb
 # dependencies:
 #   - bash
+#   - bash :macos_only
 #   - libffi :system_on_macos
 
-# To load the Homebrew test body from a Ruby file, replace `test` above with:
-# test_from_file: support/test.rb
+# Optional Ruby hook files:
+#
+#   install_extra.rb  Runs after the standard gem installation
+#   test.rb           Defines the formula test

data/lib/gembrew/templates/test.yml

@@ -8,58 +8,98 @@ on:
   pull_request:
   workflow_dispatch:
 
-permissions:
-  contents: read
+permissions: {}
+
+defaults:
+  run:
+    shell: bash -xeuo pipefail {0}
 
 jobs:
-  test:
+  test-bot:
     name: ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    container: ${{ fromJSON(toJSON(matrix.container)) }} # zizmor: ignore[unpinned-images]
     strategy:
       fail-fast: false
       matrix:
         os:
-          - ubuntu-latest
-          - macos-latest
+          - macos-26
+          - macos-15-intel
+        include:
+          - os: ubuntu-latest
+            container:
+              image: ghcr.io/homebrew/brew:main
+              options: --privileged
+    permissions:
+      actions: read
+      checks: read
+      contents: read
+      pull-requests: read
 
     steps:
       - name: Set up Homebrew
         id: set-up-homebrew
-        uses: Homebrew/actions/setup-homebrew@fd832223f9f99ebf0244dd20658680e5d4aca049 # 2026.08.03.2
+        uses: Homebrew/actions/setup-homebrew@b35a29a0f83ee8b8ca07b219fc8db3d7bb88ab49 # 2026.08.10.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Cache Homebrew Bundler gems
-        id: cache
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
           path: ${{ steps.set-up-homebrew.outputs.gems-path }}
-          key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
-          restore-keys: ${{ runner.os }}-rubygems-
+          key: ${{ matrix.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }}
+          restore-keys: ${{ matrix.os }}-rubygems-
+
+      - name: Clean runner
+        run: brew test-bot --only-cleanup-before
+
+      - name: Set up test-bot
+        run: brew test-bot --only-setup
+
+      - name: Check tap syntax
+        run: |
+          tap="${GITHUB_REPOSITORY/homebrew-/}"
+          tap_path="${{ steps.set-up-homebrew.outputs.repository-path }}"
+          brew style "$tap_path/Formula"
+          brew readall --aliases --os=all --arch=all "$tap"
+          brew audit --except=installed --tap="$tap"
 
-      - name: Install Homebrew Bundler gems
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: brew install-bundler-gems
+      - name: Test changed formulae
+        if: github.event_name == 'pull_request'
+        run: brew test-bot --only-formulae
 
-      - name: Test formulae
-        shell: bash
-        env:
-          HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Collect all formulae
+        id: all-formulae
+        if: github.event_name != 'pull_request'
         run: |
           shopt -s nullglob
-          formulae=(Formula/*.rb)
+          tap_path="${{ steps.set-up-homebrew.outputs.repository-path }}"
+          paths=("$tap_path"/Formula/*.rb)
 
-          if (( ${#formulae[@]} == 0 )); then
-            echo "No formulae found in Formula/"
+          if (( ${#paths[@]} == 0 )); then
+            echo "No formulae found in $tap_path/Formula/"
             exit 1
           fi
 
-          for formula in "${formulae[@]}"; do
-            formula_name="${formula##*/}"
-            formula_name="${formula_name%.rb}"
-
-            brew style "$formula"
-            brew audit --new --online "$formula_name"
-            brew install --build-from-source "$formula_name"
-            brew test "$formula_name"
-            brew linkage --test "$formula_name"
-            brew uninstall "$formula_name"
+          formulae=()
+          for path in "${paths[@]}"; do
+            formula="${path##*/}"
+            formulae+=("${formula%.rb}")
           done
+
+          joined=$(IFS=,; echo "${formulae[*]}")
+          echo "formulae=${joined}" >> "$GITHUB_OUTPUT"
+
+      - name: Test all formulae
+        if: github.event_name != 'pull_request'
+        run: >-
+          brew test-bot --only-formulae
+          --testing-formulae="${{ steps.all-formulae.outputs.formulae }}"
+
+      - name: Upload bottles as artifacts
+        if: always() && github.event_name == 'pull_request'
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        with:
+          name: bottles_${{ matrix.os }}
+          path: "*.bottle.*"

data/lib/gembrew/version.rb

@@ -1,3 +1,3 @@
 module Gembrew
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gembrew
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Danny Ben Shitrit