belt 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 479b619266e398d1d3052c96eb18f05c8452306a01aa46576b82e072372820b5
-  data.tar.gz: d5697750193b1a1cbba8d39e81190035d8fd40db490efbdb24903e7647374767
+  metadata.gz: c3c75f106f7a0f2ebf672294ee30e96f96745fb3ecbd142307c08b6b006933c8
+  data.tar.gz: 470cefb769cfab7dbaf80e6f950eb62cf87fb5a6b297f3661cf147c26d494501
 SHA512:
-  metadata.gz: 73ac84ffd0e2238b929180f89972f70c55a7d43a92d0f9de23b85cc6c318982c40c9466f49fe1d2d0960a47685acc90e1352b43f7e390ffee2951c83568ba432
-  data.tar.gz: 74db2374a336ba5ac774a5a8a4f7c053136de9dc652907e4abeebd69ec6bfa6485f35d3339787e7e5b17feadb3cf23014ae356d8050e817c90a2ba1fbf817ba6
+  metadata.gz: e5c5ed3dfa729483fd54e28197c9bd2f47f3581bea5f0892a4ac44c02f55253809f4fe1c12167ca55a040bdebc97e545b462f08d2f42c23dd1304a4a9dfd7768
+  data.tar.gz: be36355b315e467f411079880a4b3e14e94b56567cbf1892a95fff3f2b3c1c9a8bfe91e2e8618b405b1b06045ee1c06e999c12a6c281b9c490b8e8dc43d8f999

data/lib/belt/cli/deploy_command.rb

@@ -503,8 +503,48 @@ module Belt
           output.each_line do |line|
             puts "  #{line}"
           end
+
+          # Show DNS guidance if name_servers are present and this looks like a first deploy
+          print_dns_guidance if output.include?('name_servers')
         end
       end
+
+      def print_dns_guidance
+        # Check if there's a marker file indicating DNS guidance was already shown
+        marker = File.join(@infra_dir, @env, '.dns_configured')
+        return if File.exist?(marker)
+
+        domain = detect_domain_from_tfvars
+        return unless domain
+
+        puts ''
+        puts '  ┌─────────────────────────────────────────────────────────────┐'
+        puts '  │ DNS SETUP REQUIRED                                          │'
+        puts '  ├─────────────────────────────────────────────────────────────┤'
+        puts '  │ Point your domain to the name_servers shown above.          │'
+        puts '  │                                                             │'
+        puts '  │ • External registrar (GoDaddy, Namecheap, etc.):            │'
+        puts '  │   Update nameservers in your registrar\'s DNS settings.      │'
+        puts '  │                                                             │'
+        puts '  │ • Domain in AWS Route53 Registered Domains:                 │'
+        puts '  │   Route53 → Registered Domains → Name servers → Edit.       │'
+        puts '  │                                                             │'
+        puts "  │ Verify: dig +short NS #{domain.ljust(38)}│"
+        puts '  │                                                             │'
+        puts '  │ This message won\'t appear on subsequent deploys.            │'
+        puts '  └─────────────────────────────────────────────────────────────┘'
+
+        # Create the marker so we don't nag on every deploy
+        File.write(marker, "DNS guidance shown at #{Time.now}\n")
+      end
+
+      def detect_domain_from_tfvars
+        tfvars_file = File.join(@infra_dir, @env, 'terraform.tfvars')
+        return nil unless File.exist?(tfvars_file)
+
+        match = File.read(tfvars_file).match(/^\s*domain\s*=\s*"([^"]+)"/)
+        match[1] if match
+      end
     end
   end
 end

data/lib/belt/cli/destroy_command.rb

@@ -2,6 +2,8 @@
 
 require 'fileutils'
 require_relative 'app_detection'
+require_relative 'tables_command'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -93,13 +95,9 @@ module Belt
         @name = name&.downcase&.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
         @app_name = detect_namespace
-        @resource_name = if @name
-                           @name.end_with?('s') ? @name : "#{@name}s"
-                         end
-        @singular_name = if @name
-                           @name.end_with?('s') ? @name.chomp('s') : @name
-                         end
-        @class_name = @singular_name&.split('_')&.map(&:capitalize)&.join
+        @singular_name = @name ? Belt::Inflector.singularize(@name) : nil
+        @resource_name = @singular_name ? Belt::Inflector.pluralize(@singular_name) : nil
+        @class_name = @singular_name ? Belt::Inflector.classify(@singular_name) : nil
         @removed = []
         @updated = []
       end
