belt 0.3.35 → 0.3.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b880627c5b6f7d73fe1957bfeff61f0b601d8520f3b57053193bef5891b2ef9c
-  data.tar.gz: 2069b8d810cc8bf3ef0ec8cd4c15b2baf95719bc7f546875b3dc0987e26ca8d3
+  metadata.gz: '0308512f255c22a7fbc31ff42a20947ee8c155c4c9ceaea3a4824a1e5a50c618'
+  data.tar.gz: e071128ae46f66256e4f52c5a0b3eb096e49faf2a0cde9e6c3d962c6ed54af93
 SHA512:
-  metadata.gz: 1e2583c0ec4320dc90e00a72c48b8f04d208cfc0f4dc561306b6630495456ca9cf81c18d396804f4bbf9267ac6512238187ac864e5af6c1e2559c2a2bfccf89b
-  data.tar.gz: 9cf50f3894ef696c965183d9b45f572cc4cc245817e9b6f30ae3fdefe67613b0b3ba762f78bb34dc68587c22fc3f01eb1cbf44c5c8a817c3cb6d26aa5dd24d15
+  metadata.gz: ec4a7be24ec7cb6961ed6c06cbc7690eb05a92406cf10cedf8760ef5cde8d464bd062652524ca74e41fdd6045f495b77e1c252823d1d18e14090ed986073f1ac
+  data.tar.gz: '08f0980d98b9c868c7e53c23236acc3c72be619f3b361dea0a1520a3d5e71549ad95758d7cc8cdbdd21186dfcbd7f6e7d7acff822b1b12d00225d2c35711f6e3'

data/lib/belt/cli/destroy_command.rb

@@ -148,7 +148,13 @@ module Belt
       # -- keyword options for destroy flags
       def initialize(generator, name, fields, force: false, skip_terraform: false, full: false, frontend_name: nil)
         @generator = generator
-        @name = name&.downcase&.gsub(/[^a-z0-9_]/, '_')
+        # Environment names preserve hyphens (matching `belt g environment`);
+        # other generators normalize to underscores for valid Ruby identifiers.
+        @name = if generator == 'environment'
+                  name&.downcase&.gsub(/[^a-z0-9_-]/, '')
+                else
+                  name&.downcase&.gsub(/[^a-z0-9_]/, '_')
+                end
         @fields = fields
         @force = force
         @skip_terraform = skip_terraform

data/lib/belt/cli/frontend_deploy_command.rb

@@ -4,8 +4,10 @@ require 'shellwords'
 require 'open3'
 require_relative 'app_detection'
 require_relative 'env_resolver'
+require_relative 'environment_config'
 require_relative 'frontend_env_map'
 require_relative 'frontend_registry'
+require_relative 'terraform_command'
 
 module Belt
   module CLI
@@ -54,11 +56,13 @@ module Belt
       def initialize(env, frontend: nil)
         @env = env
         @app_name = detect_app_name
-        @env_dir = "infrastructure/#{@env}"
+        @infra_dir = TerraformCommand.find_infrastructure_dir || 'infrastructure'
+        @env_dir = File.join(@infra_dir, @env)
         @frontend = frontend || FrontendRegistry.new.resolve!
       end
 
       def run
+        load_and_apply_env_config!
         validate!
         puts "━━━ #{@frontend.label} (#{@frontend.path}/) ━━━"
         build_frontend
@@ -71,6 +75,12 @@ module Belt
 
       private
 
+      def load_and_apply_env_config!
+        env_config = EnvironmentConfig.load(@env, infra_dir: @infra_dir)
+        env_config.apply!
+        puts "  🔑 Using AWS profile: #{env_config.aws_profile}" if env_config.aws_profile?
+      end
+
       def validate!
         unless Dir.exist?(@frontend.path)
           abort "Error: No #{@frontend.path}/ directory found. " \

data/lib/belt/route_dsl.rb

@@ -96,7 +96,8 @@ module Belt
 
     %i[get post put delete patch].each do |method|
       define_method(method) do |path, options = {}|
-        full_path = options[:on] == :collection ? "#{@collection_prefix}#{path}" : "#{@prefix}#{path}"
+        base = options[:on] == :collection ? @collection_prefix : @prefix
+        full_path = join_path(base, path)
         options = merge_inherited_options(options)
         route_options = options.except(:on)
         @gateway.send(:add_route, method, full_path, route_options)
@@ -105,6 +106,15 @@ module Belt
 
     private
 
+    # Join a base path with a relative path, ensuring exactly one `/` separator.
+    def join_path(base, path)
+      path = path.to_s
+      return base if path.empty?
+      return "#{base}#{path}" if path.start_with?('/')
+
+      "#{base}/#{path}"
+    end
+
     def add_nested_resource_routes(resource_name, param_name, resource_options, actions)
       if actions.include?(:index)
         @gateway.send(:add_route, :get, "#{@prefix}/#{resource_name}",
@@ -165,7 +175,7 @@ module Belt
 
     %i[get post put delete patch].each do |method|
       define_method(method) do |path, options = {}|
-        full_path = "#{@prefix}#{path}"
+        full_path = join_path(@prefix, path)
         options = merge_inherited_options(options)
         @gateway.send(:add_route, method, full_path, options)
       end
@@ -173,6 +183,15 @@ module Belt
 
     private
 
+    # Join a base path with a relative path, ensuring exactly one `/` separator.
+    def join_path(base, path)
+      path = path.to_s
+      return base if path.empty?
+      return "#{base}#{path}" if path.start_with?('/')
+
+      "#{base}/#{path}"
+    end
+
     def merge_inherited_options(options)
       result = options.dup
       if @inherited_tables.any?

data/lib/belt/version.rb

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

metadata

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