cobra_commander 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e4912ef5e1373f254652d50f2c88bd5d6fc2785675f2d53bdf3572ffcbfafaf
-  data.tar.gz: 5c0bdd82e4ea3fcffeb1f8d7a44aece59ca929d40171f3c22b6a3c95d951b942
+  metadata.gz: da1b8808311f316b8e200895575b653357a88b92f8a1d05d833ab8f0bd55b0d5
+  data.tar.gz: 442d8ae693c4bac9f3d888a33fc4b5e1d1a5904c681dba43144284651b42abfd
 SHA512:
-  metadata.gz: 3d8882fe6141cc4ddc6c7ec92616aceb7010c3d889b8c6b7f2d039d589fcd1c9bed43d8dcac946f239057f27eb2ab51c5cd65a181a838401cff2e38f6edb1e8d
-  data.tar.gz: ceda5086044a31eae40445597289fae8c23aef320160b07b8d9a1b3fc33ea9318eb2815e97781af5a70f4295842bc59e07e9cc562473fa92933c837db47a9f36
+  metadata.gz: '07940522fad6ad8f3220e25f654a19a34a8b61497b0f68c33c368db9926fd8f32446e4423112f91630511c447469866398b152736db79fc726e27dd96809d0c4'
+  data.tar.gz: a1e5b9db402504b0114c7cad3a65a4ba22bce8ba003269abb03a824128df5d586c1c39fde4d9132da97d71143b2b3d65bb6966dba464a8068e5193fb159aa373

data/cobra_commander.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   DESCRIPTION
   spec.homepage = "http://tech.powerhrg.com/cobra_commander/"
   spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.metadata["rubygems_mfa_required"] = "true"
   spec.metadata["homepage_uri"] = spec.homepage
@@ -34,18 +35,18 @@ Gem::Specification.new do |spec|
   spec.executables = %w[cobra]
   spec.require_paths = %w[lib]
 
-  spec.add_dependency "bundler"
+  spec.add_dependency "bundler", ">= 2.4.17"
   spec.add_dependency "thor", ["< 2.0", ">= 0.18.1"]
   spec.add_dependency "tty-command", "~> 0.10.0"
   spec.add_dependency "tty-prompt", "~> 0.23.1"
 
-  spec.add_development_dependency "aruba", "~> 0.14.2"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "license_finder", ">= 7.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake", ">= 12.3.3"
-  spec.add_development_dependency "rspec", "~> 3.5"
-  spec.add_development_dependency "rubocop", "1.30.1"
-  spec.add_development_dependency "rubocop-powerhome", ">= 0.5.0"
+  spec.add_development_dependency "aruba", "0.14.14"
+  spec.add_development_dependency "guard-rspec", "4.7.3"
+  spec.add_development_dependency "license_finder", "7.1"
+  spec.add_development_dependency "ostruct", "0.6.3"
+  spec.add_development_dependency "pry", "0.14.2"
+  spec.add_development_dependency "rake", "13.0.6"
+  spec.add_development_dependency "rspec", "3.13.0"
+  spec.add_development_dependency "rubocop", "1.82.1"
+  spec.add_development_dependency "rubocop-powerhome", "0.6.1"
 end

data/docs/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Change Log
 
-## Unreleased
+## Version 1.2.0 - 2026-06-09
+
+* Add an `around_command` extension point so plugins can enhance the shell used to run `cmd`/`exec`. `Source#around_command` wraps execution (e.g. Bundler isolation) and yields a hash of environment variables for the command (base yields `{}`, scoped per-execution via TTY). Packages delegate to their source; `Component#around_command` nests each distinct source's wrapper and yields their merged env. `exec` applies it once per component (all packages contribute, later sources win); `cmd` applies each package's own. `IsolatedPTY` is now a plain PTY command — isolation comes from the sources.
+* Raise the minimum supported Ruby version to 3.2 and expand CI to cover Ruby 4.0.
 
 ## Version 1.1.0 - 2023-03-09
 

data/lib/cobra_commander/affected.rb

@@ -12,8 +12,8 @@ module CobraCommander
       @changes = changes
     end
 
-    def each(&block)
-      (directly | transitively).sort_by(&:name).each(&block)
+    def each(&)
+      (directly | transitively).sort_by(&:name).each(&)
     end
 
     def directly

data/lib/cobra_commander/cli/output/ascii_tree.rb

@@ -43,12 +43,12 @@ module CobraCommander
 
       def add_tee(io, outdents, dep)
         io.puts line(outdents, TEE, dep.name)
-        list_dependencies(io, dep, (outdents + [BAR]))
+        list_dependencies(io, dep, outdents + [BAR])
       end
 
       def add_corner(io, outdents, dep)
         io.puts line(outdents, CORNER, dep.name)
-        list_dependencies(io, dep, (outdents + [SPACE]))
+        list_dependencies(io, dep, outdents + [SPACE])
       end
 
       def line(outdents, sym, name)

