nomono 1.1.8 → 1.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f835e50fda7577145ec9df9586ac34f86fe123ca026e204503962b662e50983b
-  data.tar.gz: 1dcfd241420c33f51361d8ec875a3b02a4b729a85574e732378dd69e9d65ff25
+  metadata.gz: 352da75d9b7ee4cce8138807cd9adf2cc6b80e5e3ae3d95cfe9c1dfedf0f4b50
+  data.tar.gz: 07543cdd4db51a080d4d0c35fd83357d70bc9f9bbe8381cb340701dbfe4f3ee2
 SHA512:
-  metadata.gz: 771ca4c88a0ba2f722f37aa3ca3a825cc0b0c690c0324275ee3c3fbd9d828d7adf3fc2c0e2ce4ca360cc64dbdbfb294fffcb889d6ba3bf6b0357726da6b7dd05
-  data.tar.gz: 997d15fe1266f6429e69623a4667b7acb3d5d21f120c5638e366f38c4aba1b9e53a78274bebecb637903d4de9cfeff50adbb1da08d1aae7d986f5e9f34127f91
+  metadata.gz: fe21911800405624ca4a9f43fb294d22c44d1f38d8af2273a2e292f3405c66bff3bc5e4fa039408a37db5d2fd75b40cf8d4dbe03f769cb10de3b7b03ec1a7551
+  data.tar.gz: f05fe0979f7a03575129a9bc0186dcd53ac5dbed095b1ce421a76a3a3632f285b167f24a853cdfb70b8069b55987ee4d9b4b500f436b75a346541facb1e616b1

data/CHANGELOG.md

@@ -22,6 +22,45 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Changed
 
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [1.1.12] - 2026-10-19
+
+- TAG: [v1.1.12][1.1.12t]
+- COVERAGE: 97.37% -- 185/190 lines in 7 files
+- BRANCH COVERAGE: 83.10% -- 59/71 branches in 7 files
+- 27.78% documented
+
+## [1.1.11] - 2026-10-19
+
+- TAG: [v1.1.11][1.1.11t]
+- COVERAGE: 97.37% -- 185/190 lines in 7 files
+- BRANCH COVERAGE: 83.10% -- 59/71 branches in 7 files
+- 27.78% documented
+
+### Fixed
+
+- [kc] nomono-fact-requirements: Forward explicit dependency requirements through eval_nomono_gems instead of discarding them before declaring local path dependencies.
+
+- Make eval_nomono_gems intentionally override existing direct dependencies with registered local path sources while intersecting caller and gemspec constraints, preserving dependency conditions and metadata, and supporting either declaration order and repeated calls.
+
+- [kc] shared-local-template-overrides: Regenerate coverage and templating local Gemfiles with the shared Nomono override API instead of obsolete custom merge and inline dependency replacement.
+
+## [1.1.8] - 2026-10-15
+
+- TAG: [v1.1.8][1.1.8t]
+- COVERAGE: 97.56% -- 120/123 lines in 7 files
+- BRANCH COVERAGE: 86.67% -- 39/45 branches in 7 files
+- 25.00% documented
+
+### Changed
+
 - [kc] kettle-jem/prepare: updated 8 project files:
   - configuration (1)
   - dependencies (7)
@@ -32,14 +71,6 @@ Please file a bug if you notice a violation of semantic versioning.
   - other (1)
   - workflows (17)
 
-### Deprecated
-
-### Removed
-
-### Fixed
-
-### Security
-
 ## [1.1.7] - 2026-10-10
 
 - TAG: [v1.1.7][1.1.7t]
@@ -395,7 +426,13 @@ Please file a bug if you notice a violation of semantic versioning.
 - TAG: [v1.0.0][1.0.0t]
 - 12.50% documented
 
-[Unreleased]: https://github.com/kettle-dev/nomono/compare/v1.1.7...HEAD
+[Unreleased]: https://github.com/kettle-dev/nomono/compare/v1.1.12...HEAD
+[1.1.12]: https://github.com/kettle-dev/nomono/compare/v1.1.11...v1.1.12
+[1.1.12t]: https://github.com/kettle-dev/nomono/releases/tag/v1.1.12
+[1.1.11]: https://github.com/kettle-dev/nomono/compare/v1.1.8...v1.1.11
+[1.1.11t]: https://github.com/kettle-dev/nomono/releases/tag/v1.1.11
+[1.1.8]: https://github.com/kettle-dev/nomono/compare/v1.1.7...v1.1.8
+[1.1.8t]: https://github.com/kettle-dev/nomono/releases/tag/v1.1.8
 [1.1.7]: https://github.com/kettle-dev/nomono/compare/v1.1.6...v1.1.7
 [1.1.7t]: https://github.com/kettle-dev/nomono/releases/tag/v1.1.7
 [1.1.6]: https://github.com/kettle-dev/nomono/compare/v1.1.5...v1.1.6

