gemstack-cli 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f9ebe8567d9943d054f3baaf1427483fd75242677bc8a461034d63a826b197e
-  data.tar.gz: 816d6520c304822b290f30b417f574dfe8bd771586d5bc8a6df2b929ec144b4f
+  metadata.gz: 3b7ea1041a871d84d72d33529ee4b303145363665a6605d0cc5d533fd4604157
+  data.tar.gz: 02625e8747b1efe7fae2191d356376bc8bdde1500d892cef5f945badb1d5451d
 SHA512:
-  metadata.gz: 7068ec73cee6b4f0e87cb5c84a4f0531bbfd8444df9170a994e6223f8a32cf7d5b814ef089bc5c5854ce539e919bc9a5dde10118dcfcd035ac02099bff5e5e28
-  data.tar.gz: f1c8ddf36a3b0eb81f7a1a680b5c95bfa8df8328dbbf0804f927bfb85339f02fba020cb6e8d66e16f0c14fff3902a2183bd49a212dc1a39bf3ce650365b55b62
+  metadata.gz: 96aabfd8af652f60639dd4aa4b155351b654be18ff569a262520c1fec6a1d7f73a1f192c62b7dba551eb4bbdce86fc3e4ad1a00f100d4b4ad6ba51e5a3e56f21
+  data.tar.gz: 2efe2c5964c8a597efae119096f5293b635574b1b2db68b5be483a203d2d3228ec3ff87018f37865a5caf081b1efd7b97708b55d44465cba61bab223aed6d210

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.3
+
+See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).
+
 ## 0.2.2
 
 See the [GemStack changelog](https://github.com/gemstack-rb/gemstack/blob/main/CHANGELOG.md).

data/lib/gemstack/cli/app_generator.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "gemstack/dev"
+
 module GemStack
   class CLI < Thor
     # `gemstack new NAME` — a Ruby API + Next.js application containing the
@@ -30,8 +32,12 @@ module GemStack
 
       def version = GemStack::VERSION
 
-      # Pins the app to the Ruby that generated it (.ruby-version, .tool-versions).
+      # Pins the app to the Ruby that generated it, in files every version
+      # manager reads (.ruby-version: rbenv, rvm, chruby, asdf, mise;
+      # .tool-versions: asdf, mise), and Node.js likewise (.node-version,
+      # .nvmrc, .tool-versions) — DECISIONS D-066.
       def ruby_version = RUBY_VERSION
+      def node_version = @node_version ||= Dev::Toolchain.pinned_node_version
       def frontend? = !@options[:skip_frontend]
       def database? = !@options[:skip_database]
 
@@ -54,7 +60,8 @@ module GemStack
         database_adapter if database? # fail early on an unknown --database
         @output.puts("Creating GemStack application #{name} in #{destination}")
         render_directory("app", destination, skip: lambda { |rel|
-          !database? && (rel.start_with?("db/", "app/models/") || rel == "config/database.yml.tt")
+          (!database? && (rel.start_with?("db/", "app/models/") || rel == "config/database.yml.tt")) ||
+            (!frontend? && %w[dot_node-version.tt dot_nvmrc.tt].include?(rel))
         })
         render_directory("frontend", File.join(destination, "frontend")) if frontend?
         install unless @options[:skip_install]

data/lib/gemstack/cli/doctor.rb

@@ -2,6 +2,7 @@
 
 require "open3"
 require "socket"
+require "gemstack/dev"
 
 module GemStack
   class CLI < Thor
@@ -50,11 +51,11 @@ module GemStack
 
       def check_ruby
         wanted = read(".ruby-version")&.strip&.delete_prefix("ruby-")
-        if wanted && !wanted.empty? && !RUBY_VERSION.start_with?(wanted)
-          caution("Ruby #{RUBY_VERSION}",
-                  "the app pins #{wanted} (.ruby-version) — install it: asdf install ruby #{wanted}")
-        elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new("4.0")
-          problem("Ruby #{RUBY_VERSION}", "GemStack needs Ruby 4.0 or newer")
+        if !Dev::Toolchain.ruby_ok?
+          problem("Ruby #{RUBY_VERSION}", "GemStack needs Ruby #{Dev::Toolchain::MIN_RUBY} or newer — " \
+                                          "#{Dev::Toolchain.ruby_hint(wanted.to_s.empty? ? "3.4" : wanted)}")
+        elsif wanted && !wanted.empty? && !RUBY_VERSION.start_with?(wanted)
+          caution("Ruby #{RUBY_VERSION}", "the app pins #{wanted} (.ruby-version) — #{Dev::Toolchain.ruby_hint(wanted)}")
         else
           pass("Ruby #{RUBY_VERSION}#{" (YJIT available)" if defined?(RubyVM::YJIT)}")
         end
@@ -63,17 +64,17 @@ module GemStack
       def check_node
         return unless File.directory?(path("frontend"))
 
-        out, status = @run.call("node", "--version")
-        version = status.success? ? out.strip.delete_prefix("v") : nil
-        if version.nil?
-          problem("Node.js not found", "install Node.js #{MIN_NODE.join(".")}+ (the frontend is Next.js)")
-        elsif (version.split(".").map(&:to_i) <=> MIN_NODE).negative?
-          problem("Node.js #{version}", "Next.js 16 needs Node.js #{MIN_NODE.join(".")} or newer")
+        node = Dev::Toolchain.node(@run)
+        wanted = read(".node-version")&.strip || read(".nvmrc")&.strip || Dev::Toolchain::LTS_NODE
+        if node.nil?
+          problem("Node.js not found", Dev::Toolchain.node_hint(wanted, nil))
+        elsif !Dev::Toolchain.node_ok?(node[:version])
+          problem("Node.js #{node[:version]} (#{node[:path]})",
+                  "Next.js 16 needs #{MIN_NODE.join(".")}+ — " \
+                  "#{Dev::Toolchain.node_hint(wanted, Dev::Toolchain.node_manager(node[:path]))}")
         else
-          pass("Node.js #{version}")
+          pass("Node.js #{node[:version]}")
         end
-      rescue SystemCallError
-        problem("Node.js not found", "install Node.js #{MIN_NODE.join(".")}+ (the frontend is Next.js)")
       end
 
       def check_frontend_dependencies

data/templates/app/Gemfile.tt

@@ -38,7 +38,7 @@ gem "<%= driver_gem %>", "<%= driver_version %>" # the <%= database_adapter %> d
 # gem "stripe"
 
 group :development, :test do
-  gem "irb" # `gemstack console`; a bundled (not default) gem since Ruby 4.0
+  gem "irb" # `gemstack console` (a bundled gem, not a default one, in newer Rubies)
   gem "minitest", "~> 5.25"
   gem "rack-test", "~> 2.2"
 end

data/templates/app/dot_node-version.tt

@@ -0,0 +1 @@
+<%= node_version %>

data/templates/app/dot_nvmrc.tt

@@ -0,0 +1 @@
+<%= node_version %>

data/templates/app/dot_tool-versions.tt

@@ -1 +1,4 @@
 ruby <%= ruby_version %>
+<% if frontend? -%>
+nodejs <%= node_version %>
+<% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Adware Technologies
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: gemstack-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,8 @@ files:
 - templates/app/db/seeds.rb
 - templates/app/dot_env.example.tt
 - templates/app/dot_gitignore
+- templates/app/dot_node-version.tt
+- templates/app/dot_nvmrc.tt
 - templates/app/dot_ruby-version.tt
 - templates/app/dot_tool-versions.tt
 - templates/app/test/health_test.rb
@@ -190,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '4.0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="