data/lib/cobra_commander/cli.rb

@@ -73,7 +73,7 @@ module CobraCommander
     desc "tree [component]", "Prints the dependency tree of a given component or umbrella"
     def tree(component = nil)
       components = component ? [find_component(component)] : umbrella.components
-      puts Output::AsciiTree.new(components).to_s
+      puts Output::AsciiTree.new(components)
     end
 
     desc "graph [component]", "Outputs a graph of a given component or umbrella"

data/lib/cobra_commander/component.rb

@@ -25,6 +25,18 @@ module CobraCommander
       @packages.map(&:path).uniq
     end
 
+    # Wraps the execution of a command on this component by nesting the
+    # around_command of each distinct source backing its packages, so every
+    # package gets a chance to enhance the surrounding process. The env vars
+    # each source yields are merged (later sources win) and the merged hash is
+    # yielded to the block.
+    #
+    # @yieldparam env [Hash{String => String}] merged env vars for the command
+    # @return the value returned by the block
+    def around_command(&)
+      nest_sources(@packages.map(&:source).uniq, {}, &)
+    end
+
     def inspect
       "#<CobraCommander::Component:#{object_id} #{name} dependencies=#{dependencies.map(&:name)} packages=#{packages}>"
     end
@@ -50,5 +62,18 @@ module CobraCommander
     def dependencies
       @dependencies ||= @dependency_names.sort.filter_map { |name| @umbrella.find(name) }
     end
+
+  private
+
+    # Nests each source's #around_command, accumulating the env each yields,
+    # and finally yields the merged env to the block.
+    def nest_sources(sources, env, &block)
+      return yield(env) if sources.empty?
+
+      head, *rest = sources
+      head.around_command do |source_env|
+        nest_sources(rest, env.merge(source_env), &block)
+      end
+    end
   end
 end

data/lib/cobra_commander/executor/command.rb

@@ -21,29 +21,31 @@ module CobraCommander
       # @param package [CobraComander::Package] target package to execute the named command
       # @return [Array<Symbol, String>]
       def call(tty, package)
-        run_command tty, package, @command_name
+        package.around_command do |env|
+          run_command tty, package, @command_name, env
+        end
       end
 
     private
 
-      def run_command(tty, package, command_name)
+      def run_command(tty, package, command_name, env)
         definition = package.source.config&.dig("commands", command_name)
         case definition
-        when Array then run_multiple(tty, package, definition)
-        when Hash then run_with_criteria(tty, package, definition)
+        when Array then run_multiple(tty, package, definition, env)
+        when Hash then run_with_criteria(tty, package, definition, env)
         when nil then [:skip, format(SKIP_UNEXISTING, command_name, package.key)]
-        else run_script(tty, definition, package.path)
+        else run_script(tty, definition, package.path, env: env)
         end
       end
 
-      def run_with_criteria(tty, package, command)
+      def run_with_criteria(tty, package, command, env)
         return [:skip, format(SKIP_CRITERIA, package.name)] unless match_criteria?(package, command.fetch("if", {}))
 
-        run_script(tty, command["run"], package.path)
+        run_script(tty, command["run"], package.path, env: env)
       end
 
-      def run_multiple(tty, package, commands)
-        run_many(commands) { run_command(tty, package, _1) }
+      def run_multiple(tty, package, commands, env)
+        run_many(commands) { run_command(tty, package, _1, env) }
       end
     end
   end

data/lib/cobra_commander/executor/isolated_pty.rb

@@ -3,26 +3,17 @@
 module CobraCommander
   module Executor
     #
-    # Executes commands in a clean environment, without the influence
-    # of the current Bundler env vars.
+    # A PTY-enabled TTY::Command used to execute component scripts.
+    #
+    # Per-execution environment variables are supplied to TTY::Command#run!
+    # (so they are scoped to each subprocess and never mutate the parent
+    # ENV), while environment isolation/enhancement such as Bundler's
+    # `with_unbundled_env` is contributed by the package sources through
+    # their #around_command (see CobraCommander::Ruby::Bundle).
     #
     class IsolatedPTY < ::TTY::Command
-      def initialize(**kwargs)
-        super(pty: true, **kwargs)
-      end
-
-      def run!(...)
-        isolate_bundle do
-          super(...)
-        end
-      end
-
-      def isolate_bundle(&block)
-        if Bundler.respond_to?(:with_unbundled_env)
-          Bundler.with_unbundled_env(&block)
-        else
-          Bundler.with_clean_env(&block)
-        end
+      def initialize(**)
+        super(pty: true, **)
       end
     end
   end

data/lib/cobra_commander/executor/run_script.rb

@@ -3,8 +3,8 @@
 module CobraCommander
   module Executor
     module RunScript
-      def run_script(tty, script, path)
-        result = tty.run!(script, chdir: path, err: :out)
+      def run_script(tty, script, path, env: {})
+        result = tty.run!(env, script, chdir: path, err: :out)
 
         return [:error, result.out] if result.failed?
 
