next_rails_scaffold 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a1af872af2ffdab09af7df8cf1e5f337554642acd6e9325b9cf112ac4ff76c
-  data.tar.gz: 811159cc9f59924938ebeacfab6ce6ab39fd225c563f5f75babaf2d64ee0b418
+  metadata.gz: 1d11278bd324e9d9e0578c45bdba6ad9c0593a1b0a840ace0d655bb174e1a896
+  data.tar.gz: f63cf1c37de59625a87a1bbb24698840987bdf78ab8d98880cfbdc9321326f9c
 SHA512:
-  metadata.gz: 8904f7044947b2f53e55f71f37d7f47afe51b887f46fff09efb2b62e999aa5361d2f931c7601e27a35f5d4d3b51cf185cc0e63542e77b84665cfafd5d5d82d27
-  data.tar.gz: 1202d6c99bc7bc359796e76d1367379b08f6e458f179ae43bf6238cdb8f486560ce0fa6c78b173ec4ca2c1d2b5fc830cda475a5232172b7b02e07a2ace8feb6f
+  metadata.gz: cc2256f5b2240fe34df82adfa383ad54c497de6c63994201d5fe4a4461d89ad85337e349e505ed411d1fab57485f2168f84604bd2a0e9a7df822b6edc6e5305e
+  data.tar.gz: '0079fa4d104f63c64e127dcbef1a0062bee283df99885a542a1f5b9b8da1a42d318c3d15a278e9f98ab042a3d460ece8d3dc867cc0fb8fd9eab2025d2ad6a386'

data/lib/generators/rails/next_rails_scaffold/next_rails_scaffold_generator.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
-PackageManager = Struct.new(:fetch, :run, :add, :lock_file) do
-  def to_s = fetch
+require "tty-prompt"
+
+PackageManager = Struct.new(:fetch, :run, :add, :lock_file, :version) do
+  def to_s = run.split.first
 end
 
 module Rails
@@ -29,18 +31,9 @@ module Rails
     def initialize(args, *options) # :nodoc:
       super
 
-      self.attributes = shell.base.attributes
-
-      package_manager = shell.base.options[:package_manager]
-      until PACKAGE_MANAGERS.keys.include?(package_manager)
-        puts "Invalid package manager" unless package_manager.nil?
-        package_manager = ask(
-          "Which package manager do you want to use? " \
-          "(#{PACKAGE_MANAGERS.keys.to_sentence(words_connector: " or ")}): "
-        )
-      end
+      @prompt = TTY::Prompt.new
 
-      self.selected_package_manager = PACKAGE_MANAGERS[package_manager]
+      self.attributes = shell.base.attributes
     end
 
     # Properly nests namespaces passed into a generator
@@ -67,19 +60,20 @@ module Rails
     def create_frontend_project
       return say_status :remove, "skip frontend folder", :yellow if shell.base.behavior == :revoke
 
-      check_node!
       append_gitignore!
 
       empty_directory "frontend"
 
       inside("frontend") do
+        check_node!
+        check_pm_version!
         create_next_app!
         install_hygen!
 
         language = File.exist?("tsconfig.json") ? "typescript" : "javascript"
 
         run("#{selected_package_manager} hygen scaffold #{language} #{name} #{mapped_attributes.join(" ")}")
-        if !options[:skip_build] && yes?("Do you want to build your Next.js project? (y/N)")
+        if !options[:skip_build] && !@prompt.no?("Do you want to build your Next.js project?")
           run("#{selected_package_manager.run} build")
         end
       end
@@ -98,10 +92,34 @@ module Rails
       end
     end
 
+    def check_pm_version!
+      package_manager = shell.base.options[:package_manager]
+
+      unless package_manager
+        PACKAGE_MANAGERS.each do |manager, details|
+          if File.exist?(details.lock_file)
+            package_manager = manager
+            break
+          end
+        end
+      end
+
+      until PACKAGE_MANAGERS.keys.include?(package_manager)
+        puts "Invalid package manager" unless package_manager.nil?
+
+        package_manager = @prompt.select("Which package manager do you want to use?", PACKAGE_MANAGERS.keys)
+      end
+
+      self.selected_package_manager = PACKAGE_MANAGERS[package_manager]
+
+      selected_package_manager.version = run("#{selected_package_manager} --version", capture: true).gsub(/[^0-9.]/, "")
+      log :package_manager, "Using #{selected_package_manager} version '#{selected_package_manager.version}'"
+    end
+
     def append_gitignore!
       rows = <<~HEREDOC
 
-        # Ingoring node modules for Rails and Next.js projects
+        # Ignoring node modules for Rails and Next.js projects
         node_modules/
       HEREDOC
 
@@ -115,6 +133,11 @@ module Rails
         "#{selected_package_manager.fetch} create-next-app@#{NEXT_VERSION} . " \
         "--no-app --src-dir --import-alias \"@/*\""
       )
+
+      if selected_package_manager.to_s == "yarn" &&
+         Gem::Dependency.new("", ">= 2.0").match?("", selected_package_manager.version)
+        run("yarn config set nodeLinker node-modules")
+      end
     end
 
     def install_hygen!

data/lib/next_rails_scaffold/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NextRailsScaffold
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_rails_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Raphael Araújo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-02 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.2
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
 description: |
   The `next_rails_scaffold` gem is a powerful extension to the standard Ruby on Rails scaffold generator. It streamlines the development workflow by not only creating the backend structure with Rails but also automating the setup of a frontend directory using Next.js. Upon running the scaffold generator, this gem intelligently generates a Next.js application within the specified frontend directory.