nvoi 0.1.8 → 0.2.1

data/lib/nvoi/external/cloud/scaleway.rb

@@ -146,14 +146,14 @@ module Nvoi
           }
 
           # Add security group if provided
-          if opts.firewall_id && !opts.firewall_id.empty?
+          unless opts.firewall_id.blank?
             create_opts[:security_group] = opts.firewall_id
           end
 
           server = post(instance_url("/servers"), create_opts)["server"]
 
           # Set cloud-init user data if provided
-          if opts.user_data && !opts.user_data.empty?
+          unless opts.user_data.blank?
             set_user_data(server["id"], "cloud-init", opts.user_data)
           end
 
@@ -161,7 +161,7 @@ module Nvoi
           server_action(server["id"], "poweron")
 
           # Attach to private network if provided
-          if opts.network_id && !opts.network_id.empty?
+          unless opts.network_id.blank?
             wait_for_server_state(server["id"], "running", 30)
             create_private_nic(server["id"], opts.network_id)
           end
@@ -313,11 +313,13 @@ module Nvoi
         # List available server types for onboarding
         def list_server_types
           list_server_types_api.map do |name, info|
+            arch = info.dig("arch") || "x86_64"
             {
               name:,
               cores: info.dig("ncpus"),
               ram: info.dig("ram"),
-              hourly_price: info.dig("hourly_price")
+              hourly_price: info.dig("hourly_price"),
+              architecture: arch.include?("arm") ? "arm64" : "x86"
             }
           end
         end
@@ -511,7 +513,7 @@ module Nvoi
           end
 
           def to_network(data)