@@ -14,10 +14,10 @@ module CobraCommander
       def run_many(collection, &block)
         collection.lazy.map(&block)
                   .reduce do |(_, prev_output), (result, output)|
-          new_output = [prev_output&.strip, output&.strip].join("\n")
-          return [:error, new_output] if result == :error
+                    new_output = [prev_output&.strip, output&.strip].join("\n")
+                    return [:error, new_output] if result == :error
 
-          [:success, new_output]
+                    [:success, new_output]
         end
       end
     end

data/lib/cobra_commander/executor/script.rb

@@ -22,7 +22,9 @@ module CobraCommander
       # @param component [CobraComander::Component] target component
       # @return [Array<Symbol, String>]
       def call(tty, component)
-        run_many(component.root_paths) { run_script(tty, @script, _1) }
+        component.around_command do |env|
+          run_many(component.root_paths) { run_script(tty, @script, _1, env: env) }
+        end
       end
     end
   end

data/lib/cobra_commander/executor/worker_pool.rb

@@ -62,7 +62,7 @@ module CobraCommander
         @jobs = []
         @queue = Queue.new
 
-        push_all(jobs, &(name_f || :describe))
+        push_all(jobs, &name_f || :describe)
       end
 
       def error?
@@ -70,7 +70,7 @@ module CobraCommander
       end
 
       def push_all(jobs, &name_f)
-        jobs.each { push(name_f&.(_1), *Array(_1)) }
+        jobs.each { push(name_f&.call(_1), *Array(_1)) }
       end
 
       def push(name, *args)

data/lib/cobra_commander/executor.rb

@@ -32,13 +32,13 @@ module CobraCommander
     # @param jobs [Enumerable<CobraCommander::Executor::Job>] the jobs to run
     # @param interactive [Boolean] prefer interactive output
     # @see CobraCommander::Executor::WorkerPool for more options
-    def execute_and_handle_exit(jobs:, interactive: false, **kwargs, &name_f)
+    def execute_and_handle_exit(jobs:, interactive: false, **, &name_f)
       printer = if jobs.size == 1 then :quiet
                 elsif interactive then :progress
                 else
                   ::CobraCommander::Executor::BufferedPrinter
                 end
-      pool = WorkerPool.new(jobs: jobs, printer: printer, **kwargs, &name_f).tap(&:start)
+      pool = WorkerPool.new(jobs: jobs, printer: printer, **, &name_f).tap(&:start)
       return CobraCommander::Executor::OutputPrompt.run(pool) if interactive && jobs.size > 1
 
       exit(1) if pool.error?

data/lib/cobra_commander/git_changed.rb

@@ -19,8 +19,8 @@ module CobraCommander
       @base_branch = base_branch
     end
 
-    def each(&block)
-      changes.each(&block)
+    def each(&)
+      changes.each(&)
     end
 
   private

data/lib/cobra_commander/package.rb

@@ -9,7 +9,7 @@ module CobraCommander
 
     attr_reader :source, :path, :name, :dependencies
 
-    def_delegators :source, :key
+    def_delegators :source, :key, :around_command
 
     def initialize(source, path:, dependencies:, name:)
       @source = source

data/lib/cobra_commander/source.rb

@@ -22,8 +22,19 @@ module CobraCommander
       to_a
     end
 
-    def each(&block)
-      packages.each(&block)
+    # Wraps the execution of commands on this source's packages, letting the
+    # source enhance the surrounding process (e.g. Bundler isolation) and
+    # contribute environment variables to the command. The base implementation
+    # yields an empty env; plugins override it (see CobraCommander::Ruby::Bundle).
+    #
+    # @yieldparam env [Hash{String => String}] env vars to pass to the command
+    # @return the value returned by the block
+    def around_command
+      yield({})
+    end
+
+    def each(&)
+      packages.each(&)
     rescue Errno::ENOENT => e
       raise Error, e.message
     end

data/lib/cobra_commander/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CobraCommander
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cobra_commander
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ben Langfeld
 - Garett Arrowood
 - Carlos Palhares
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -18,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.4.17
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -78,128 +77,128 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 0.14.14
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
-  name: guard-rspec
+  name: license_finder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
-  name: license_finder
+  name: ostruct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 0.6.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: 3.13.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.82.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.30.1
+        version: 1.82.1
 - !ruby/object:Gem::Dependency
   name: rubocop-powerhome
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
 description: |
   Tools for working with Component Based Rails Apps (see https://cbra.info).
   Includes tools for graphing the components of an app and their relationships, as well as selectively
@@ -248,7 +247,6 @@ metadata:
   homepage_uri: http://tech.powerhrg.com/cobra_commander/
   source_code_uri: https://github.com/powerhome/cobra_commander
   changelog_uri: https://github.com/powerhome/cobra_commander/blob/main/cobra_commander/docs/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -256,15 +254,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Tools for working with Component Based Rails Apps
 test_files: []