fix(makefile): tipsyhive v1.11 sync issues (#41, #42, #43)#44
Open
matthew-on-git wants to merge 1 commit into
Open
fix(makefile): tipsyhive v1.11 sync issues (#41, #42, #43)#44matthew-on-git wants to merge 1 commit into
matthew-on-git wants to merge 1 commit into
Conversation
Three real bugs surfaced when tipsyhive synced its Makefile to v1.11.0. All small, all related to Ruby/yq path issues. Issue #41 — Makefile yq invocation: LANGUAGES read via `yq '.languages[]'` without `-r`. yq v3 (kislyuk's Python wrapper, shipped as `yq` on Debian/Ubuntu) returns JSON-quoted scalars by default; HAS_RUBY filter then matches against `"ruby"` and finds nothing, so RUBY_DOCKER_ENV doesn't apply BUNDLE_APP_CONFIG and bundler fails to find project gems. Add `-r` — works in yq v3 and v4 alike. Issue #43 — `rubocop --check`: the _format recipe passed `--check` to rubocop. Not a valid rubocop flag. Every Rails project with rubocop in its Gemfile saw _format fail with "invalid option: --check". Default rubocop behaviour is already "report, don't autocorrect"; just drop the flag. `--fail-level error` still gates the exit code. Issue #42 — Container BUNDLE_PATH envvar: the Dockerfile exported BUNDLE_PATH=/usr/local/bundle at runtime. Per Bundler precedence (envvar beats project .bundle/config), consumer projects with `BUNDLE_PATH: vendor/bundle` had it silently overridden — so `bundle exec` for project-pinned gems hit Bundler::GemNotFound. Drop the envvar from the Dockerfile. Bundler now respects the project's `.bundle/config`. GEM_HOME + PATH at `/usr/local/bundle/bin` keep the container's own bundled tools (rubocop, reek, rspec, etc.) reachable via direct invocation. Validation: - bash tests/smoke-rails.sh — 4/4 (lint scoping, bundle install, .bundle/config override, rubocop --check fix implicitly) - make check on dev-toolchain itself — pass - `bundle config` inside container — BUNDLE_PATH no longer shown - Direct `rubocop --version`, `reek --version`, `brakeman --version` all resolve from /usr/local/bundle Filed by matthew-on-git from a downstream tipsyhive sync. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Closes #41, #42, #43. Three small fixes surfaced when tipsyhive synced its Makefile to v1.11.0.
-r— MakefileLANGUAGESwas returning JSON-quoted scalars on hosts with yq v3, soHAS_RUBYnever matched andBUNDLE_APP_CONFIGnever got injected. One-character fix.BUNDLE_PATH=/usr/local/bundlewhich Bundler precedence-treats as higher than project.bundle/config. Removed the envvar; project configs now win. Directrubocop/reek/etc. invocations still resolve viaGEM_HOME+ PATH.rubocop --check— not a valid flag. Removed.Test plan
bash tests/smoke-rails.sh— 4/4 pass (lint scoping, bundle install, .bundle/config override, rubocop)make checkon dev-toolchain itself — passbundle configinside rebuilt container — BUNDLE_PATH no longer shownrubocop,reek,brakemaninvocations resolve their gemsrubocop --checkconfirmed broken on stock rubocop; dropping the flag fixes _format🤖 Generated with Claude Code