inquirex-tools 0.9.5 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8f0e3e2dc5bcc9d45d3c9cba64f8a7d96400b6d1296d316ff56460ece229166
-  data.tar.gz: 3ee07acd2e8e731115e0a5552bbbdaeea2979198195e396fc946765f8b6deef6
+  metadata.gz: c0382f5f2ef1fed61354873914a92e24e3b25dbead0959aac9de8f48702bdfdf
+  data.tar.gz: 25c18df8bb5cb9a7bcad98668431ff7587df5444b7797917f8c3201308168170
 SHA512:
-  metadata.gz: 81ca8eed0f60037439fd3c8ab6aafe9b35114082f2c02db488bf279a3d52577c7fb7c8c7e04a41ab48e0c8ab6be1e8e71e324d32b566cbc865ce861e4855601e
-  data.tar.gz: 3adc9867dab085361badf7b00ff38ef9965345efa2ef610bddb27e35e2a34945ebaa2459bdf068e18118cd2121ec67f952564f2f9df562e00d53df49ebb63578
+  metadata.gz: 0dc205efda474da503f17a2ac1259b12193996621bba9041ff696e67563bde5b050dd0ca52bb5149b261b694fdb941b29755dd05a9fb71a81c335c65ce903e8d
+  data.tar.gz: ddd1e89483f67689fc64b4d4618d19b0a667dfd91da9778b26ee56d7ff36c54c657540bf15441c7fb53273d15b4403d5d4705f1f61292e8772142fab65d6535c

data/.envrc

@@ -1 +1,3 @@
 PATH_add bin
+
+[[ -f ../.envrc ]] && source ../.envrc

data/docs/plans/001-/342/232/252/357/270/217-many-repo-setup/spec.md

@@ -0,0 +1,29 @@
+# Many Repos Setup
+
+## Problem
+
+Inquirex Organization houses several interlinked public repositories under https://github.com/inquirex that are often worked on in tandem, and checked out into the same folder. 
+
+For instance, seeting up the entire tree requires the following:
+
+```bash
+cd ~/
+mkdir -p ~/github/inquirex
+cd ~/github/inquirex
+declare -a repos=(
+	inquirex 
+	inquirex-llm 
+	inquirex-tty 
+	inquirex-webui 
+	inquirex-widget 
+	inquirex-tools
+	inquirex-claude
+)
+for repo in ${repos[@]}; do
+   git clone git@github.com:inquirex/${repo}
+done
+
+cd inquirex-tools && bin/setup
+
+```
+

data/lib/inquirex/tools/changelogs.rb

@@ -22,9 +22,14 @@ module Inquirex
       # so nothing here handles a credential in plain text.
       DEFAULT_TOKEN_READER = -> { `gh auth token 2>/dev/null`.strip }
 
-      # Runs the generator in one repository, discarding its very chatty output.
+      # Runs the generator in one repository, discarding its very chatty
+      # output, with this gem's bundle scrubbed — see
+      # {Inquirex::Tools.unbundled}. The generator is a gem of its own and must
+      # resolve against the installation that provides it, not against ours.
       DEFAULT_RUNNER = lambda { |dir, env|
-        system(env, "github_changelog_generator", chdir: dir, out: File::NULL, err: File::NULL)
+        Inquirex::Tools.unbundled do
+          system(env, "github_changelog_generator", chdir: dir, out: File::NULL, err: File::NULL)
+        end
       }
 
       # @param workspace [Workspace]

