next_rails_scaffold 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d11278bd324e9d9e0578c45bdba6ad9c0593a1b0a840ace0d655bb174e1a896
-  data.tar.gz: f63cf1c37de59625a87a1bbb24698840987bdf78ab8d98880cfbdc9321326f9c
+  metadata.gz: 9782e55b0d74d22f2ed97eedf65a8d395ac86e378b2a384f6a9c6fb97b08eee0
+  data.tar.gz: 77612dbe142053c06fb1c85b023eb3bb246e1861f28aa1bf357a1f554c60cff7
 SHA512:
-  metadata.gz: cc2256f5b2240fe34df82adfa383ad54c497de6c63994201d5fe4a4461d89ad85337e349e505ed411d1fab57485f2168f84604bd2a0e9a7df822b6edc6e5305e
-  data.tar.gz: '0079fa4d104f63c64e127dcbef1a0062bee283df99885a542a1f5b9b8da1a42d318c3d15a278e9f98ab042a3d460ece8d3dc867cc0fb8fd9eab2025d2ad6a386'
+  metadata.gz: fbf95d19fb929d929a25f71670562e603155215e1c577ec0ad4a9f12654e97d2d555373ae76488acbc46f57a90822f09937ccb8130c7203e2f5db0839ab7019b
+  data.tar.gz: 5407eb47b2948809ba72d28c06036423788b8aaa44da5ca2d52f0315b6c4834e782296bc485262faa464e8fb4fc8327de09fdd01b587083a0cc14eb7abdc0613

data/lib/generators/next_rails_scaffold/node_package_manager.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "open3"
+require "tty-prompt"
+
+module NextRailsScaffold
+  module Generators
+    NodePackageManagerStruct = Struct.new(:fetch, :run, :add, :lock_file, :version) do
+      def to_s = run.split.first
+
+      def available?
+        version.present?
+      end
+
+      def version
+        @version ||= NodePackageManager.get_version(to_s)
+      end
+    end
+
+    NODE_REQUIRED_VERSION = ENV.fetch("NODE_REQUIRED_VERSION", ">= 18.20")
+    NEXT_VERSION = ENV.fetch("NEXT_VERSION", "15.1.6")
+
+    PACKAGE_MANAGERS = {
+      "npm" => NodePackageManagerStruct.new("npx", "npm run", "npm install", "package-lock.json"),
+      "yarn" => NodePackageManagerStruct.new("npx", "yarn", "yarn add", "yarn.lock"),
+      "pnpm" => NodePackageManagerStruct.new("pnpm dlx", "pnpm", "pnpm add", "pnpm-lock.yaml"),
+      "bun" => NodePackageManagerStruct.new("bunx", "bun run", "bun add", "bun.lock.json")
+    }.freeze
+
+    class NodePackageManager
+      attr_reader :selected_package_manager
+
+      def self.get_version(command)
+        Open3.capture3(command, "--version").first.gsub(/[^0-9.]/, "")
+      rescue Errno::ENOENT
+        nil
+      end
+
+      def initialize(shell)
+        @prompt = TTY::Prompt.new
+        @shell = shell
+      end
+
+      def check_node!
+        node_version = self.class.get_version("node")
+
+        return if Gem::Dependency.new("", NODE_REQUIRED_VERSION).match?("", node_version)
+
+        raise node_version ? "Your Node version is '#{node_version}'" : "Node not found"
+      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)
+          raise "Invalid package manager" unless package_manager.nil?
+
+          package_manager = @prompt.select(
+            "Which package manager do you want to use?",
+            PACKAGE_MANAGERS.keys.map { |pm| { name: pm, value: pm, disabled: !PACKAGE_MANAGERS[pm].available? } }
+          )
+        end
+
+        @selected_package_manager = PACKAGE_MANAGERS[package_manager]
+      end
+
+      def create_next_app!
+        return if File.exist?("package.json")
+
+        system(
+          "#{selected_package_manager.fetch} create-next-app@#{NEXT_VERSION} . --use-#{selected_package_manager} " \
+          "--no-app --src-dir --import-alias \"@/*\" #{@shell.base.options[:typescript] ? "--ts" : ""} #{Rails.env.test? ? "--yes" : ""}"
+        )
+
+        if selected_package_manager.to_s == "yarn" &&
+           Gem::Dependency.new("", ">= 2.0").match?("", selected_package_manager.version)
+          system("yarn config set nodeLinker node-modules")
+        end
+      end
+
+      def install_hygen!
+        return if Dir.exist?("_templates")
+
+        hygen_add = "hygen-add@https://github.com/raphox/hygen-add"
+
+        system("#{selected_package_manager.add} -D hygen #{hygen_add}")
+        system("#{selected_package_manager.fetch} #{hygen_add} next-rails-scaffold --pm #{selected_package_manager}")
+      end
+    end
+  end
+end