data/README.md

@@ -29,6 +29,31 @@ It provides two Gemfile macros:
 - `eval_nomono_gems(**opts)` directly emits `gem "name", path: "..."`
 
 The API mirrors existing `*_local.gemfile` patterns used in kettle-dev projects, but centralizes path/env logic in one reusable library.
+
+Pass dependency requirements from the caller's project facts to the same macro:
+
+```ruby
+eval_nomono_gems(
+  gems: %w[shared-core shared-leaf],
+  requirements: {
+    "shared-core" => ["= 7.1.14"],
+    "shared-leaf" => ["~> 2.0", ">= 2.0.3"]
+  },
+  path_env: "FAMILY_DEV"
+)
+```
+
+`requirements` is a map of gem names to requirement strings or arrays. Omitted
+entries keep the unversioned (`>= 0`) behavior. Requirements go directly to
+Bundler; Nomono does not infer them from checkout versions, filter incompatible
+checkouts, or silently select a registry source instead. Repository shape and
+CI/local-development policy remain the caller's responsibility.
+
+Declare each direct dependency's source once. A runtime gemspec requirement can
+coexist with a matching path dependency, but repeated direct Gemfile declarations
+with different requirements or different sources are Bundler DSL errors; merely
+repeating a version requirement does not reconcile different direct sources.
+
 Use `require "nomono"` for the runtime resolver API.
 Use `require "nomono/bundler"` from Gemfiles or modular Gemfiles; this is the explicit hook that installs the Gemfile macros into `Bundler::Dsl`.
 
@@ -508,7 +533,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.123-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.190-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/nomono/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/nomono/dsl.rb

@@ -2,14 +2,132 @@
 
 module Nomono
   module GemfileDsl
+    # Only source-related state is replaced. Dependency#dup retains effective
+    # conditions and metadata, including fields unknown to this Bundler adapter.
+    SOURCE_OPTIONS = %w[source path git github branch ref tag glob submodules name].freeze
+    private_constant :SOURCE_OPTIONS
+
+    # Activated on this DSL instance only, after an intentional local override.
+    # Bundler 4 routes gemspec development dependencies through add_dependency;
+    # Bundler 2 routes them through gem instead.
+    module LocalDeclarations
+      def gem(name, *args)
+        return super if method(:add_dependency).super_method
+
+        options = args.last.is_a?(Hash) ? args.last : {}
+        nomono_declaration(name, options[:type] == :development || options["type"] == :development) { super }
+      end
+
+      def to_definition(*args)
+        nomono_prune_displaced_sources
+        super
+      end
+
+      private
+
+      def add_dependency(name, version = nil, options = {})
+        nomono_declaration(name, options["gemspec_dev_dep"]) { super }
+      end
+    end
+    private_constant :LocalDeclarations
+
     def nomono_gems(gems:, **opts)
       Nomono.resolver.gems(gems: gems, **opts)
     end
 
-    def eval_nomono_gems(gems:, **opts)
+    # Requirements are caller facts, not checkout versions. An existing direct
+    # dependency keeps its constraints and metadata; explicit facts only narrow
+    # them. A new dependency with no facts retains Bundler's default >= 0.
+    def eval_nomono_gems(gems:, requirements: {}, **opts)
       nomono_gems(gems: gems, **opts).each do |gem_name, gem_path|