@@ -123,7 +121,6 @@ module Belt
         destroy_model
         destroy_controller
         remove_routes
-        remove_schema
         destroy_views
         puts "\n✓ Scaffold '#{@singular_name}' destroyed!"
       end
@@ -131,6 +128,8 @@ module Belt
       def destroy_model
         path = "lambda/models/#{@singular_name}.rb"
         remove_file(path)
+        remove_schema
+        sync_tables
       end
 
       def destroy_controller
@@ -157,6 +156,15 @@ module Belt
           FileUtils.rm_rf(dir)
           @removed << dir
           puts "  remove  #{dir}/"
+
+          # Remove frontend.tf from the module
+          module_frontend = 'infrastructure/modules/app/frontend.tf'
+          if File.exist?(module_frontend)
+            FileUtils.rm_f(module_frontend)
+            @removed << module_frontend
+            puts "  remove  #{module_frontend}"
+          end
+
           puts "\n✓ Frontend removed!"
         else
           puts '✗ No frontend/ directory found.'
@@ -168,6 +176,7 @@ module Belt
         return unless @resource_name
 
         pages_dir = "frontend/src/pages/#{@resource_name}"
+
         if Dir.exist?(pages_dir)
           FileUtils.rm_rf(pages_dir)
           @removed << pages_dir
@@ -255,6 +264,10 @@ module Belt
         end
       end
 
+      def sync_tables
+        Belt::CLI::TablesCommand.sync_all_environments
+      end
+
       def remove_view_routes
         app_jsx = 'frontend/src/App.jsx'
         return unless File.exist?(app_jsx)

data/lib/belt/cli/environment_command.rb

@@ -26,9 +26,10 @@ module Belt
         new(env_name).generate
       end
 
-      def initialize(env_name, quiet: false)
+      def initialize(env_name, quiet: false, domain: nil)
         @env_name = env_name.downcase.gsub(/[^a-z0-9_-]/, '')
         @app_name = detect_app_name
+        @domain = domain
         @quiet = quiet
       end
 
@@ -51,28 +52,19 @@ module Belt
 
         puts "\n✓ Environment '#{@env_name}' created!"
 
-        setup_frontend_if_exists
-
         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
       end
 
       private
 