data/lib/generators/next_rails_scaffold/scaffold_generator.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "rails/generators/rails/scaffold/scaffold_generator"
+require_relative "node_package_manager"
+
+module NextRailsScaffold
+  module Generators
+    class ScaffoldGenerator < Rails::Generators::ScaffoldGenerator
+      include ::NextRailsScaffold::Actions
+
+      source_root File.expand_path("templates", __dir__)
+
+      argument :attributes, type: :array, default: [], banner: "field:type field:type"
+      class_option :package_manager, type: :string, desc: "Package manager to use for frontend project"
+      class_option :skip_build, type: :boolean, default: false, desc: "Skip running Next.js build"
+      class_option :skip_routes, type: :boolean, default: false, desc: "Skip adding resources to routes.rb"
+      class_option :typescript, type: :boolean, default: true, desc: "Generate TypeScript scaffold"
+
+      attr_accessor :selected_package_manager
+
+      def initialize(args, *options) # :nodoc:
+        super
+        self.attributes = shell.base.attributes
+      end
+
+      def add_resource_route
+        return if options[:actions].present? || options[:skip_routes]
+
+        route "resources :#{file_name.pluralize}", namespace: regular_class_path, scope: "/api"
+      end
+
+      def create_root_folder
+        empty_directory "frontend"
+      end
+
+      # Check Javascript dependencies and create a new Next.js project. Install the the useful packages and create the
+      # scaffold code for frontend application.
+      def create_frontend_project
+        return say_status :remove, "skip frontend folder", :yellow if shell.base.behavior == :revoke
+
+        append_gitignore!
+
+        node_package_manager = NodePackageManager.new(shell)
+
+        inside("frontend") do
+          node_package_manager.check_node!
+          node_package_manager.check_pm_version!
+          node_package_manager.create_next_app!
+          node_package_manager.install_hygen!
+
+          return if Rails.env.test?
+
+          selected_package_manager = node_package_manager.selected_package_manager
+          language = File.exist?("tsconfig.json") ? "typescript" : "javascript"
+
+          run("#{selected_package_manager.fetch} hygen scaffold #{language} #{name} #{mapped_attributes.join(" ")}")
+          if !options[:skip_build] && !@prompt.no?("Do you want to build your Next.js project?")
+            run("#{selected_package_manager.run} build")
+          end
+        end
+      end
+
+      private
+
+      def append_gitignore!
+        path = File.join(destination_root, ".gitignore")
+
+        return unless File.exist?(path)
+
+        rows = <<~HEREDOC
+
+          # Ignoring node modules for Rails and Next.js projects
+          node_modules/
+        HEREDOC
+
+        append_to_file path, rows
+      end
+
+      def mapped_attributes
+        attributes.map { |attr| "#{attr.name}:#{attr.type}" }
+      end
+    end
+  end
+end

data/lib/next_rails_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_rails_scaffold
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Raphael Araújo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,8 +68,9 @@ files:
 - config/routes.rb
 - lib/generators/next_rails_scaffold/USAGE
 - lib/generators/next_rails_scaffold/install_generator.rb
+- lib/generators/next_rails_scaffold/node_package_manager.rb
+- lib/generators/next_rails_scaffold/scaffold_generator.rb
 - lib/generators/next_rails_scaffold/templates/config/initializers/next_rails_scaffold.rb