data/lib/inquirex/tools/pin_updater.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+require_relative "workspace"
+
+module Inquirex
+  module Tools
+    # Raises the "newest published gem" pin that a package's CI installs from
+    # rubygems.org.
+    #
+    # `inquirex-webui` reparses its printer's output with the real gem, which
+    # CI installs from the registry rather than from a checkout. That pin
+    # therefore cannot name the version in the source tree — it does not exist
+    # yet — so it trails by one release and has to be raised by hand afterwards.
+    #
+    # Nobody remembers. The pin sat at 0.9.4 while the printer started emitting
+    # `min`, `max` and `step_size`, added to the gem in 0.9.5, and the
+    # round-trip failed with "`min` is not allowed inside a step block":
+    # SafeSource is default-deny, so a step setter it has never heard of is
+    # rejected outright. The failure names the printer, not the pin.
+    #
+    # Running immediately after a successful publish is what makes this safe.
+    # At that moment the version is on the registry by construction, so the
+    # pin's one rule — never run ahead of rubygems.org — cannot be violated.
+    #
+    # @example Raise the pin to the version just published
+    #   Inquirex::Tools::PinUpdater.new.call("0.9.6")  # => ["inquirex-webui/.github/workflows/ci.yml"]
+    class PinUpdater
+      # A pinned family version in a workflow's `env:` block. Anchored to the
+      # whole line so a value mentioned in a comment is left alone.
+      PIN = /^(?<lead>\s*INQUIREX_GEM_VERSION:\s*)(?<quote>["']?)\d+\.\d+\.\d+\k<quote>\s*$/
+
+      # @param workspace [Workspace] the ecosystem checkout to rewrite
+      # @param out [IO] where report output goes
+      def initialize(workspace: Workspace.new, out: $stdout)
+        @workspace = workspace
+        @out = out
+      end
+
+      # Rewrites every pin to `version`.
+      #
+      # @param version [String] the version that was just published
+      # @param dry_run [Boolean] report what would change and write nothing
+      # @return [Array<String>] workspace-relative paths that changed
+      def call(version, dry_run: false)
+        changed = workflows.select { |path| rewrite(path, version, dry_run:) }
+        report(changed, version, dry_run:)
+        changed.map { |path| path.delete_prefix("#{workspace.root}/") }
+      end
+
+      private
+
+      # @return [Workspace] the ecosystem checkout being rewritten
+      attr_reader :workspace
+
+      # @return [IO] where report output goes
+      attr_reader :out
+
+      # @return [Array<String>] every workflow file in every lockstep package
+      def workflows
+        Workspace::LOCKSTEP.keys.flat_map do |name|
+          Dir.glob(File.join(workspace.root, name, ".github", "workflows", "*.y{a,}ml"))
+        end.sort
+      end
+
+      # @return [Boolean] whether the file needed rewriting
+      def rewrite(path, version, dry_run:)
+        source = File.read(path)
+        updated = source.gsub(PIN) { "#{::Regexp.last_match(:lead)}\"#{version}\"" }
+        return false if updated == source
+
+        File.write(path, updated) unless dry_run
+        true
+      end
+
+      # @return [void]
+      def report(changed, version, dry_run:)
+        return if changed.empty?
+
+        verb = dry_run ? "Would raise" : "Raised"
+        out.puts
+        out.puts "#{verb} the published-gem pin to #{version}:"
+        changed.each { |path| out.puts "  #{path.delete_prefix("#{workspace.root}/")}" }
+        # The publisher does not commit — it has no business deciding what a
+        # release commit looks like — so say plainly that this is not done yet.
+        out.puts "Commit that; CI installs the pinned version from the registry.".dark unless dry_run
+      end
+    end
+  end
+end

data/lib/inquirex/tools/publisher.rb

@@ -40,9 +40,11 @@ module Inquirex
       ROTATE_INTERVAL = 2
 
       # Shells out with the child's stdout and stderr left attached, so a
-      # failing package's own output is what the operator sees.
+      # failing package's own output is what the operator sees, and with this
+      # gem's bundle scrubbed so the recipe resolves its own — see
+      # {Inquirex::Tools.unbundled}.
       DEFAULT_RUNNER = lambda { |dir, argv|
-        Dir.chdir(dir) { system("just", *argv) }
+        Inquirex::Tools.unbundled { Dir.chdir(dir) { system("just", *argv) } }
       }
 
       # Reads the current RubyGems TOTP. `op` resolves the account from
@@ -92,16 +94,20 @@ module Inquirex
       #   without publishing anything.
       # @param otp_reader [#call] returns the current 2FA code, or nil
       # @param published_checker [#call] (name, kind, version) => true/false/nil
+      # @param pin_updater [#call] (version, dry_run:) raises the published-gem
+      #   pin once the version is certainly on the registry
       def initialize(workspace: Workspace.new,
         out: $stdout,
         runner: DEFAULT_RUNNER,
         otp_reader: DEFAULT_OTP_READER,
-        published_checker: DEFAULT_PUBLISHED_CHECKER)
+        published_checker: DEFAULT_PUBLISHED_CHECKER,
+        pin_updater: nil)
         @workspace = workspace
         @out = out
         @runner = runner
         @otp_reader = otp_reader
         @published_checker = published_checker
+        @pin_updater = pin_updater || PinUpdater.new(workspace:, out:)
       end
 
       # Publishes every lockstep package, or prints what it would publish.
@@ -155,6 +161,9 @@ module Inquirex
 
         out.puts
         out.puts summary(dry_run:, published:, skipped:)
+        # Only now is the version certainly on the registry, which is the one
+        # rule the pin has to obey.
+        pin_updater.call(workspace.version_of("inquirex"), dry_run:)
         true
       end
 
@@ -175,6 +184,9 @@ module Inquirex
       # @return [#call] asks a registry whether a version is already public
       attr_reader :published_checker
 
+      # @return [#call] raises the published-gem pin after a release
+      attr_reader :pin_updater
+
       # @return [Boolean] whether the package published cleanly
       def run(name, dir, argv)
         return true if runner.call(dir, argv)

data/lib/inquirex/tools/releaser.rb

@@ -34,9 +34,11 @@ module Inquirex
       RELEASE_BRANCH = "main"
 
       # Shells out with the child's stdout and stderr left attached, so a
-      # failing package's own `gh` output is what the operator sees.
+      # failing package's own `gh` output is what the operator sees, and with
+      # this gem's bundle scrubbed so the recipe resolves its own — see
+      # {Inquirex::Tools.unbundled}.
       DEFAULT_RUNNER = lambda { |dir, argv|
-        Dir.chdir(dir) { system("just", *argv) }
+        Inquirex::Tools.unbundled { Dir.chdir(dir) { system("just", *argv) } }
       }
 
       # @param workspace [Workspace] the ecosystem checkout to release from

data/lib/inquirex/tools/version.rb

@@ -2,6 +2,6 @@
 
 module Inquirex
   module Tools
-    VERSION = "0.9.5"
+    VERSION = "0.10.0"
   end
 end

data/lib/inquirex/tools/version_bumper.rb

@@ -60,8 +60,12 @@ module Inquirex
         [status.success?, output]
       }
 
-      # Runs a package's own checks in its own directory.
-      DEFAULT_RUNNER = ->(dir, argv) { Dir.chdir(dir) { system(*argv) } }
+      # Runs a package's own checks in its own directory, with this gem's
+      # bundle scrubbed so those checks resolve the package's own Gemfile
+      # rather than inheriting ours — see {Inquirex::Tools.unbundled}.
+      DEFAULT_RUNNER = lambda { |dir, argv|
+        Inquirex::Tools.unbundled { Dir.chdir(dir) { system(*argv) } }
+      }
 
       # @param workspace [Workspace] the ecosystem checkout to rewrite
       # @param out [IO] where report output goes

data/lib/inquirex/tools.rb

@@ -4,6 +4,7 @@ require_relative "tools/version"
 require_relative "tools/workspace"
 require_relative "tools/version_checker"
 require_relative "tools/version_bumper"
+require_relative "tools/pin_updater"
 require_relative "tools/publisher"
 require_relative "tools/releaser"
 require_relative "tools/changelogs"
@@ -33,5 +34,34 @@ module Inquirex
   #   Inquirex::Tools::VersionChecker.new.preflight  # => true when every package is ready
   module Tools
     class Error < StandardError; end
+
+    # Runs a block with Bundler's environment removed.
+    #
+    # Every orchestrator here shells into a *different* package and runs
+    # `bundle exec` there. `bundle exec inquirex versions-bump` exports
+    # BUNDLE_GEMFILE, RUBYOPT and friends, and a child process inherits them —
+    # so without this, each sibling resolves against **this gem's** Gemfile
+    # instead of its own.
+    #
+    # That failure is loud but misleading. `versions-bump` reported five of six
+    # packages failing `just check-all`: `inquirex` and `inquirex-llm` raised
+    # `NoMethodError: undefined method 'skip' for module SimpleCov`, because
+    # this gem pins simplecov ~> 0.22 while theirs resolve 1.0.3 where
+    # `SimpleCov.skip` exists; `inquirex-tty` raised `LoadError: cannot load
+    # such file -- inquirex`, because this gem deliberately does not depend on
+    # the gems it manages. Every one of those reads as a defect in the package
+    # being checked. None of them was.
+    #
+    # Bundler is not declared as a dependency — it is present whenever this
+    # runs under `bundle exec`, and when it is absent there is no environment
+    # to scrub, so the block simply runs.
+    #
+    # @yield with a clean environment
+    # @return [Object] whatever the block returns
+    def self.unbundled(&)
+      return yield unless defined?(::Bundler) && ::Bundler.respond_to?(:with_unbundled_env)
+
+      ::Bundler.with_unbundled_env(&)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquirex-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.10.0
 platform: ruby
 authors:
 - Konstantin Gredeskoul
@@ -50,7 +50,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".env.encrypted"
 - ".env.example"
 - ".envrc"
@@ -64,7 +63,8 @@ files:
 - README.md
 - Rakefile
 - docs/badges/coverage_badge.svg
-- docs/monorepo-migration.md
+- docs/plans/001-⚪️-many-repo-setup/spec.md
+- docs/plans/002-⚪️-monorepo-migration/spec.md
 - exe/inquirex
 - exe/inquirexor
 - justfile
@@ -77,6 +77,7 @@ files:
 - lib/inquirex/tools/commands/version.rb
 - lib/inquirex/tools/commands/versions_bump.rb
 - lib/inquirex/tools/commands/versions_check.rb
+- lib/inquirex/tools/pin_updater.rb
 - lib/inquirex/tools/publisher.rb
 - lib/inquirex/tools/releaser.rb
 - lib/inquirex/tools/version.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.18
 specification_version: 4
 summary: Release tooling for the Inquirex package family
 test_files: []