-        gem(gem_name, path: gem_path)
+        # Keep lightweight non-Bundler consumers of the macro working too.
+        unless respond_to?(:dependencies)
+          gem(gem_name, *Array(requirements[gem_name]), path: gem_path)
+          next
+        end
+
+        constraints = Array(requirements[gem_name]) + nomono_gemspec_requirements(gem_name)
+        current = dependencies.find { |dep| dep.name == gem_name }
+        if current
+          local_source = path(gem_path) {}
+          replacement = nomono_local_dependency(current, local_source, gem_path, constraints)
+          dependencies[dependencies.index(current)] = replacement
+        else
+          gem(gem_name, *Array(requirements[gem_name]), path: gem_path)
+          replacement = dependencies.last
+        end
+        @nomono_overrides ||= {}
+        previous = @nomono_overrides[gem_name]
+        @nomono_overrides[gem_name] = {
+          source: replacement.source,
+          path: gem_path,
+          declaration: previous ? previous[:declaration] : !current.nil?
+        }
+        singleton_class.prepend(LocalDeclarations) unless singleton_class < LocalDeclarations
+      end
+    end
+
+    private
+
+    # Bundler may already have preferred a direct Gemfile declaration and
+    # discarded the intersected gemspec development constraint from its list.
+    def nomono_gemspec_requirements(name)
+      gemspecs.flat_map(&:development_dependencies).select { |dep| dep.name == name }.flat_map { |dep| dep.requirement.as_list }
+    end
+
+    # Let Bundler construct the later declaration normally, but in isolation so
+    # its duplicate guard cannot discard a gemspec constraint or reject the
+    # deliberate source override. Always restore the real list on failure.
+    def nomono_declaration(name, gemspec_development)
+      override = @nomono_overrides && @nomono_overrides[name]
+      current = dependencies.find { |dep| dep.name == name }
+      return yield unless override && current
+      development = current.respond_to?(:gemspec_dev_dep?) ? current.gemspec_dev_dep? : current.type == :development
+      return yield if override[:declaration] && !development && !gemspec_development
+
+      original = @dependencies
+      begin
+        @dependencies = []
+        yield
+        incoming = @dependencies.fetch(0)
+      ensure
+        @dependencies = original
+      end
+      metadata = (gemspec_development && override[:declaration]) ? current : incoming
+      constraints = current.requirement.as_list + incoming.requirement.as_list
+      replacement = nomono_local_dependency(metadata, override[:source], override[:path], constraints)
+      dependencies[dependencies.index(current)] = replacement
+      override[:declaration] = true
+    end
+
+    # Defer cleanup until declarations are complete: an enclosing source block
+    # can still declare other gems after the override. Unreferenced old git/path
+    # sources otherwise participate in resolution and may require a checkout.
+    def nomono_prune_displaced_sources
+      Array(@nomono_displaced_sources).each do |source|
+        next if source == @sources.default_source || dependencies.any? { |dep| dep.source == source }
+
+        @sources.git_sources.delete(source)
+        @sources.path_sources.delete(source)
+        @sources.non_global_rubygems_sources.delete(source)
+        @sources.plugin_sources.delete(source)
+      end
+    end
+
+    def nomono_local_dependency(dependency, source, gem_path, requirements)
+      replacement = dependency.dup
+      replacement.instance_variable_set(:@requirement, Gem::Requirement.new(dependency.requirement.as_list + requirements))
+      @nomono_displaced_sources ||= []
+      @nomono_displaced_sources |= [dependency.source] if dependency.source && dependency.source != source
+      (SOURCE_OPTIONS - ["name"]).each { |key| replacement.instance_variable_set(:"@#{key}", nil) }
+      replacement.instance_variable_set(:@source, source)
+      replacement.instance_variable_set(:@path, gem_path)
+      # Bundler 4 lazily reads @options; older Bundlers store eager ivars.
+      if (options = dependency.instance_variable_get(:@options))
+        options = options.except(*SOURCE_OPTIONS)
+        replacement.instance_variable_set(:@options, options.merge("source" => source, "path" => gem_path))
       end
+      replacement
     end
   end
 end

data/lib/nomono/version.rb

@@ -4,7 +4,7 @@ module Nomono
   # Version namespace for this gem.
   module Version
     # Current gem version.
-    VERSION = "1.1.8"
+    VERSION = "1.1.12"
   end
   # Current gem version exposed at the traditional constant location.
   VERSION = Version::VERSION # Traditional Constant Location

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomono
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.12
 platform: ruby
 authors:
 - Peter H. Boling
@@ -66,7 +66,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.13
+        version: 3.1.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -76,7 +76,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.13
+        version: 3.1.18
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.25
+        version: 2.0.27
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,7 +184,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.25
+        version: 2.0.27
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -283,10 +283,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://nomono.galtzo.com/
-  source_code_uri: https://github.com/kettle-dev/nomono/tree/v1.1.8
-  changelog_uri: https://github.com/kettle-dev/nomono/blob/v1.1.8/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/nomono/tree/v1.1.12
+  changelog_uri: https://github.com/kettle-dev/nomono/blob/v1.1.12/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/nomono/issues
-  documentation_uri: https://www.rubydoc.info/gems/nomono/1.1.8
+  documentation_uri: https://www.rubydoc.info/gems/nomono/1.1.12
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/nomono/wiki
   news_uri: https://www.railsbling.com/tags/nomono