-- lib/generators/rails/next_rails_scaffold/next_rails_scaffold_generator.rb
 - lib/next_rails_scaffold.rb
 - lib/next_rails_scaffold/actions.rb
 - lib/next_rails_scaffold/engine.rb

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

@@ -1,158 +0,0 @@
-# frozen_string_literal: true
-
-require "tty-prompt"
-
-PackageManager = Struct.new(:fetch, :run, :add, :lock_file, :version) do
-  def to_s = run.split.first
-end
-
-module Rails
-  class NextRailsScaffoldGenerator < Rails::Generators::NamedBase
-    include ::NextRailsScaffold::Actions
-
-    source_root File.expand_path("templates", __dir__)
-
-    PACKAGE_MANAGERS = {
-      "npm" => PackageManager.new("npx", "npm run", "npm install", "package-lock.json"),
-      "yarn" => PackageManager.new("yarn dlx", "yarn", "yarn add", "yarn.lock"),
-      "pnpm" => PackageManager.new("pnpm dlx", "pnpm", "pnpm add", "pnpm-lock.yaml"),
-      "bun" => PackageManager.new("bunx", "bun run", "bun add", "bun.lock.json")
-    }.freeze
-    NODE_REQUIRED_VERSION = ENV.fetch("NODE_REQUIRED_VERSION", ">= 18.20")
-    NEXT_VERSION = ENV.fetch("NEXT_VERSION", "15.1.6")
-
-    argument :attributes, type: :array, default: [], banner: "field:type field:type"
-    class_option :package_manager, type: :string, desc: "Package manager to use for frontend project"
-    class_option :skip_build, type: :boolean, default: false, desc: "Skip running Next.js build"
-    class_option :skip_routes, type: :boolean, default: false, desc: "Skip adding resources to routes.rb"
-
-    attr_accessor :selected_package_manager
-
-    def initialize(args, *options) # :nodoc:
-      super
-
-      @prompt = TTY::Prompt.new
-
-      self.attributes = shell.base.attributes
-    end
-
-    # Properly nests namespaces passed into a generator
-    #
-    #   $ bin/rails generate resource admin/users/products
-    #
-    # should give you
-    #
-    #   scope '/api' do
-    #     namespace :admin do
-    #       namespace :users do
-    #         resources :products
-    #       end
-    #     end
-    #   end
-    def add_resource_route
-      return if options[:actions].present? || options[:skip_routes]
-
-      route "resources :#{file_name.pluralize}", namespace: regular_class_path, scope: "/api"
-    end
-
-    # Check Javascript dependencies and create a new Next.js project. Install the the useful packages and create the
-    # scaffold code for frontend application.
-    def create_frontend_project
-      return say_status :remove, "skip frontend folder", :yellow if shell.base.behavior == :revoke
-
-      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] && !@prompt.no?("Do you want to build your Next.js project?")
-          run("#{selected_package_manager.run} build")
-        end
-      end
-    end
-
-    private
-
-    def check_node!
-      node_version = run("node --version", capture: true).gsub(/[^0-9.]/, "")
-
-      if Gem::Dependency.new("", NODE_REQUIRED_VERSION).match?("", node_version)
-        log :node_version, "Your Node version is '#{node_version}'"
-      else
-        say_status :node_version, "You need to have a Node version '#{NODE_REQUIRED_VERSION}'", :red
-        abort
-      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
-
-        # Ignoring node modules for Rails and Next.js projects
-        node_modules/
-      HEREDOC
-
-      append_to_file ".gitignore", rows
-    end
-
-    def create_next_app!
-      return if File.exist?("package.json")
-
-      run(
-        "#{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!
-      return if Dir.exist?("_templates")
-
-      run("#{selected_package_manager.add} -D hygen hygen-add")
-      run("#{selected_package_manager} hygen-add next-rails-scaffold")
-    end
-
-    def mapped_attributes
-      attributes.map { |attr| "#{attr.name}:#{attr.type}" }
-    end
-
-    def exit_on_failure?
-      true
-    end
-  end
-end