-            Objects::Network::Record.new(
+            Types::Network::Record.new(
               id: data["id"],
               name: data["name"],
               ip_range: data.dig("subnets", 0, "subnet") || data["subnets"]&.first
@@ -519,7 +521,7 @@ module Nvoi
           end
 
           def to_firewall(data)
-            Objects::Firewall::Record.new(
+            Types::Firewall::Record.new(
               id: data["id"],
               name: data["name"]
             )
@@ -529,7 +531,7 @@ module Nvoi
             # Scaleway doesn't include private_ips in the NIC response directly
             # We'd need to call IPAM API which adds complexity
             # Instead, private IP discovery happens via SSH in setup_k3s
-            Objects::Server::Record.new(
+            Types::Server::Record.new(
               id: data["id"],
               name: data["name"],
               status: data["state"],
@@ -543,7 +545,7 @@ module Nvoi
               r["product_resource_type"] == "instance_server"
             }&.dig("product_resource_id")
 
-            Objects::Volume::Record.new(
+            Types::Volume::Record.new(
               id: data["id"],
               name: data["name"],
               size: (data["size"] || 0) / 1_000_000_000,

data/lib/nvoi/external/cloud/types.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Nvoi
+  module External
+    module Cloud
+      module Types
+        # Server-related structs
+        module Server
+          # Record represents a compute server/instance
+          Record = Struct.new(:id, :name, :status, :public_ipv4, :private_ipv4, keyword_init: true)
+
+          # CreateOptions contains options for creating a server
+          CreateOptions = Struct.new(:name, :type, :image, :location, :user_data, :network_id, :firewall_id, :ssh_keys, keyword_init: true)
+        end
+
+        # Volume-related structs
+        module Volume
+          # Record represents a block storage volume
+          Record = Struct.new(:id, :name, :size, :location, :status, :server_id, :device_path, keyword_init: true)
+
+          # CreateOptions contains options for creating a volume
+          CreateOptions = Struct.new(:name, :size, :server_id, :location, keyword_init: true)
+
+          # MountOptions contains options for mounting a volume
+          MountOptions = Struct.new(:device_path, :mount_path, :fs_type, keyword_init: true)
+        end
+
+        # Network-related structs
+        module Network
+          # Record represents a virtual network
+          Record = Struct.new(:id, :name, :ip_range, keyword_init: true)
+        end
+
+        # Firewall-related structs
+        module Firewall
+          # Record represents a firewall configuration
+          Record = Struct.new(:id, :name, keyword_init: true)
+        end
+      end
+    end
+  end
+end

data/lib/nvoi/external/database/mysql.rb

@@ -48,7 +48,7 @@ module Nvoi
         end
 
         def restore(ssh, data, opts)
-          create_database(ssh, Objects::Database::CreateOptions.new(
+          create_database(ssh, Types::CreateOptions.new(
             pod_name: opts.pod_name,
             database: opts.database,
             user: opts.user,

data/lib/nvoi/external/database/postgres.rb

@@ -46,7 +46,7 @@ module Nvoi
         end
 
         def restore(ssh, data, opts)
-          create_database(ssh, Objects::Database::CreateOptions.new(
+          create_database(ssh, Types::CreateOptions.new(
             pod_name: opts.pod_name,
             database: opts.database,
             user: opts.user,

data/lib/nvoi/external/database/provider.rb

@@ -49,7 +49,7 @@ module Nvoi
 
           def parse_standard_url(url, default_port)
             uri = URI.parse(url)
-            Objects::Database::Credentials.new(
+            Types::Credentials.new(
               user: uri.user,
               password: uri.password,
               host: uri.host,

data/lib/nvoi/external/database/sqlite.rb

@@ -15,7 +15,7 @@ module Nvoi
 
         def parse_url(url)
           path = url.sub(%r{^sqlite3?:///?}, "")
-          Objects::Database::Credentials.new(
+          Types::Credentials.new(
             path:,
             database: File.basename(path)
           )

data/lib/nvoi/external/database/types.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Nvoi
+  module External
+    module Database
+      module Types
+        # Parsed credentials from database URL
+        Credentials = Struct.new(:user, :password, :host, :port, :database, :path, :host_path, keyword_init: true)
+
+        # Options for dumping a database
+        DumpOptions = Struct.new(:pod_name, :database, :user, :password, :host_path, keyword_init: true)
+
+        # Options for restoring a database
+        RestoreOptions = Struct.new(:pod_name, :database, :user, :password, :source_db, :host_path, keyword_init: true)
+
+        # Options for creating a database
+        CreateOptions = Struct.new(:pod_name, :database, :user, :password, keyword_init: true)
+
+        # Branch represents a database branch (snapshot)
+        Branch = Struct.new(:id, :created_at, :size, :adapter, :database, keyword_init: true) do
+          def to_h
+            { id:, created_at:, size:, adapter:, database: }
+          end
+        end
+
+        # BranchMetadata holds all branches for an app
+        class BranchMetadata
+          attr_accessor :branches
+
+          def initialize(branches = [])
+            @branches = branches
+          end
+
+          def to_json(*_args)
+            JSON.pretty_generate({ branches: @branches.map(&:to_h) })
+          end
+
+          def self.from_json(json_str)
+            data = JSON.parse(json_str)
+            branches = (data["branches"] || []).map do |b|
+              Branch.new(
+                id: b["id"],
+                created_at: b["created_at"],
+                size: b["size"],
+                adapter: b["adapter"],
+                database: b["database"]
+              )
+            end
+            new(branches)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nvoi/external/dns/cloudflare.rb

@@ -36,7 +36,7 @@ module Nvoi
           })
 
           result = response["result"]
-          Objects::Tunnel::Record.new(
+          Types::Tunnel::Record.new(
             id: result["id"],
             name: result["name"],
             token: result["token"]
@@ -51,7 +51,7 @@ module Nvoi
           return nil if results.nil? || results.empty?
 
           result = results[0]
-          Objects::Tunnel::Record.new(
+          Types::Tunnel::Record.new(
             id: result["id"],
             name: result["name"],
             token: result["token"]
@@ -69,11 +69,11 @@ module Nvoi
           url = "accounts/#{@account_id}/cfd_tunnel/#{tunnel_id}/configurations"
 
           ingress_rules = hostnames.map do |hostname|
-            {
-              hostname:,
-              service: service_url,
-              originRequest: { httpHostHeader: hostname.sub(/^\*\./, "") } # Use apex for wildcard
-            }
+            rule = { hostname:, service: service_url }
+            # Only set httpHostHeader for non-wildcard hostnames
+            # Wildcards should pass through the original Host header
+            rule[:originRequest] = { httpHostHeader: hostname } unless hostname.start_with?("*.")
+            rule
           end
           ingress_rules << { service: "http_status:404" }
 
@@ -144,7 +144,7 @@ module Nvoi
           zone_data = results.find { |z| z["name"] == domain }
           return nil unless zone_data
 
-          Objects::Dns::Zone.new(id: zone_data["id"], name: zone_data["name"])
+          Types::Zone.new(id: zone_data["id"], name: zone_data["name"])
         end
 
         def subdomain_available?(zone_id, subdomain, domain)
@@ -163,7 +163,7 @@ module Nvoi
           record_data = results.find { |r| r["name"] == name && r["type"] == record_type }
           return nil unless record_data
 
-          Objects::Dns::Record.new(
+          Types::Record.new(
             id: record_data["id"],
             type: record_data["type"],
             name: record_data["name"],
@@ -185,7 +185,7 @@ module Nvoi
           })
 
           result = response["result"]
-          Objects::Dns::Record.new(
+          Types::Record.new(
             id: result["id"],
             type: result["type"],
             name: result["name"],
@@ -207,7 +207,7 @@ module Nvoi
           })
 
           result = response["result"]
-          Objects::Dns::Record.new(
+          Types::Record.new(
             id: result["id"],
             type: result["type"],
             name: result["name"],

data/lib/nvoi/external/dns/types.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Nvoi
+  module External
+    module Dns
+      module Types
+        # Zone represents a Cloudflare DNS zone
+        Zone = Struct.new(:id, :name, keyword_init: true)
+
+        # Record represents a Cloudflare DNS record
+        Record = Struct.new(:id, :type, :name, :content, :proxied, :ttl, keyword_init: true)
+
+        # Tunnel-related structs (Cloudflare tunnels)
+        module Tunnel
+          # Record represents a Cloudflare tunnel
+          Record = Struct.new(:id, :name, :token, keyword_init: true)
+
+          # Info holds information about a configured tunnel
+          Info = Struct.new(:service_name, :hostname, :tunnel_id, :tunnel_token, :port, keyword_init: true)
+        end
+      end
+    end
+  end
+end

data/lib/nvoi/utils/config_loader.rb

@@ -10,8 +10,8 @@ module Nvoi
       class << self
         # Load reads and parses the deployment configuration from encrypted file
         def load(config_path, credentials_path: nil, master_key_path: nil)
-          working_dir = config_path && !config_path.empty? ? File.dirname(config_path) : "."
-          enc_path = credentials_path.nil? || credentials_path.empty? ? config_path : credentials_path
+          working_dir = config_path.blank? ? "." : File.dirname(config_path)
+          enc_path = credentials_path.blank? ? config_path : credentials_path
 
           manager = CredentialStore.new(working_dir, enc_path, master_key_path)
           plaintext = manager.read
@@ -20,8 +20,8 @@ module Nvoi
           data = YAML.safe_load(plaintext, permitted_classes: [Symbol])
           raise Errors::ConfigError, "Invalid config format" unless data.is_a?(Hash)
 
-          deploy_config = Objects::Configuration::Deploy.new(data)
-          cfg = Objects::Configuration::Root.new(deploy_config)
+          deploy_config = Configuration::Deploy.new(data)
+          cfg = Configuration::Root.new(deploy_config)
 
           load_ssh_keys(cfg)
           cfg.validate_config
@@ -39,7 +39,7 @@ module Nvoi
 
           provider = External::Database.provider_for(adapter)
 
-          if db_config.url && !db_config.url.empty?
+          unless db_config.url.blank?
             creds = provider.parse_url(db_config.url)
             host_path = nil
 
@@ -47,7 +47,7 @@ module Nvoi
               host_path = resolve_sqlite_host_path(db_config, namer, creds.database || "app.db")
             end
 
-            return Objects::Database::Credentials.new(
+            return External::Database::Types::Credentials.new(
               user: creds.user,
               password: creds.password,
               host: creds.host,
@@ -61,21 +61,21 @@ module Nvoi
           # Fall back to secrets-based credentials
           case adapter
           when "postgres", "postgresql"
-            Objects::Database::Credentials.new(
+            External::Database::Types::Credentials.new(
               port: provider.default_port,
               user: db_config.secrets["POSTGRES_USER"],
               password: db_config.secrets["POSTGRES_PASSWORD"],
               database: db_config.secrets["POSTGRES_DB"]
             )
           when "mysql", "mysql2"
-            Objects::Database::Credentials.new(
+            External::Database::Types::Credentials.new(
               port: provider.default_port,
               user: db_config.secrets["MYSQL_USER"],
               password: db_config.secrets["MYSQL_PASSWORD"],
               database: db_config.secrets["MYSQL_DATABASE"]
             )
           when "sqlite", "sqlite3"
-            Objects::Database::Credentials.new(
+            External::Database::Types::Credentials.new(
               database: "app.db",
               host_path: resolve_sqlite_host_path(db_config, namer, "app.db")
             )
@@ -93,8 +93,8 @@ module Nvoi
               raise Errors::ConfigError, "ssh_keys section is required in config. Run 'nvoi credentials edit' to generate keys."
             end
 
-            raise Errors::ConfigError, "ssh_keys.private_key is required" unless ssh_keys.private_key && !ssh_keys.private_key.empty?
-            raise Errors::ConfigError, "ssh_keys.public_key is required" unless ssh_keys.public_key && !ssh_keys.public_key.empty?
+            raise Errors::ConfigError, "ssh_keys.private_key is required" if ssh_keys.private_key.blank?
+            raise Errors::ConfigError, "ssh_keys.public_key is required" if ssh_keys.public_key.blank?
 
             temp_dir = Dir.mktmpdir("nvoi-ssh-")
 
@@ -136,7 +136,7 @@ module Nvoi
             server_name = db_config.servers.first
             mount = db_config.mount
 
-            if mount && !mount.empty?
+            unless mount.blank?
               vol_name = mount.keys.first
               base_path = namer.server_volume_host_path(server_name, vol_name)
               return "#{base_path}/#{filename}"

data/lib/nvoi/utils/credential_store.rb

@@ -17,7 +17,7 @@ module Nvoi
       # key_path: explicit path to key file (optional, nil = auto-discover)
       def initialize(working_dir, encrypted_path = nil, key_path = nil)
         @working_dir = working_dir
-        @encrypted_path = encrypted_path && !encrypted_path.empty? ? encrypted_path : find_encrypted_file
+        @encrypted_path = encrypted_path.blank? ? find_encrypted_file : encrypted_path
         @key_path = nil
         @master_key = nil
 
@@ -41,7 +41,7 @@ module Nvoi
 
       # Check if the store has a master key loaded
       def has_key?
-        !@master_key.nil? && !@master_key.empty?
+        !@master_key.blank?
       end
 
       # Decrypt and return the credentials content
@@ -131,7 +131,7 @@ module Nvoi
 
         def resolve_key(explicit_key_path)
           # Priority 1: Explicit key file path
-          if explicit_key_path && !explicit_key_path.empty?
+          unless explicit_key_path.blank?
             @master_key = load_key_from_file(explicit_key_path)
             @key_path = explicit_key_path
             return
@@ -139,7 +139,7 @@ module Nvoi
 
           # Priority 2: Environment variable
           env_key = ENV[MASTER_KEY_ENV_VAR]
-          if env_key && !env_key.empty?
+          unless env_key.blank?
             Crypto.validate_key(env_key)
             @master_key = env_key
             return

data/lib/nvoi/utils/env_resolver.rb

@@ -44,12 +44,12 @@ module Nvoi
           db = @config.deploy.application.database
           return unless db
 
-          env["DATABASE_ADAPTER"] = db.adapter if db.adapter && !db.adapter.empty?
+          env["DATABASE_ADAPTER"] = db.adapter unless db.adapter.blank?
 
           # Handle database URL
           if db.adapter == "sqlite3"
             env["DATABASE_URL"] = sqlite_database_url(db)
-          elsif db.url && !db.url.empty?
+          elsif !db.url.blank?
             env["DATABASE_URL"] = db.url
           end
 
@@ -60,7 +60,7 @@ module Nvoi
         end
 
         def sqlite_database_url(db)
-          raise Errors::ConfigError, "sqlite3 requires database.mount to be configured" if db.mount.nil? || db.mount.empty?
+          raise Errors::ConfigError, "sqlite3 requires database.mount to be configured" if db.mount.blank?
 
           mount_path = db.mount.values.first
           app_name = @config.deploy.application.name

data/lib/nvoi/utils/namer.rb

@@ -33,7 +33,7 @@ module Nvoi
 
       # ServerName returns the server name for a given group and index
       def server_name(group, index)
-        "#{@config.deploy.application.name}-#{group}-#{index}"
+        "#{sanitize_name(@config.deploy.application.name)}-#{group}-#{index}"
       end
 
       def firewall_name
@@ -178,7 +178,7 @@ module Nvoi
 
       # Class method for building hostname without instance
       def self.build_hostname(subdomain, domain)
-        if subdomain.nil? || subdomain.empty? || subdomain == "@"
+        if subdomain.blank? || subdomain == "@"
           domain
         else
           "#{subdomain}.#{domain}"
@@ -187,7 +187,7 @@ module Nvoi
 
       # Returns array of hostnames - apex returns [domain, *.domain], subdomain returns [sub.domain]
       def self.build_hostnames(subdomain, domain)
-        if subdomain.nil? || subdomain.empty? || subdomain == "@"
+        if subdomain.blank? || subdomain == "@"
           [domain, "*.#{domain}"]
         else
           ["#{subdomain}.#{domain}"]
@@ -196,6 +196,11 @@ module Nvoi
 
       private
 
+        # Sanitize name for cloud provider compatibility (no underscores, lowercase, etc.)
+        def sanitize_name(name)
+          name.to_s.gsub("_", "-").downcase
+        end
+
         def hash_string(str)
           Digest::SHA256.hexdigest(str)[0, 16]
         end

data/lib/nvoi/utils/presence.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# Core extensions for blank?/present? checks
+
+class NilClass
+  def blank? = true
+  def present? = false
+end
+
+class String
+  def blank? = empty?
+  def present? = !empty?
+end
+
+class Array
+  def blank? = empty?
+  def present? = !empty?
+end
+
+class Hash
+  def blank? = empty?
+  def present? = !empty?
+end

data/lib/nvoi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nvoi
-  VERSION = "0.1.8"
+  VERSION = "0.2.1"
 end

data/lib/nvoi.rb

@@ -13,26 +13,11 @@ require "fileutils"
 require "tempfile"
 require "open3"
 require "faraday"
+require_relative "nvoi/utils/presence"
 
 loader = Zeitwerk::Loader.for_gem
-loader.ignore("#{__dir__}/nvoi/cli")  # CLI commands are lazy-loaded
-loader.ignore("#{__dir__}/nvoi/config_api")  # ConfigApi uses non-standard naming
 loader.setup
-
-# Load ConfigApi manually (uses non-standard naming convention)
-require_relative "nvoi/config_api/result"
-require_relative "nvoi/config_api/base"
-require_relative "nvoi/config_api/actions/init"
-require_relative "nvoi/config_api/actions/domain_provider"
-require_relative "nvoi/config_api/actions/compute_provider"
-require_relative "nvoi/config_api/actions/server"
-require_relative "nvoi/config_api/actions/volume"
-require_relative "nvoi/config_api/actions/app"
-require_relative "nvoi/config_api/actions/database"
-require_relative "nvoi/config_api/actions/secret"
-require_relative "nvoi/config_api/actions/env"
-require_relative "nvoi/config_api/actions/service"
-require_relative "nvoi/config_api"
+loader.eager_load_namespace(Nvoi::Cli)
 
 module Nvoi
   class << self