yamine 0.15.1 → 0.16.0

data/lib/yamine/readiness.rb

@@ -68,7 +68,8 @@ module Yamine
     end
 
     # Pre-flight: verify runtime dependencies before spawning anything.
-    # Ruby (bundle check), Node (node_modules present). Returns [ok, fix].
+    # Ruby (bundle check), Node (node_modules present — but only when the
+    # manifest actually declares dependencies). Returns [ok, fix].
     # Fast-fails with the fix instead of letting Puma crash-loop for 60s.
     def check_deps(dir = Dir.pwd)
       gemfile = File.join(dir, "Gemfile")
@@ -80,7 +81,8 @@ module Yamine
         end
       end
       package = File.join(dir, "package.json")
-      if File.file?(package) && !File.directory?(File.join(dir, "node_modules"))
+      if File.file?(package) && !File.directory?(File.join(dir, "node_modules")) &&
+         package_declares_dependencies?(package)
         return [false, "node_modules missing — run `npm install` in #{dir}"]
       end
       [true, nil]
@@ -88,6 +90,29 @@ module Yamine
       [false, e.message.lines.first&.strip]
     end
 
+    # Does this manifest need an install at all? A stub `{}`
+    # (dependency-less apps keep one so tooling finds a manifest) has
+    # nothing to install — `npm install` creates no node_modules for
+    # it — and demanding the directory would fail every fresh clone
+    # and worktree of such an app forever. An unreadable manifest
+    # keeps the old directory check: honest conservatism.
+    def package_declares_dependencies?(path)
+      data = JSON.parse(File.read(path))
+      return false unless data.is_a?(Hash)
+
+      %w[dependencies devDependencies optionalDependencies peerDependencies workspaces]
+        .any? do |key|
+          value = data[key]
+          if value.is_a?(Hash) || value.is_a?(Array)
+            !value.empty?
+          else
+            !value.nil?
+          end
+        end
+    rescue JSON::ParserError, SystemCallError
+      true
+    end
+
     # Poll an HTTP route until healthy or timeout. Healthy = healthcheck
     # path returns 2xx-3xx, or (no healthcheck) TCP accept on the port.
     # Returns [healthy, detail].

data/lib/yamine/runner.rb

@@ -100,11 +100,11 @@ module Yamine
     # yamine's own keys (PORT, YAMINE_URL, DATABASE_URL, the TLS vars)
     # win over it, because those describe the boot rather than the app.
     def boot_run(name:, hostname:, url:, dir:, command:, port: nil, force: false,
-      rails_dev_host: nil, register: true, database_url: nil, spec: nil,
-      extra_env: nil, subdomains: false)
+      rails_dev_host: nil, register: true, database_url: nil, database_env: nil,
+      spec: nil, extra_env: nil, subdomains: false)
       port ||= Ports.find_free
       env = child_env(dir, url: url, port: port, rails_dev_host: rails_dev_host,
-        database_url: database_url, extra_env: extra_env)
+        database_url: database_url, database_env: database_env, extra_env: extra_env)
       path = log_path(dir, name)
       pid = with_clean_env { spawn(env, *command, chdir: dir, out: path, err: [:child, :out]) }
       Process.detach(pid)
@@ -131,9 +131,9 @@ module Yamine
     # Returns the placeholder App (target known before bind). Fate of
     # the backend is decided by wait, not by spawn.
     def spawn_http(name:, hostname:, url:, dir:, command:, port:, rails_dev_host: nil,
-      database_url: nil, force: false, extra_env: nil)
+      database_url: nil, database_env: nil, force: false, extra_env: nil)
       env = child_env(dir, url: url, port: port, rails_dev_host: rails_dev_host,
-        database_url: database_url, extra_env: extra_env)
+        database_url: database_url, database_env: database_env, extra_env: extra_env)
       path = log_path(dir, name)
       pid = with_clean_env { spawn(env, *command, chdir: dir, out: path, err: [:child, :out]) }
       Process.detach(pid)
@@ -158,7 +158,8 @@ module Yamine
       false
     end
 
-    def child_env(dir, url:, port:, rails_dev_host: nil, database_url: nil, extra_env: nil)
+    def child_env(dir, url:, port:, rails_dev_host: nil, database_url: nil,
+      database_env: nil, extra_env: nil)
       # The config's own variables first, so everything below overrides
       # them: PORT, YAMINE_URL, DATABASE_URL, and the TLS paths describe
       # *this boot* and must not be lost to a stray key in local.yml.
@@ -190,10 +191,17 @@ module Yamine
       # proxied hostname so Rails apps boot behind yamine with zero
       # config — this replaces the yamine-rails hosts patch.
       env["RAILS_DEVELOPMENT_HOSTS"] = rails_dev_host if rails_dev_host
-      # Per-worktree database: every process in this worktree shares one
-      # isolated database. Frameworks that honor DATABASE_URL (Rails,
-      # Django, most Node) get isolation for free; others ignore it.
-      env["DATABASE_URL"] = database_url if database_url
+      # Per-worktree databases: the whole isolated set this checkout
+      # claims — DATABASE_URL for primary plus NAME_DATABASE_URL per
+      # extra config (Rails' own convention), so a multi-database app
+      # gets every database redirected, not just the first. Frameworks
+      # that honor DATABASE_URL (Rails, Django, most Node) get
+      # isolation for free; others ignore it.
+      if database_env
+        database_env.each { |k, v| env[k.to_s] = v.to_s if v }
+      elsif database_url
+        env["DATABASE_URL"] = database_url
+      end
       env
     end
 

data/lib/yamine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Yamine
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

data/lib/yamine.rb

@@ -4,6 +4,7 @@ require_relative "yamine/version"
 require_relative "yamine/errors"
 require_relative "yamine/agent"
 require_relative "yamine/database"
+require_relative "yamine/probe"
 require_relative "yamine/sanitize"
 require_relative "yamine/hostname"
 require_relative "yamine/inference"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamine
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Kaka Ruto
@@ -103,6 +103,7 @@ files:
 - lib/yamine/log.rb
 - lib/yamine/ownership.rb
 - lib/yamine/ports.rb
+- lib/yamine/probe.rb
 - lib/yamine/procfile.rb
 - lib/yamine/proxy.rb
 - lib/yamine/proxy_control.rb