belt 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68099232d7da2991436a263de28721bfc4e15822116f11a42cd2433588293b59
-  data.tar.gz: ba091a54897cfd88b02e2ddf48750ca8a47ca3f4c298b7b4371be799e835550e
+  metadata.gz: b3834960aad8c883c22d15acec6a320d860bd8b90acb3c7c74751c59ce49b959
+  data.tar.gz: 29f96098a7ac79c0f3eb62edd9950a9d1e95e2f56b219b3fcd024b19f3b4daac
 SHA512:
-  metadata.gz: 8e3d77c55c4297f2978486d9d0755ce45fda7f4a8886c372af0b211952502e5f5fde50c0d8881d4d5db39be4c3747a469825dfbd1b5d6f9be1120d441116600a
-  data.tar.gz: 7226f0ce500b1d19a7bccf60f9f087573998f3589ae7b41dceba7f35289a71e7e4ea3250269b96b18ef823acff06bbd67916f8d39c1ecb025ce97fbb8288019e
+  metadata.gz: 597c85007b7e8838f77605ec31de2b20bac85bf29ec20de371b85f03dd4a9eb20abba6be12f5b8f701e2c36ee02377b3488efa00292060f36b8bc956ef04d8ed
+  data.tar.gz: 4c24a2f2c554244010ec246bc337194f6616ed04394ff8aeea4d5aabe91c97adeac7aaad76fbfa9a812fa35397fc46770c347ee590a5d307e2073ee2e811ff13

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.1.13
+
+### Generator Extension API
+
+- Gems can now register generators by placing a file at `lib/belt/generators/<name>_generator.rb`.
+- Discovered automatically via `Gem.loaded_specs` — no manual registration needed.
+- Available as `belt generate <name>` / `belt destroy <name>`.
+- Generator contract: `.run(args)` (required), `.destroy(args)` (optional), `.description` (optional).
+- Help output includes gem-provided generators under "Gem Generators" section.
+
 ## Unreleased
 
 ## 0.1.11

data/lib/belt/action_router.rb

@@ -157,10 +157,7 @@ module Belt
 
       # Final fallback: gem-embedded controllers under Belt:: namespace
       class_name = "#{controller_name.split(%r{[_/]}).map(&:capitalize).join}Controller"
-      belt_class_name = "Belt::#{class_name}"
-      if Belt.const_defined?(class_name, false)
-        return Belt.const_get(class_name, false)
-      end
+      return Belt.const_get(class_name, false) if Belt.const_defined?(class_name, false)
 
       raise Belt::ActionNotFound, "Controller not found: #{controller_name}"
     end

data/lib/belt/cli/deploy_command.rb

@@ -121,7 +121,8 @@ module Belt
         Dir.chdir(env_dir) do
           run_init
           run_plan
-          return unless confirm_apply
+          return unless confirm_apply?
+
           run_apply
         end
 
@@ -157,6 +158,7 @@ module Belt
         dir = @infra_dir ? File.dirname(@infra_dir) : Dir.pwd
         while dir != '/'
           return dir if File.exist?(File.join(dir, 'Gemfile'))
+
           dir = File.dirname(dir)
         end
         Dir.pwd
@@ -188,9 +190,13 @@ module Belt
         stdout, status = Open3.capture2('aws', 'sts', 'get-caller-identity', '--output', 'json')
         unless status.success?
           abort "Error: AWS credentials not available.\n" \
-                "Run `aws sso login` or configure AWS_PROFILE."
+                'Run `aws sso login` or configure AWS_PROFILE.'
+        end
+        @aws_account = begin
+          JSON.parse(stdout)['Account']
+        rescue StandardError
+          nil
         end
-        @aws_account = JSON.parse(stdout)['Account'] rescue nil
       end
 
       # Ensure Gemfile.lock doesn't have stale PATH references that will break
@@ -208,7 +214,8 @@ module Belt
         stale_path_gems = detect_stale_path_gems(gemfile_content, lockfile_content)
         return if stale_path_gems.empty?
 
-        puts "  🔧 Fixing stale Gemfile.lock (#{stale_path_gems.join(', ')} referenced as PATH but Gemfile uses RubyGems)"
+        puts '  🔧 Fixing stale Gemfile.lock ' \
+             "(#{stale_path_gems.join(', ')} referenced as PATH but Gemfile uses RubyGems)"
         Dir.chdir(@project_root) do
           success = system('bundle', 'lock', '--update', *stale_path_gems)
           unless success
@@ -250,7 +257,11 @@ module Belt
           output, status = Open3.capture2('terraform', 'output', '-json')
           return nil unless status.success?
 
-          data = JSON.parse(output) rescue {}
+          data = begin
+            JSON.parse(output)
+          rescue StandardError
+            {}
+          end
 
           # Try lambda_functions output first
           if data['lambda_functions']
@@ -372,9 +383,10 @@ module Belt
         end
 
         # Remove non-essential files
-        exts = %w[*.md *.rdoc *.txt *.c *.h *.o Makefile *.log CHANGELOG* HISTORY* LICENSE* README* .gitignore .travis.yml .rubocop.yml Rakefile]
+        exts = %w[*.md *.rdoc *.txt *.c *.h *.o Makefile *.log CHANGELOG* HISTORY* LICENSE* README* .gitignore
+                  .travis.yml .rubocop.yml Rakefile]
         exts.each do |pattern|