-      def setup_frontend_if_exists
-        return unless Dir.exist?('frontend') && !Dir.empty?('frontend')
-
-        puts "\n  Frontend detected — generating frontend infrastructure..."
-        require_relative 'frontend_setup_command'
-        FrontendSetupCommand.new(@env_name, quiet: true).run
-        puts "  create  infrastructure/#{@env_name}/frontend.tf"
-      end
-
       def templates
         {
           'main.tf.erb' => 'main.tf',

data/lib/belt/cli/frontend_command.rb

@@ -75,22 +75,20 @@ module Belt
       end
 
       def setup_frontend_infra_for_existing_environments
-        environments = detect_environments
-        return if environments.empty?
+        module_dir = 'infrastructure/modules/app'
+        frontend_tf = File.join(module_dir, 'frontend.tf')
 
-        puts "\n  Setting up frontend infrastructure for existing environments..."
-        require_relative 'frontend_setup_command'
+        if File.exist?(frontend_tf)
+          puts "  skip    #{frontend_tf} (already exists)"
+          return
+        end
 
-        environments.each do |env_name|
-          frontend_tf = "infrastructure/#{env_name}/frontend.tf"
-          if File.exist?(frontend_tf)
-            puts "  skip    #{frontend_tf} (already exists)"
-            next
-          end
+        return unless Dir.exist?(module_dir)
 
-          FrontendSetupCommand.new(env_name, quiet: true).run
-          puts "  create  #{frontend_tf}"
-        end
+        puts "\n  Setting up frontend infrastructure..."
+        require_relative 'frontend_setup_command'
+        FrontendSetupCommand.new(nil, quiet: true).run
+        puts "  create  #{frontend_tf}"
       end
 
       def copy_template(src_dir, dest_dir)

data/lib/belt/cli/frontend_setup_command.rb

@@ -8,31 +8,20 @@ require_relative 'env_resolver'
 module Belt
   module CLI
     class FrontendSetupCommand
-      TEMPLATE_DIR = File.expand_path('../../templates/frontend_infra', __dir__)
+      TEMPLATE_DIR = File.expand_path('../../templates/module', __dir__)
+      MODULE_DIR = 'infrastructure/modules/app'
 
       include AppDetection
 
       def self.run(args)
-        env = EnvResolver.resolve(args)
-
-        if env.nil?
-          puts 'Usage: belt setup frontend <environment>'
-          puts "\nGenerates S3 + CloudFront Terraform for frontend hosting."
-          puts 'You can also set BELT_ENV to skip the environment argument.'
-          puts "\nExamples:"
-          puts '  belt setup frontend wups'
-          puts '  belt setup frontend dev01'
-          puts '  BELT_ENV=wups belt setup frontend'
-          exit 1
-        end
-
-        new(env).run
+        # Environment arg is no longer needed since frontend.tf goes in the module,
+        # but we still accept it for backwards compat (just ignore it).
+        _env = EnvResolver.resolve(args)
+        new.run
       end
 
-      def initialize(env, quiet: false)
-        @env = env
+      def initialize(env = nil, quiet: false)
         @app_name = detect_app_name
-        @env_dir = "infrastructure/#{@env}"
         @quiet = quiet
       end
 
@@ -41,22 +30,22 @@ module Belt
         generate_frontend_tf
         return if @quiet
 
-        puts "\n✓ Frontend infrastructure generated for '#{@env}'!"
-        puts "\nRun `belt apply #{@env}` to create the S3 bucket and CloudFront distribution."
-        puts "Then `belt deploy frontend #{@env}` to build and deploy."
+        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."
       end
 
       private
 
       def validate!
-        return if Dir.exist?(@env_dir)
+        return if Dir.exist?(MODULE_DIR)
 
-        abort "Error: Environment '#{@env}' not found at #{@env_dir}/.\n" \
-              "Create it with: belt generate environment #{@env}"
+        abort "Error: Module directory not found at #{MODULE_DIR}/.\n" \
+              "Run `belt new` to create a project with the correct structure."
       end
 
       def generate_frontend_tf
-        dest = File.join(@env_dir, 'frontend.tf')
+        dest = File.join(MODULE_DIR, 'frontend.tf')
         template_path = File.join(TEMPLATE_DIR, 'frontend.tf.erb')
         content = ERB.new(File.read(template_path), trim_mode: '-').result(binding)
         File.write(dest, content)

data/lib/belt/cli/generate_command.rb

@@ -5,7 +5,9 @@ require 'erb'
 require_relative 'app_detection'
 require_relative 'environment_command'
 require_relative 'frontend_command'
+require_relative 'tables_command'
 require_relative 'views_command'
+require_relative '../inflector'
 
 module Belt
   module CLI
@@ -22,12 +24,14 @@ module Belt
           description: 'Generate a model, controller, routes, schema, and views for a REST resource.',
           usage: 'belt generate scaffold <name> [field:type ...] [options]',
           options: [
-            ['--skip-views', 'Skip generating frontend view pages']
+            ['--skip-views', 'Skip generating frontend view pages'],
+            ['--force, -f', 'Overwrite existing resource files (skip collision check)']
           ],
           examples: [
-            ['belt g scaffold post title:string body:text', 'Post with title and body fields'],
-            ['belt g scaffold comment author:string body:text status:string', 'Scaffold with multiple fields'],
-            ['belt g scaffold task --skip-views', 'Scaffold without frontend pages']
+            ['belt g scaffold post title body:text'],
+            ['belt g scaffold comment author body:text status'],
+            ['belt g scaffold task --skip-views'],
+            ['belt g scaffold post title body:text --force']
           ],
           notes: <<~NOTES
             Creates:
@@ -43,11 +47,13 @@ module Belt
         },
         'model' => {
           description: 'Generate an ActiveItem model with validations and DynamoDB field definitions.',
-          usage: 'belt generate model <name> [field:type ...]',
-          options: [],
+          usage: 'belt generate model <name> [field:type ...] [options]',
+          options: [
+            ['--force, -f', 'Overwrite existing model files (skip collision check)']
+          ],
           examples: [
-            ['belt g model user email:string name:string', 'User model with email and name'],
-            ['belt g model event title:string starts_at:datetime', 'Event model with datetime field']
+            ['belt g model user email name'],
+            ['belt g model event title starts_at:datetime']
           ],
           notes: <<~NOTES
             Creates:
@@ -59,8 +65,8 @@ module Belt
           usage: 'belt generate controller <name>',
           options: [],
           examples: [
-            ['belt g controller posts', 'Posts controller with CRUD actions'],
-            ['belt g controller admin/users', 'Namespaced controller']
+            ['belt g controller posts'],
+            ['belt g controller admin/users']
           ],
           notes: <<~NOTES
             Creates:
@@ -108,9 +114,10 @@ module Belt
 
         validate_resource_name!(name, generator)
 
+        force = args.delete('--force') || args.delete('-f')
         skip_views = args.delete('--skip-views')
         fields = args.map { |arg| parse_field(arg) }
-        new(generator, name, fields, skip_views: skip_views).generate
+        new(generator, name, fields, skip_views: skip_views, force: force).generate
       end
 
       def self.parse_field(arg)
@@ -132,7 +139,7 @@ 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?(name.downcase.chomp('s'))
+        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?
@@ -161,14 +168,15 @@ module Belt
 
           Field Types:
             #{FIELD_TYPES.join(', ')}
+            (defaults to string if omitted)
 
           Examples:
-            belt g scaffold post title:string body:text status:string
-            belt g model user email:string name:string
+            belt g scaffold post title body:text status
+            belt g model user email name
             belt g controller comments
             belt g environment staging
             belt g frontend react
-            belt g views post title:string body:text
+            belt g views post title body:text
 
           Run 'belt generate <generator> --help' for detailed help on a specific generator.
         HELP
@@ -197,50 +205,95 @@ module Belt
 
         puts "\nField Types:"
         puts "  #{FIELD_TYPES.join(', ')}"
+        puts "  (defaults to string if omitted)"
 
         puts "\nExamples:"
         info[:examples].each do |cmd, desc|
-          puts "  #{cmd}"
-          puts "    #{desc}" if desc
+          if desc
+            puts "  #{cmd}  — #{desc}"
+          else
+            puts "  #{cmd}"
+          end
         end
 
         puts "\n#{info[:notes]}" if info[:notes]
-
-        puts "Naming Rules:"
-        puts "  - Must start with a letter"
-        puts "  - At least 2 characters"
-        puts "  - Letters, numbers, and single underscores only"
-        puts "  - No leading/trailing/consecutive underscores"
-        puts "  - Cannot use reserved names (help, new, create, destroy, etc.)"
       end
 
-      def initialize(generator, name, fields, skip_views: false)
+      def initialize(generator, name, fields, skip_views: false, force: false)
         @generator = generator
         @name = name.downcase.gsub(/[^a-z0-9_]/, '_')
         @fields = fields
         @skip_views = skip_views
+        @force = force
         @app_name = detect_namespace
         @module_name = @app_name.split(/[-_]/).map(&:capitalize).join
-        @resource_name = @name.end_with?('s') ? @name : "#{@name}s"
-        @singular_name = @name.end_with?('s') ? @name.chomp('s') : @name
-        @class_name = @singular_name.split('_').map(&:capitalize).join
+        @singular_name = Belt::Inflector.singularize(@name)
+        @resource_name = Belt::Inflector.pluralize(@singular_name)
+        @class_name = Belt::Inflector.classify(@singular_name)
       end
 
       def generate
         case @generator
-        when 'scaffold'  then generate_resource
-        when 'model'     then generate_model
+        when 'scaffold'
+          check_resource_collision! unless @force
+          generate_resource
+        when 'model'
+          check_model_collision! unless @force
+          generate_model_standalone
         when 'controller' then generate_controller
         end
       end
 
       private
 
+      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")
+
+        schema_file = 'infrastructure/schema.tf.rb'
+        if File.exist?(schema_file) && File.read(schema_file).match?(/^\s*model :#{Regexp.escape(@singular_name)}\b/)
+          conflicts << "#{schema_file} (model :#{@singular_name})"
+        end
+
+        routes_file = 'infrastructure/routes.tf.rb'
+        if File.exist?(routes_file) && File.read(routes_file).match?(/resources :#{Regexp.escape(@resource_name)}\b/)
+          conflicts << "#{routes_file} (resources :#{@resource_name})"
+        end
+
+        return if conflicts.empty?
+
+        puts "\n✗ Resource '#{@singular_name}' already exists. Conflicting files:"
+        conflicts.each { |c| puts "    • #{c}" }
+        puts "\nTo overwrite, run again with --force:"
+        puts "  belt g scaffold #{@singular_name} #{@fields.map { |f| "#{f[:name]}:#{f[:type]}" }.join(' ')} --force"
+        exit 1
+      end
+
+      def check_model_collision!
+        conflicts = []
+        conflicts << "lambda/models/#{@singular_name}.rb" if File.exist?("lambda/models/#{@singular_name}.rb")
+
+        schema_file = 'infrastructure/schema.tf.rb'
+        if File.exist?(schema_file) && File.read(schema_file).match?(/^\s*model :#{Regexp.escape(@singular_name)}\b/)
+          conflicts << "#{schema_file} (model :#{@singular_name})"
+        end
+
+        return if conflicts.empty?
+
+        puts "\n✗ Model '#{@singular_name}' already exists. Conflicting files:"
+        conflicts.each { |c| puts "    • #{c}" }
+        puts "\nTo overwrite, run again with --force:"
+        puts "  belt g model #{@singular_name} #{@fields.map { |f| "#{f[:name]}:#{f[:type]}" }.join(' ')} --force"
+        exit 1
+      end
+
       def generate_resource
         generate_model
         generate_controller
         inject_routes
         inject_schema
+        sync_tables
         generate_views_if_frontend
         puts "\n✓ Scaffold '#{@singular_name}' generated!"
         puts "\nFiles created/updated:"
@@ -252,6 +305,12 @@ module Belt
         puts "  frontend/src/pages/#{@resource_name}/ (views)" if Dir.exist?('frontend/src')
       end
 
+      def generate_model_standalone
+        generate_model
+        inject_schema
+        sync_tables
+      end
+
       def generate_model
         dest = "lambda/models/#{@singular_name}.rb"
         write_template('model.rb.erb', dest)
@@ -272,8 +331,15 @@ module Belt
         tables_arg = @fields.any? ? ", tables: [:#{@resource_name}]" : ''
         resource_line = "resources :#{@resource_name}#{tables_arg}"
 
+        # If this resource already exists in routes (force mode), replace it
+        existing_resource_pattern = /^\s*resources :#{Regexp.escape(@resource_name)}\b[^\n]*/
+        if content.match?(existing_resource_pattern)
+          content.sub!(existing_resource_pattern) do |match|
+            indent = match[/^\s*/]
+            "#{indent}#{resource_line}"
+          end
         # Replace the commented placeholder if it exists
-        if content.include?('# resources :posts')
+        elsif content.include?('# resources :posts')
           content.sub!('# resources :posts', resource_line)
         else
           # Find the target namespace block and insert before its closing `end`
@@ -361,8 +427,12 @@ module Belt
 
         schema_block = "  model :#{@singular_name} do\n#{field_lines.join("\n")}\n  end\n"
 
+        # If model already exists (force mode), replace it
+        existing_model_pattern = /^  model :#{Regexp.escape(@singular_name)} do\n.*?^  end\n/m
+        if content.match?(existing_model_pattern)
+          content.sub!(existing_model_pattern, schema_block)
         # Replace commented-out block or insert before final end
-        if content.match?(/^\s*#\s*model :/)
+        elsif content.match?(/^\s*#\s*model :/)
           content.gsub!(/^\s*#[^\n]*\n/, '')
           content.sub!(/^(end\s*\z)/m, "#{schema_block}\\1")
         else
@@ -373,6 +443,10 @@ module Belt
         puts "  update  #{schema_file}"
       end
 
+      def sync_tables
+        Belt::CLI::TablesCommand.sync_all_environments
+      end
+
       def write_template(template_name, dest_path)
         template_path = File.join(TEMPLATE_DIR, template_name)
         FileUtils.mkdir_p(File.dirname(dest_path))