belt 0.2.15 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0a1075ea8085b2214af4991dd2288fec5decd5f0f6d92b6ed12fe135ff152b9
-  data.tar.gz: bb8db7d0b4a9a39f9cc5e58a77a411f1c78cf885ab5e0ed6353772e386653f95
+  metadata.gz: 4e1813b72986b167b9449f438b18331cc2e9be46cffa58bd059c403f3c35703e
+  data.tar.gz: 26c3aae3c049bbebff471d6a8a514114a26f8b2d0fdf4671cb154ae9a056798f
 SHA512:
-  metadata.gz: 0f77fe7616521e842fe0836ccb9ab7df6c4306dffc58838c647ce217de2616b967d9b80fccf5ca8708613e112dc771c22eeee091d652a25e0a19290319a8d8d4
-  data.tar.gz: 3c06dd06c7352f6590cf833361dfd2886abb42445989fa5c30e8307cebc63c35db49b646e1768b85e4a40c4c7c71005d78caef1a642393cf5c76e5dc6bd58fe0
+  metadata.gz: 23bbf9977c0cd765c7a1630e7a74ed480db6d62ee07c22e95e6a491a3a9c04d824b8463b0ef63ae4c4b343e13e96ff26c9edb5c86c8005fce7f0a167b6894c64
+  data.tar.gz: e7f625fe93dcb125289530e2a3bdb9dee8c37938eeea41bc9154a31aca6b47675a6336e39c986f3a801719f4cf22052bad40968ff6e1b9a82936140f74432f4a

data/lib/belt/cli/deploy_command.rb

@@ -14,6 +14,7 @@ require_relative 'path_gem_materializer'
 module Belt
   module CLI
     class DeployCommand
+      DEFAULT_DOCKER_BUILD_IMAGE = 'public.ecr.aws/sam/build-ruby3.4:latest-x86_64'
       def self.run(args)
         # Handle `belt deploy frontend <env>` as before
         if args.first == 'frontend'
@@ -514,12 +515,14 @@ module Belt
         uid = Process.uid
         gid = Process.gid
 
+        image = detect_docker_build_image
+
         docker_cmd = [
           'docker', 'run', '--rm',
           '--platform', 'linux/amd64',
           '-v', "#{build_dir}:/var/task",
           '-w', '/var/task',
-          'public.ecr.aws/sam/build-ruby3.4:latest-x86_64',
+          image,
           '/bin/bash', '-c',
           "bundle config set --local path 'vendor/bundle' && " \
           "bundle config set --local without 'development test' && " \
@@ -540,6 +543,37 @@ module Belt
         puts '    ✅ Gems installed'
       end
 
+      # Reads docker_build_image from the conveyor_belt Terraform resource state.
+      # Falls back to DEFAULT_DOCKER_BUILD_IMAGE if state is unavailable or attribute not set.
+      def detect_docker_build_image
+        env_dir = File.join(@infra_dir, @env)
+        return DEFAULT_DOCKER_BUILD_IMAGE unless Dir.exist?(File.join(env_dir, '.terraform'))
+
+        Dir.chdir(env_dir) do
+          output, status = Open3.capture2('terraform', 'state', 'show', 'conveyor_belt.main')
+          if status.success?
+            # Prefer explicit docker_build_image if set
+            image_match = output.match(/docker_build_image\s*=\s*"([^"]+)"/)
+            if image_match
+              image = image_match[1]
+              puts "    📦 Using custom build image: #{image}"
+              return image
+            end
+
+            # Otherwise derive from ruby_version
+            version_match = output.match(/ruby_version\s*=\s*"([^"]+)"/)
+            if version_match
+              version = version_match[1]
+              image = "public.ecr.aws/sam/build-ruby#{version}:latest-x86_64"
+              puts "    📦 Using build image for Ruby #{version}: #{image}"
+              return image
+            end
+          end
+        end
+
+        DEFAULT_DOCKER_BUILD_IMAGE
+      end
+
       def strip_vendor_fat(build_dir)
         vendor_dir = File.join(build_dir, 'vendor')
         return unless Dir.exist?(vendor_dir)

data/lib/belt/cli/tables_command.rb

@@ -31,7 +31,8 @@ module Belt
       end
 
       def run
-        validate!
+        return unless validate!
+
         models = parse_models
         if models.empty?
           puts "No models found in #{MODELS_DIR}/" unless @quiet
@@ -49,11 +50,11 @@ module Belt
             abort "Error: No models directory found at #{MODELS_DIR}/. " \
                   'Run `belt generate model` to create your first model.'
           end
-          return
+          return false
         end
-        return if Dir.exist?(MODULE_DIR)
+        return true if Dir.exist?(MODULE_DIR)
 
-        return if @quiet
+        return false if @quiet
 
         abort "Error: Module directory not found at #{MODULE_DIR}/.\n" \
               'Run `belt new` to create a project with the correct structure.'
@@ -83,6 +84,12 @@ module Belt
         # Extract indexes() declaration
         indexes = extract_indexes(content)
 