-          Dir.glob(File.join(vendor_dir, "**", pattern)).each do |f|
+          Dir.glob(File.join(vendor_dir, '**', pattern)).each do |f|
             File.delete(f) if File.file?(f)
           end
         end
@@ -409,12 +421,12 @@ module Belt
           '--output', 'json'
         )
 
-        File.delete(zip_file) if File.exist?(zip_file)
+        FileUtils.rm_f(zip_file)
 
         unless status.success?
-          abort "\n✗ Failed to update Lambda function code.\n" \
-                "  Function: #{function_name}\n" \
-                "  Check that the function exists and you have permissions."
+          abort "\n✗ Failed to update Lambda function code.\n  " \
+                "Function: #{function_name}\n  " \
+                'Check that the function exists and you have permissions.'
         end
 
         # Wait for update to complete
@@ -454,7 +466,7 @@ module Belt
         puts ''
       end
 
-      def confirm_apply
+      def confirm_apply?
         return true if @auto_approve
 
         if @env == 'prod' || @env == 'production'
@@ -479,7 +491,7 @@ module Belt
       end
 
       def cleanup_plan
-        File.delete('tfplan') if File.exist?('tfplan')
+        FileUtils.rm_f('tfplan')
       end
 
       def deploy_frontend_if_exists

data/lib/belt/cli/destroy_command.rb

@@ -2,6 +2,7 @@
 
 require 'fileutils'
 require_relative 'app_detection'
+require_relative 'generator_registry'
 require_relative 'tables_command'
 require_relative '../inflector'
 
@@ -20,13 +21,22 @@ module Belt
           exit 0
         end
 
-        unless GENERATORS.include?(generator)
+        unless GENERATORS.include?(generator) || GeneratorRegistry.generator_names.include?(generator)
           puts "Unknown generator: '#{generator}'"
-          puts "Available: #{GENERATORS.uniq.join(', ')}"
+          puts "Available: #{(GENERATORS + GeneratorRegistry.generator_names).uniq.join(', ')}"
           puts "\nRun 'belt destroy --help' for usage information."
           exit 1
         end
 
+        # Delegate to gem-provided generator if not a built-in
+        unless GENERATORS.include?(generator)
+          klass = GeneratorRegistry.find(generator)
+          return klass.destroy(args) if klass.respond_to?(:destroy)
+
+          puts "Generator '#{generator}' does not support destroy."
+          exit 1
+        end
+
         # Normalize: resource is an alias for scaffold
         generator = 'scaffold' if generator == 'resource'
 
@@ -237,11 +247,11 @@ module Belt
         # Clean up trailing commas and empty arrays
         content.gsub!(/,(\s*\n\s*\]\.freeze)/, '\1')
 
-        if content != original
-          File.write(manifest_file, content)
-          @updated << manifest_file
-          puts "  update  #{manifest_file}"
-        end
+        return unless content != original
+
+        File.write(manifest_file, content)
+        @updated << manifest_file
+        puts "  update  #{manifest_file}"
       end
 
       def remove_schema
@@ -257,11 +267,11 @@ module Belt
         # Clean up excessive blank lines
         content.gsub!(/\n{3,}/, "\n\n")
 
-        if content != original
-          File.write(schema_file, content)
-          @updated << schema_file
-          puts "  update  #{schema_file}"
-        end
+        return unless content != original
+
+        File.write(schema_file, content)
+        @updated << schema_file
+        puts "  update  #{schema_file}"
       end
 
       def sync_tables
@@ -276,16 +286,16 @@ module Belt
         original = content.dup
 
         # Remove import lines for this resource's pages