+        # Extract belongs_to associations and generate convention indexes
+        indexes += extract_belongs_to_indexes(content)
+
+        # Deduplicate by index name
+        indexes.uniq! { |idx| idx[:name] }
+
         { name: model_name, indexes: indexes }
       end
 
@@ -108,6 +115,24 @@ module Belt
         indexes
       end
 
+      # Extract belongs_to declarations and generate convention-based GSI indexes.
+      # belongs_to :conversation → ConversationIndex with partition_key: 'conversationId'
+      def extract_belongs_to_indexes(content)
+        indexes = []
+
+        # Skip commented-out belongs_to lines
+        content.lines.reject { |line| line.strip.start_with?('#') }.join
+               .scan(/belongs_to\s+:(\w+)/) do |match|
+          association_name = match[0]
+          index_name = "#{Belt::Inflector.classify(association_name)}Index"
+          partition_key = "#{association_name}Id"
+
+          indexes << { name: index_name, partition_key: partition_key, sort_key: nil }
+        end
+
+        indexes
+      end
+
       def generate_dynamodb_tf(models)
         dest = File.join(MODULE_DIR, 'dynamodb.tf')
         existing_content = File.exist?(dest) ? File.read(dest) : nil

data/lib/belt/cli.rb

@@ -53,6 +53,9 @@ module Belt
 
     TERRAFORM_ACTIONS = Belt::CLI::TerraformCommand::ACTIONS
 
+    # Commands that can run without being inside a Belt project
+    STANDALONE_COMMANDS = %w[new version --version -v doctor].freeze
+
     def self.start(args)
       command = args.shift
 
@@ -61,17 +64,11 @@ module Belt
         exit 1
       end
 
+      # For project-level commands, find and chdir to the project root
+      ensure_project_root!(command) unless STANDALONE_COMMANDS.include?(command)
+
       # `belt destroy` is ambiguous: could be terraform destroy or belt destroy <generator>.
-      # Route to DestroyCommand if the first arg is a known generator or help flag.
-      if command == 'destroy'
-        if args.empty? || args.first =~ /\A-/
-          # belt destroy --help → DestroyCommand help
-          # belt destroy (no args) → terraform destroy (needs env)
-          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
+      return if command == 'destroy' && route_destroy_command(args)
 
       # Terraform shorthand: belt init wups, belt plan wups, belt apply wups, belt destroy wups
       return Belt::CLI::TerraformCommand.run(command, args) if TERRAFORM_ACTIONS.include?(command)
@@ -161,5 +158,46 @@ module Belt
           belt plugin new messaging     # scaffold a belt-messaging style plugin gem
       USAGE
     end
+
+    def self.not_in_app_message(command)
+      <<~MSG
+        Could not find a Belt application. Run `belt #{command}` from within a Belt project directory, or create a new one:
+
+          belt new <app_name>                         Create a new Belt application
+          belt new <app_name> --frontend react        With a React frontend
+          belt new <app_name> --domain myapp.com      With a custom domain
+
+        Examples:
+          belt new blog
+          belt new my-api --frontend react
+          belt new shop --domain shop.example.com
+
+        See `belt new --help` for all options.
+      MSG
+    end
+
+    def self.ensure_project_root!(command)
+      if Belt.root?
+        Dir.chdir(Belt.root)
+      else
+        puts not_in_app_message(command)
+        exit 1
+      end
+    end
+
+    # Routes `belt destroy` to DestroyCommand when args indicate a generator.
+    # Returns true if handled, false to fall through to TerraformCommand.
+    def self.route_destroy_command(args) # rubocop:disable Naming/PredicateMethod
+      if args.empty? || args.first =~ /\A-/
+        if args.include?('--help') || args.include?('-h')
+          DestroyCommand.run(args)
+          return true
+        end
+      elsif DestroyCommand::GENERATORS.include?(args.first) || GeneratorRegistry.generator_names.include?(args.first)
+        DestroyCommand.run(args)
+        return true
+      end
+      false
+    end
   end
 end

data/lib/belt/root.rb

@@ -9,8 +9,14 @@ module Belt
     @root = path
   end
 
+  def self.root?
+    !root.nil?
+  end
+
   # Resolves the path to routes.rb, checking config/ first then legacy paths.
   def self.routes_file
+    return nil unless root
+
     candidates = [
       File.join(root, 'config/routes.rb'),
       File.join(root, 'config/routes.tf.rb'),
@@ -21,6 +27,8 @@ module Belt
 
   # Resolves the path to contracts.rb, checking config/ first then legacy paths.
   def self.contracts_file
+    return nil unless root
+
     candidates = [
       File.join(root, 'config/contracts.rb'),
       File.join(root, 'config/contracts.tf.rb'),
@@ -37,6 +45,8 @@ module Belt
 
   # Resolves the lambda config directory.
   def self.lambda_config_dir
+    return nil unless root
+
     File.join(root, 'config/lambda')
   end
 
@@ -52,7 +62,7 @@ module Belt
 
       dir = parent
     end
-    Dir.pwd
+    nil
   end
 
   private_class_method :detect_root

data/lib/belt/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belt
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.17
 platform: ruby
 authors:
 - Stowzilla