-        content.gsub!(/^import #{@class_name}\w* from '.\/pages\/#{@resource_name}\/.*'\n/, '')
+        content.gsub!(%r{^import #{@class_name}\w* from './pages/#{@resource_name}/.*'\n}, '')
 
         # Remove Route elements for this resource
-        content.gsub!(/^\s*<Route path="\/#{@resource_name}.*?\/>\n/, '')
+        content.gsub!(%r{^\s*<Route path="/#{@resource_name}.*?/>\n}, '')
 
-        if content != original
-          File.write(app_jsx, content)
-          @updated << app_jsx
-          puts "  update  #{app_jsx}"
-        end
+        return unless content != original
+
+        File.write(app_jsx, content)
+        @updated << app_jsx
+        puts "  update  #{app_jsx}"
       end
 
       def print_summary

data/lib/belt/cli/environment_command.rb

@@ -52,15 +52,15 @@ module Belt
 
         puts "\n✓ Environment '#{@env_name}' created!"
 
-        unless @quiet
-          puts "\nNext steps:"
-          puts "  cd #{dest_dir}"
-          puts '  terraform init'
-          puts '  terraform plan'
-          puts '  terraform apply'
-          puts "\nTo configure a custom domain, set `domain` in #{dest_dir}/terraform.tfvars:"
-          puts "  domain = \"myapp.com\""
-        end
+        return if @quiet
+
+        puts "\nNext steps:"
+        puts "  cd #{dest_dir}"
+        puts '  terraform init'
+        puts '  terraform plan'
+        puts '  terraform apply'
+        puts "\nTo configure a custom domain, set `domain` in #{dest_dir}/terraform.tfvars:"
+        puts '  domain = "myapp.com"'
       end
 
       private

data/lib/belt/cli/frontend_command.rb

@@ -68,7 +68,7 @@ module Belt
         puts "\n  Installing npm dependencies..."
         success = system('npm', 'install', '--prefix', dest_dir, '--loglevel', 'error')
         if success
-          puts "  ✓ Dependencies installed"
+          puts '  ✓ Dependencies installed'
         else
           puts "  ⚠ npm install failed — run `cd #{dest_dir} && npm install` manually"
         end

data/lib/belt/cli/frontend_deploy_command.rb

@@ -62,9 +62,7 @@ module Belt
 
         puts '🏗️  Building frontend...'
         env = frontend_build_env
-        if env.any?
-          puts "   Injecting env: #{env.keys.sort.join(', ')}"
-        end
+        puts "   Injecting env: #{env.keys.sort.join(', ')}" if env.any?
         run!(env, 'npm', 'run', 'build', chdir: 'frontend')
       end
 

data/lib/belt/cli/frontend_env_map.rb

@@ -112,7 +112,7 @@ module Belt
       def load_map
         return DEFAULT_MAP.dup if @map_path.nil?
 
-        raw = YAML.safe_load(File.read(@map_path), aliases: false)
+        raw = YAML.safe_load_file(@map_path, aliases: false)
         unless raw.is_a?(Hash) && raw.any?
           abort "Error: frontend env map #{@map_path} must be a non-empty YAML mapping " \
                 '(e.g. VITE_API_URL: api_url).'
@@ -124,7 +124,7 @@ module Belt
           next if k.empty? || v.empty?
 
           hash[k] = v
-        end.tap do |parsed|
+        end.tap do |parsed| # rubocop:disable Style/MultilineBlockChain
           abort "Error: frontend env map #{@map_path} has no valid entries." if parsed.empty?
         end
       rescue Psych::SyntaxError => e
@@ -181,7 +181,7 @@ module Belt
         return str if str.empty?
         return str unless str.match?(/[\s\#"'\\$`]/)
 
-        %("#{str.gsub('\\', '\\\\').gsub('"', '\\"')}")
+        %("#{str.gsub('\\') { '\\\\' }.gsub('"') { '\\"' }}")
       end
     end
   end

data/lib/belt/cli/frontend_setup_command.rb

@@ -20,7 +20,7 @@ module Belt
         new.run
       end
 
-      def initialize(env = nil, quiet: false)
+      def initialize(_env = nil, quiet: false)
         @app_name = detect_app_name
         @quiet = quiet
       end
@@ -32,7 +32,7 @@ module Belt
 
         puts "\n✓ Frontend infrastructure generated in #{MODULE_DIR}!"
         puts "\nRun `belt deploy` to create the S3 bucket and CloudFront distribution."
-        puts "Then `belt deploy frontend` to build and deploy."
+        puts 'Then `belt deploy frontend` to build and deploy.'
       end
 
       private
@@ -41,7 +41,7 @@ module Belt
         return if Dir.exist?(MODULE_DIR)
 
         abort "Error: Module directory not found at #{MODULE_DIR}/.\n" \
-              "Run `belt new` to create a project with the correct structure."
+              'Run `belt new` to create a project with the correct structure.'
       end
 
       def generate_frontend_tf

data/lib/belt/cli/generate_command.rb

@@ -7,6 +7,7 @@ require_relative 'environment_command'
 require_relative 'frontend_command'
 require_relative 'tables_command'
 require_relative 'views_command'
+require_relative 'generator_registry'
 require_relative '../inflector'
 
 module Belt
@@ -84,13 +85,19 @@ module Belt
           exit 0
         end
 
-        unless GENERATORS.include?(generator)
+        unless GENERATORS.include?(generator) || GeneratorRegistry.generator_names.include?(generator)
           puts "Unknown generator: '#{generator}'"
-          puts "Available generators: #{(GENERATORS - ['resource']).join(', ')}"
+          puts "Available generators: #{all_generator_names.join(', ')}"
           puts "\nRun 'belt generate --help' for usage information."
           exit 1
         end
 
+        # Delegate to gem-provided generator if not a built-in
+        unless GENERATORS.include?(generator)
+          klass = GeneratorRegistry.find(generator)
+          return klass.run(args)
+        end
+
         # Normalize: resource is an alias for scaffold
         generator = 'scaffold' if generator == 'resource'
 
@@ -131,6 +138,10 @@ module Belt
         belt setup environment frontend views routes
       ].freeze
 
+      def self.all_generator_names
+        ((GENERATORS - ['resource']) + GeneratorRegistry.generator_names).uniq
+      end
+
       def self.validate_resource_name!(name, generator)
         errors = []
 
@@ -139,18 +150,21 @@ module Belt
         errors << 'must only contain letters, numbers, and underscores' unless name.match?(/\A[a-zA-Z][a-zA-Z0-9_]*\z/)
         errors << 'must not start or end with an underscore' if name.match?(/\A_|_\z/)
         errors << 'must not contain consecutive underscores' if name.include?('__')
-        errors << "is a reserved name" if RESERVED_NAMES.include?(Belt::Inflector.singularize(name.downcase))
-        errors << "is a reserved name" if RESERVED_NAMES.include?(name.downcase)
+        errors << 'is a reserved name' if RESERVED_NAMES.include?(Belt::Inflector.singularize(name.downcase))
+        errors << 'is a reserved name' if RESERVED_NAMES.include?(name.downcase)
 
         return if errors.empty?
 
         puts "\n✗ Invalid #{generator} name '#{name}':"
         errors.uniq.each { |e| puts "  - #{e}" }
-        puts "\nName must start with a letter, be at least 2 characters, and contain only letters, numbers, and single underscores."
+        puts "\nName must start with a letter, be at least 2 characters, " \
+             'and contain only letters, numbers, and single underscores.'
         exit 1
       end
 
       def self.print_generate_help
+        gem_generators = GeneratorRegistry.discovered_generators
+
         puts <<~HELP
           Usage: belt generate <generator> <name> [field:type ...] [options]
                  belt g <generator> <name> [field:type ...] [options]
@@ -166,6 +180,18 @@ module Belt
           Aliases:
             resource      Same as scaffold
 
+        HELP
+
+        if gem_generators.any?
+          puts '  Gem Generators:'
+          gem_generators.each do |name, klass|
+            desc = klass.respond_to?(:description) ? klass.description : "Generate #{name} (from gem)"
+            puts format('    %<name>-14s %<desc>s', name: name, desc: desc)
+          end
+          puts
+        end
+
+        puts <<~HELP
           Field Types:
             #{FIELD_TYPES.join(', ')}
             (defaults to string if omitted)
@@ -199,13 +225,13 @@ module Belt
         if info[:options].any?
           puts "\nOptions:"
           info[:options].each do |flag, desc|
-            puts "  %-20s %s" % [flag, desc]
+            puts format('  %<flag>-20s %<desc>s', flag: flag, desc: desc)
           end
         end
 
         puts "\nField Types:"
         puts "  #{FIELD_TYPES.join(', ')}"
-        puts "  (defaults to string if omitted)"
+        puts '  (defaults to string if omitted)'
 
         puts "\nExamples:"
         info[:examples].each do |cmd, desc|
@@ -249,7 +275,9 @@ module Belt
       def check_resource_collision!
         conflicts = []
         conflicts << "lambda/models/#{@singular_name}.rb" if File.exist?("lambda/models/#{@singular_name}.rb")
-        conflicts << "lambda/controllers/#{@app_name}/#{@resource_name}_controller.rb" if File.exist?("lambda/controllers/#{@app_name}/#{@resource_name}_controller.rb")
+        if File.exist?("lambda/controllers/#{@app_name}/#{@resource_name}_controller.rb")
+          conflicts << "lambda/controllers/#{@app_name}/#{@resource_name}_controller.rb"
+        end
 
         schema_file = 'infrastructure/schema.tf.rb'
         if File.exist?(schema_file) && File.read(schema_file).match?(/^\s*model :#{Regexp.escape(@singular_name)}\b/)
@@ -348,7 +376,7 @@ module Belt
 
           if content.match?(namespace_pattern)
             content.sub!(namespace_pattern) do |match|
-              indent = $1
+              indent = ::Regexp.last_match(1)
               # Insert the resource line before the namespace's closing `end`
               match.sub(/^(#{indent})end\z/m, "#{indent}  #{resource_line}\n#{indent}end")
             end
@@ -357,7 +385,7 @@ module Belt
             single_ns_pattern = /^(\s*)namespace :\w+\b[^\n]*do\s*\n(.*?)^\1end/m
             if content.match?(single_ns_pattern)
               content.sub!(single_ns_pattern) do |match|
-                indent = $1
+                indent = ::Regexp.last_match(1)
                 match.sub(/^(#{indent})end\z/m, "#{indent}  #{resource_line}\n#{indent}end")
               end
             else

data/lib/belt/cli/generator_registry.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Belt
+  module CLI
+    # Discovers and manages generators provided by external gems.
+    #
+    # Gems register generators by placing a file at:
+    #   lib/belt/generators/<name>_generator.rb
+    #
+    # Each generator class must:
+    #   - Be named <Name>Generator (e.g., MessagingGenerator)
+    #   - Live in the Belt::Generators module
+    #   - Implement .run(args) for generation
+    #   - Implement .destroy(args) for teardown (optional)
+    #   - Implement .description for help text (optional)
+    #
+    # Example gem structure:
+    #   belt-messaging/
+    #     lib/
+    #       belt/
+    #         generators/
+    #           messaging_generator.rb
+    #
+    # The generator is then available as:
+    #   belt generate messaging
+    #   belt destroy messaging
+    #
+    module GeneratorRegistry
+      GENERATOR_PATH = 'lib/belt/generators'
+
+      class << self
+        # Returns a hash of { "name" => generator_class } for all discovered generators.
+        def discovered_generators
+          @discovered_generators ||= discover_all
+        end
+
+        # Returns just the names of discovered generators.
+        def generator_names
+          discovered_generators.keys
+        end
+
+        # Loads and returns the generator class for a given name.
+        # Returns nil if not found.
+        def find(name)
+          discovered_generators[name]
+        end
+
+        # Reset cache (useful in tests)
+        def reset!
+          @discovered_generators = nil
+        end
+
+        private
+
+        def discover_all
+          generators = {}
+
+          Gem.loaded_specs.each_value do |spec|
+            generators_dir = File.join(spec.gem_dir, GENERATOR_PATH)
+            next unless File.directory?(generators_dir)
+
+            Dir.glob(File.join(generators_dir, '*_generator.rb')).each do |file|
+              name = File.basename(file, '.rb').sub(/_generator\z/, '')
+              klass = load_generator_class(file, name)
+              generators[name] = klass if klass
+            end
+          end
+
+          generators
+        end
+
+        def load_generator_class(file, name)
+          require file
+
+          class_name = "#{classify(name)}Generator"
+          Belt::Generators.const_get(class_name)
+        rescue LoadError, NameError => e
+          warn "[Belt] Warning: Failed to load generator '#{name}' from #{file}: #{e.message}"
+          nil
+        end
+
+        def classify(name)
+          name.split('_').map(&:capitalize).join
+        end
+      end
+    end
+  end
+
+  # Namespace for generator classes provided by external gems
+  module Generators
+  end
+end

data/lib/belt/cli/new_command.rb

@@ -185,7 +185,7 @@ module Belt
           if aws_configured?
             puts "\n  Setting up Terraform state bucket..."
             begin
-              Belt::CLI::SetupCommand.new(["--bucket", @resolved_bucket]).run_state_setup
+              Belt::CLI::SetupCommand.new(['--bucket', @resolved_bucket]).run_state_setup
               @state_setup_succeeded = true
             rescue SystemExit
               puts '  ⚠ State bucket setup encountered an issue — run `belt setup state` to retry.'
@@ -195,7 +195,7 @@ module Belt
             puts "\n  State bucket: #{@resolved_bucket}"
             puts "  State keys:   #{s3_safe_name(@app_name)}/<env>/terraform.tfstate"
             if @aws_error&.include?('ForbiddenException') || @aws_error&.include?('AccessDenied')
-              puts "  ⚠ AWS credentials found but access denied — check your profile/role configuration."
+              puts '  ⚠ AWS credentials found but access denied — check your profile/role configuration.'
               puts "    #{@aws_error}" if @aws_error
             else
               puts '  ⚠ AWS credentials not detected — skipping state bucket creation.'
@@ -209,7 +209,11 @@ module Belt
       def aws_configured?
         output, status = Open3.capture2e('aws', 'sts', 'get-caller-identity')
         if status.success?
-          data = JSON.parse(output) rescue {}
+          data = begin
+            JSON.parse(output)
+          rescue StandardError
+            {}
+          end
           @aws_account_id = data['Account']
           true
         else
@@ -284,7 +288,7 @@ module Belt
           puts '       → Edit → paste the 4 values from step 1.'
           puts ''
           puts '  3. Wait for propagation (usually 5–30 min, can take up to 48h).'
-          puts '     Verify: dig +short NS #{@domain}'
+          puts "     Verify: dig +short NS #{@domain}"
           puts '  ─────────────────────────────────────────────────────────────────'
         else
           puts "\n  To add a custom domain later, set `domain` in infrastructure/<env>/terraform.tfvars:"

data/lib/belt/cli/routes_command/route_inference.rb

@@ -16,9 +16,7 @@ module Belt
 
           # Nested resources (/posts/{id}/comments) and scoped resources (/admin/users):
           # join non-param segments → posts/comments, admin/users
-          if route.resource? && non_param.length > 1
-            return non_param.map { |s| s.gsub('-', '_') }.join('/')
-          end
+          return non_param.map { |s| s.gsub('-', '_') }.join('/') if route.resource? && non_param.length > 1
 
           # For non-resource routes with a single segment (e.g., post '/signup' in :onboarding),
           # the segment is the action name, not the controller. Use the gateway name as controller.

data/lib/belt/cli/server_command.rb

@@ -94,9 +94,7 @@ module Belt
         else
           puts '   Backend is serverless — deploy with `belt deploy` to set up AWS resources.'
         end
-        if build_env.any?
-          puts "   Env: #{build_env.keys.sort.join(', ')}"
-        end
+        puts "   Env: #{build_env.keys.sort.join(', ')}" if build_env.any?
         puts ''
 
         open_browser_later if @open_browser
@@ -121,24 +119,20 @@ module Belt
       end
 
       def run_welcome_server
+        puts "🚀 Serving Belt welcome page on http://localhost:#{@port}"
         if @api_url
-          puts "🚀 Serving Belt welcome page on http://localhost:#{@port}"
           puts "   Backend API: #{@api_url}"
-          puts ''
-          puts '   Tip: Run `belt generate frontend react` to scaffold a frontend app.'
-          puts ''
         else
-          puts "🚀 Serving Belt welcome page on http://localhost:#{@port}"
           puts '   No deployment detected — showing pre-deploy welcome page.'
           puts '   Backend is serverless — deploy with `belt deploy` to set up AWS resources.'
-          puts ''
-          puts '   Tip: Run `belt generate frontend react` to scaffold a frontend app.'
-          puts ''
         end
+        puts ''
+        puts '   Tip: Run `belt generate frontend react` to scaffold a frontend app.'
+        puts ''
 
         require 'webrick'
 
-        server = WEBrick::HTTPServer.new(Port: @port, Logger: WEBrick::Log.new('/dev/null'), AccessLog: [])
+        server = WEBrick::HTTPServer.new(Port: @port, Logger: WEBrick::Log.new(File::NULL), AccessLog: [])
 
         server.mount_proc '/' do |_req, res|
           res['Content-Type'] = 'text/html; charset=utf-8'

data/lib/belt/cli/setup_command.rb

@@ -53,7 +53,7 @@ module Belt
       def run_state_setup
         unless aws_configured?
           if @aws_error&.include?('ForbiddenException') || @aws_error&.include?('AccessDenied')
-            puts "✗ AWS credentials found but access denied — check your profile/role configuration."
+            puts '✗ AWS credentials found but access denied — check your profile/role configuration.'
             puts "  #{@aws_error}"
           else
             puts '✗ AWS credentials not configured. Set AWS_PROFILE or configure aws sso login.'
@@ -139,11 +139,7 @@ module Belt
       end
 
       def resolve_bucket_name
-        if @custom_bucket
-          @custom_bucket
-        else
-          'belt-terraform-state'
-        end
+        @custom_bucket || 'belt-terraform-state'
       end
 
       # --- Interactive selection ---
@@ -192,7 +188,11 @@ module Belt
       def aws_configured?
         output, status = Open3.capture2e('aws', 'sts', 'get-caller-identity')
         if status.success?
-          data = JSON.parse(output) rescue {}
+          data = begin
+            JSON.parse(output)
+          rescue StandardError
+            {}
+          end
           @aws_account_id = data['Account']
           true
         else
@@ -201,9 +201,7 @@ module Belt
         end
       end
 
-      def aws_account_id
-        @aws_account_id
-      end
+      attr_reader :aws_account_id
 
       def bucket_exists?(bucket)
         output, status = Open3.capture2e('aws', 's3api', 'head-bucket', '--bucket', bucket)

data/lib/belt/cli/tables_command.rb

@@ -65,10 +65,10 @@ module Belt
         end
         return if Dir.exist?(MODULE_DIR)
 
-        unless @quiet
-          abort "Error: Module directory not found at #{MODULE_DIR}/.\n" \
-                "Run `belt new` to create a project with the correct structure."
-        end
+        return if @quiet
+
+        abort "Error: Module directory not found at #{MODULE_DIR}/.\n" \
+              'Run `belt new` to create a project with the correct structure.'
       end
 
       def parse_schema

data/lib/belt/cli.rb

@@ -35,7 +35,6 @@ module Belt
       %w[version --version -v] => ->(_args) { puts "Belt #{Belt::VERSION}" }
     }.freeze
 
-
     COMMANDS = COMMANDS_DEFINITION.each_with_object({}) do |(keys, handler), hash|
       Array(keys).each { |key| hash[key] = handler }
     end.freeze
@@ -56,10 +55,8 @@ module Belt
         if args.empty? || args.first =~ /\A-/
           # belt destroy --help → DestroyCommand help
           # belt destroy (no args) → terraform destroy (needs env)
-          if args.include?('--help') || args.include?('-h')
-            return DestroyCommand.run(args)
-          end
-        elsif DestroyCommand::GENERATORS.include?(args.first)
+          return DestroyCommand.run(args) if args.include?('--help') || args.include?('-h')
+        elsif DestroyCommand::GENERATORS.include?(args.first) || GeneratorRegistry.generator_names.include?(args.first)
           return DestroyCommand.run(args)
         end
       end

data/lib/belt/controllers/welcome_controller.rb

@@ -34,11 +34,11 @@ module Belt
     end
 
     def welcome_css
-      @welcome_css_content ||= File.read(File.join(ASSETS_DIR, 'welcome.css'))
+      @welcome_css ||= File.read(File.join(ASSETS_DIR, 'welcome.css'))
     end
 
     def background_image_base64
-      @background_image_content ||= Base64.strict_encode64(
+      @background_image_base64 ||= Base64.strict_encode64(
         File.binread(File.join(ASSETS_DIR, 'belt-default.jpg'))
       )
     end

data/lib/belt/lambda_handler.rb

@@ -44,14 +44,14 @@ module Belt
 
       # Auto-load all models (application_record first, then the rest)
       models_dir = File.join(File.dirname(caller_file), 'models')
-      if File.directory?(models_dir)
-        all_models = Dir[File.join(models_dir, '**', '*.rb')].sort
-        app_record = all_models.find { |f| File.basename(f) == 'application_record.rb' }
-        rest = all_models - [app_record].compact
+      return unless File.directory?(models_dir)
 
-        require app_record if app_record
-        rest.each { |f| require f }
-      end
+      all_models = Dir[File.join(models_dir, '**', '*.rb')]
+      app_record = all_models.find { |f| File.basename(f) == 'application_record.rb' }
+      rest = all_models - [app_record].compact
+
+      require app_record if app_record
+      rest.each { |f| require f }
     end
 
     # API Gateway Lambda handler.

data/lib/belt/route_dsl.rb

@@ -51,12 +51,14 @@ module Belt
   end
 
   class NestedResourceBuilder
-    def initialize(gateway, prefix, collection_prefix, inherited_tables: [], inherited_auth: nil)
+    def initialize(gateway, prefix, collection_prefix, inherited_tables: [], inherited_auth: nil, # rubocop:disable Metrics/ParameterLists
+                   inherited_controller: nil)
       @gateway = gateway
       @prefix = prefix
       @collection_prefix = collection_prefix
       @inherited_tables = inherited_tables
       @inherited_auth = inherited_auth
+      @inherited_controller = inherited_controller
     end
 
     def resources(name, options = {})
@@ -85,12 +87,13 @@ module Belt
     end
 
     def member(&)
-      MemberCollectionBuilder.new(@gateway, @prefix, @inherited_tables, @inherited_auth).instance_eval(&)
+      MemberCollectionBuilder.new(@gateway, @prefix, @inherited_tables, @inherited_auth,
+                                  @inherited_controller).instance_eval(&)
     end
 
     def collection(&)
       MemberCollectionBuilder.new(@gateway, @collection_prefix, @inherited_tables,
-                                  @inherited_auth).instance_eval(&)
+                                  @inherited_auth, @inherited_controller).instance_eval(&)
     end
 
     %i[get post put delete patch].each do |method|
@@ -111,16 +114,18 @@ module Belt
         result[:tables] = (@inherited_tables + explicit_tables).uniq
       end
       result[:auth] ||= @inherited_auth if @inherited_auth
+      result[:controller] ||= @inherited_controller if @inherited_controller
       result
     end
   end
 
   class MemberCollectionBuilder
-    def initialize(gateway, prefix, inherited_tables, inherited_auth)
+    def initialize(gateway, prefix, inherited_tables, inherited_auth, inherited_controller = nil)
       @gateway = gateway
       @prefix = prefix
       @inherited_tables = inherited_tables
       @inherited_auth = inherited_auth
+      @inherited_controller = inherited_controller
     end
 
     %i[get post put delete patch].each do |method|
@@ -140,6 +145,7 @@ module Belt
         result[:tables] = (@inherited_tables + explicit_tables).uniq
       end
       result[:auth] ||= @inherited_auth if @inherited_auth
+      result[:controller] ||= @inherited_controller if @inherited_controller
       result
     end
   end
@@ -174,22 +180,20 @@ module Belt
       resource_name = name.to_s
       singular = singularize(resource_name)
       param_name = options[:param] || "#{singular}_id"
-      base_path = resource_base_path(resource_name, options)
-      options = options.except(:path_prefix)
       options = auto_infer_tables(resource_name, options)
       resource_options = options.merge(route_type: :resources)
       actions = determine_actions(options)
 
-      add_route(:get, base_path, resource_options) if actions.include?(:index)
-      add_route(:post, base_path, resource_options) if actions.include?(:create)
-      add_route(:get, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:show)
-      add_route(:put, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:update)
-      add_route(:delete, "#{base_path}/{#{param_name}}", resource_options) if actions.include?(:destroy)
+      add_route(:get, "/#{resource_name}", resource_options) if actions.include?(:index)
+      add_route(:post, "/#{resource_name}", resource_options) if actions.include?(:create)
+      add_route(:get, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:show)
+      add_route(:put, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:update)
+      add_route(:delete, "/#{resource_name}/{#{param_name}}", resource_options) if actions.include?(:destroy)
 
       return unless block_given?
 
-      collection_prefix = base_path
-      member_prefix = "#{base_path}/{#{param_name}}"
+      collection_prefix = "/#{resource_name}"
+      member_prefix = "/#{resource_name}/{#{param_name}}"
       resource_tables = Array(options[:tables] || [])
       inherited_tables = (@default_tables + resource_tables).uniq
       inherited_auth = options[:auth] || @default_auth
@@ -201,25 +205,17 @@ module Belt
 
     def resource(name, options = {})
       resource_name = name.to_s
-      base_path = resource_base_path(resource_name, options)
-      options = options.except(:path_prefix)
       actions = determine_actions(options, default: %i[show update destroy])
       resource_options = options.merge(route_type: :resource)
 
-      add_route(:get, base_path, resource_options) if actions.include?(:show)
-      add_route(:put, base_path, resource_options) if actions.include?(:update)
-      add_route(:delete, base_path, resource_options) if actions.include?(:destroy)
-      add_route(:post, base_path, resource_options) if actions.include?(:create)
+      add_route(:get, "/#{resource_name}", resource_options) if actions.include?(:show)
+      add_route(:put, "/#{resource_name}", resource_options) if actions.include?(:update)
+      add_route(:delete, "/#{resource_name}", resource_options) if actions.include?(:destroy)
+      add_route(:post, "/#{resource_name}", resource_options) if actions.include?(:create)
     end
 
     private
 
-    # Builds "/users" or "/admin/users" when path_prefix is set (from scope path:).
-    def resource_base_path(resource_name, options)
-      prefix = options[:path_prefix].to_s.gsub(%r{^/|/$}, '')
-      prefix.empty? ? "/#{resource_name}" : "/#{prefix}/#{resource_name}"
-    end
-
     def add_route(method, path, options = {})
       lambda_to_use = options[:lambda] || @current_lambda_context || @default_lambda
       route_tables = Array(options[:tables] || [])
@@ -352,16 +348,64 @@ module Belt
         end
       end
 
-      def resources(name, options = {}, &)
+      def resources(name, options = {}, &block)
         options = apply_scope_options(options)
-        options = options.merge(path_prefix: @scope_prefix) unless @scope_prefix.to_s.empty?
-        @gateway.resources(name, options, &)
+
+        if @scope_prefix.empty?
+          @gateway.resources(name, options, &block)
+        else
+          # When inside a scope, generate routes with the prefix applied.
+          # Also set the controller explicitly so inference resolves correctly
+          # (e.g., scope "admin" + resources :users → controller "admin/users").
+          resource_name = name.to_s
+          singular = Belt::Inflector.singularize(resource_name)
+          param_name = options[:param] || "#{singular}_id"
+          controller = "#{@scope_prefix}/#{resource_name}"
+          resource_options = options.merge(route_type: :resources, controller: controller)
+          actions = determine_scoped_actions(options)
+
+          add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
+
+          if block
+            collection_prefix = build_path("/#{resource_name}")
+            member_prefix = build_path("/#{resource_name}/{#{param_name}}")
+            resource_tables = Array(options[:tables] || [])
+            inherited_tables = (@gateway.default_tables + resource_tables).uniq
+            inherited_auth = options[:auth] || @gateway.default_auth
+            nested_builder = NestedResourceBuilder.new(@gateway, member_prefix, collection_prefix,
+                                                       inherited_tables: inherited_tables,
+                                                       inherited_auth: inherited_auth,
+                                                       inherited_controller: controller)
+            nested_builder.instance_eval(&block)
+          end
+        end
       end
 
       def resource(name, options = {})
         options = apply_scope_options(options)
-        options = options.merge(path_prefix: @scope_prefix) unless @scope_prefix.to_s.empty?
-        @gateway.resource(name, options)
+
+        if @scope_prefix.empty?
+          @gateway.resource(name, options)
+        else
+          resource_name = name.to_s
+          controller = "#{@scope_prefix}/#{resource_name}"
+          resource_options = options.merge(route_type: :resource, controller: controller)
+          actions = determine_scoped_actions(options, default: %i[show update destroy create])
+
+          @gateway.send(:add_route, :get, build_path("/#{resource_name}"), resource_options) if actions.include?(:show)
+          if actions.include?(:update)
+            @gateway.send(:add_route, :put, build_path("/#{resource_name}"),
+                          resource_options)
+          end
+          if actions.include?(:destroy)
+            @gateway.send(:add_route, :delete, build_path("/#{resource_name}"),
+                          resource_options)
+          end
+          if actions.include?(:create)
+            @gateway.send(:add_route, :post, build_path("/#{resource_name}"),
+                          resource_options)
+          end
+        end
       end
 
       def lambda(name, &)
@@ -412,6 +456,30 @@ module Belt
         @scope_prefix.empty? ? path : "/#{@scope_prefix}#{path}"
       end
 
+      def determine_scoped_actions(options, default: %i[index create show update destroy])
+        if options[:only]
+          Array(options[:only])
+        elsif options[:except]
+          default - Array(options[:except])
+        else
+          default
+        end
+      end
+
+      def add_scoped_resource_routes(resource_name, param_name, resource_options, actions)
+        @gateway.send(:add_route, :get, build_path("/#{resource_name}"), resource_options) if actions.include?(:index)
+        @gateway.send(:add_route, :post, build_path("/#{resource_name}"), resource_options) if actions.include?(:create)
+        if actions.include?(:show)
+          @gateway.send(:add_route, :get, build_path("/#{resource_name}/{#{param_name}}"), resource_options)
+        end
+        if actions.include?(:update)
+          @gateway.send(:add_route, :put, build_path("/#{resource_name}/{#{param_name}}"), resource_options)
+        end
+        return unless actions.include?(:destroy)
+
+        @gateway.send(:add_route, :delete, build_path("/#{resource_name}/{#{param_name}}"), resource_options)
+      end
+
       def apply_scope_options(options)
         result = options.dup
         result[:auth] ||= @scope_auth if @scope_auth

data/lib/belt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Belt
-  VERSION = '0.1.11'
+  VERSION = '0.1.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Stowzilla
@@ -82,6 +82,7 @@ files:
 - lib/belt/cli/frontend_env_map.rb
 - lib/belt/cli/frontend_setup_command.rb
 - lib/belt/cli/generate_command.rb
+- lib/belt/cli/generator_registry.rb
 - lib/belt/cli/new_command.rb
 - lib/belt/cli/routes_command.rb
 - lib/belt/cli/routes_command/route_inference.rb
@@ -161,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="