nvoi 0.1.5 → 0.1.7

data/lib/nvoi/{config/naming.rb → utils/namer.rb}

@@ -3,9 +3,9 @@
 require "digest"
 
 module Nvoi
-  module Config
-    # ResourceNamer handles resource naming and inference
-    class ResourceNamer
+  module Utils
+    # Namer handles resource naming and inference
+    class Namer
       def initialize(config)
         @config = config
       end
@@ -72,6 +72,10 @@ module Nvoi
         "app=db-#{@config.deploy.application.name}"
       end
 
+      def database_pod_name
+        "db-#{@config.deploy.application.name}-0"
+      end
+
       # ============================================================================
       # KUBERNETES APP RESOURCES
       # ============================================================================
@@ -153,20 +157,41 @@ module Nvoi
       # VOLUME RESOURCES
       # ============================================================================
 
-      def volume_name(service_type, service_name, volume_key)
-        "#{@config.deploy.application.name}-#{service_type}-#{service_name}-#{volume_key}"
+      # Server-level volume naming: {app}-{server}-{volume}
+      def server_volume_name(server_name, volume_name)
+        "#{@config.deploy.application.name}-#{server_name}-#{volume_name}"
       end
 
-      def database_volume_name
-        "#{@config.deploy.application.name}-db-data"
+      # Host mount path for a server volume
+      def server_volume_host_path(server_name, volume_name)
+        "/opt/nvoi/volumes/#{server_volume_name(server_name, volume_name)}"
       end
 
-      def service_volume_name(service_name, volume_key)
-        "#{@config.deploy.application.name}-svc-#{service_name}-#{volume_key}"
+      # ============================================================================
+      # HOSTNAME HELPER
+      # ============================================================================
+
+      # Build full hostname from subdomain and domain
+      def hostname(subdomain, domain)
+        self.class.build_hostname(subdomain, domain)
       end
 
-      def app_volume_name(service_name, volume_key)
-        "#{@config.deploy.application.name}-app-#{service_name}-#{volume_key}"
+      # Class method for building hostname without instance
+      def self.build_hostname(subdomain, domain)
+        if subdomain.nil? || subdomain.empty? || subdomain == "@"
+          domain
+        else
+          "#{subdomain}.#{domain}"
+        end
+      end
+
+      # Returns array of hostnames - apex returns [domain, *.domain], subdomain returns [sub.domain]
+      def self.build_hostnames(subdomain, domain)
+        if subdomain.nil? || subdomain.empty? || subdomain == "@"
+          [domain, "*.#{domain}"]
+        else
+          ["#{subdomain}.#{domain}"]
+        end
       end
 
       private
@@ -176,20 +201,7 @@ module Nvoi
         end
 
         def infer_base_prefix
-          output = `git config --get remote.origin.url 2>/dev/null`.strip
-          return "app" if output.empty?
-
-          # Extract username/repo from: git@github.com:user/repo.git or https://github.com/user/repo.git
-          repo_url = output.sub(/\.git$/, "")
-          parts = repo_url.split(%r{[/:]+})
-
-          if parts.length >= 2
-            username = parts[-2]
-            repo = parts[-1]
-            "#{username}-#{repo}"
-          else
-            "app"
-          end
+          "nvoi"
         end
     end
   end

data/lib/nvoi/{deployer → utils}/retry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Nvoi
-  module Deployer
+  module Utils
     # StepExecutor executes deployment steps with automatic retry on transient failures
     class StepExecutor
       def initialize(max_retries, log)
@@ -37,7 +37,7 @@ module Nvoi
           end
         end
 
-        raise DeploymentError.new(step_name, "max retries (#{@max_retries}) exceeded: #{last_error&.message}")
+        raise Errors::DeploymentError.new(step_name, "max retries (#{@max_retries}) exceeded: #{last_error&.message}")
       end
 
       private
@@ -56,12 +56,32 @@ module Nvoi
         end
     end
 
-    # Retry helper module for simple retry scenarios (backwards compatibility)
+    # Retry helper module for simple retry scenarios
     module Retry
       def self.with_retry(max_attempts: 3, log: nil)
         executor = StepExecutor.new(max_attempts, log)
         executor.execute("operation") { yield }
       end
+
+      # Poll until condition is met or timeout
+      # Returns the result of the block, or nil if timeout
+      def self.poll(max_attempts: 30, interval: 2)
+        max_attempts.times do
+          result = yield
+          return result if result
+
+          sleep(interval)
+        end
+        nil
+      end
+
+      # Poll with error on timeout
+      def self.poll!(max_attempts: 30, interval: 2, error_message: "operation timed out")
+        result = poll(max_attempts:, interval:) { yield }
+        raise Errors::TimeoutError, error_message unless result
+
+        result
+      end
     end
   end
 end

data/lib/nvoi/utils/templates.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require "erb"
+
+module Nvoi
+  module Utils
+    # Templates handles K8s manifest template loading and rendering
+    module Templates
+      # TemplateBinding provides a clean binding for ERB templates
+      class TemplateBinding
+        def initialize(data)
+          data.each do |key, value|
+            instance_variable_set("@#{key}", value)
+            define_singleton_method(key) { instance_variable_get("@#{key}") }
+          end
+        end
+
+        def get_binding
+          binding
+        end
+      end
+
+      class << self
+        def template_path(name)
+          File.join(Nvoi.templates_path, "#{name}.erb")
+        end
+
+        def load_template(name)
+          path = template_path(name)
+          raise Errors::TemplateError, "template #{name} not found at #{path}" unless File.exist?(path)
+
+          ERB.new(File.read(path), trim_mode: "-")
+        end
+
+        def template_names
+          Dir.glob(File.join(Nvoi.templates_path, "*.erb")).map do |path|
+            File.basename(path, ".erb")
+          end
+        end
+
+        # Render a template with the provided data
+        def render(name, data)
+          template = load_template(name)
+          binding_obj = TemplateBinding.new(data)
+          template.result(binding_obj.get_binding)
+        end
+
+        # Render a template and apply it via kubectl
+        def apply_manifest(ssh, template_name, data)
+          manifest = render(template_name, data)
+          cmd = "cat <<'EOF' | kubectl apply -f -\n#{manifest}\nEOF"
+          ssh.execute(cmd)
+        end
+
+        # Wait for a deployment to be ready
+        def wait_for_deployment(ssh, name, namespace: "default", timeout: 300)
+          ssh.execute("kubectl rollout status deployment/#{name} -n #{namespace} --timeout=#{timeout}s")
+        end
+      end
+    end
+  end
+end

data/lib/nvoi/version.rb

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

data/lib/nvoi.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+module Nvoi
+  class Error < StandardError; end
+end
+
+require "zeitwerk"
 require "yaml"
 require "json"
 require "openssl"
@@ -7,60 +12,27 @@ require "securerandom"
 require "fileutils"
 require "tempfile"
 require "open3"
-
-require_relative "nvoi/version"
-require_relative "nvoi/constants"
-require_relative "nvoi/errors"
-require_relative "nvoi/logger"
-
-require_relative "nvoi/config/types"
-require_relative "nvoi/config/naming"
-require_relative "nvoi/config/ssh_keys"
-require_relative "nvoi/config/env_resolver"
-require_relative "nvoi/config/loader"
-require_relative "nvoi/config/config"
-
-require_relative "nvoi/credentials/crypto"
-require_relative "nvoi/credentials/manager"
-require_relative "nvoi/credentials/editor"
-
-require_relative "nvoi/providers/base"
-require_relative "nvoi/providers/hetzner"
-require_relative "nvoi/providers/aws"
-
-require_relative "nvoi/cloudflare/client"
-
-require_relative "nvoi/remote/ssh_executor"
-require_relative "nvoi/remote/docker_manager"
-require_relative "nvoi/remote/volume_manager"
-
-require_relative "nvoi/k8s/templates"
-require_relative "nvoi/k8s/renderer"
-
-require_relative "nvoi/deployer/types"
-require_relative "nvoi/deployer/retry"
-require_relative "nvoi/deployer/tunnel_manager"
-require_relative "nvoi/deployer/infrastructure"
-require_relative "nvoi/deployer/image_builder"
-require_relative "nvoi/deployer/service_deployer"
-require_relative "nvoi/deployer/cleaner"
-require_relative "nvoi/deployer/orchestrator"
-
-require_relative "nvoi/steps/server_provisioner"
-require_relative "nvoi/steps/volume_provisioner"
-require_relative "nvoi/steps/k3s_provisioner"
-require_relative "nvoi/steps/k3s_cluster_setup"
-require_relative "nvoi/steps/tunnel_configurator"
-require_relative "nvoi/steps/database_provisioner"
-require_relative "nvoi/steps/services_provisioner"
-require_relative "nvoi/steps/application_deployer"
-
-require_relative "nvoi/service/provider"
-require_relative "nvoi/service/deploy"
-require_relative "nvoi/service/delete"
-require_relative "nvoi/service/exec"
-
-require_relative "nvoi/cli"
+require "faraday"
+
+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"
 
 module Nvoi
   class << self
@@ -75,5 +47,5 @@ module Nvoi
     end
   end
 
-  self.logger = Logger.new
+  self.logger = Utils::Logger.new
 end

data/templates/app-ingress.yaml.erb

@@ -8,7 +8,8 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - host: <%= domain %>
+<% domains.each do |domain| -%>
+  - host: "<%= domain %>"
     http:
       paths:
       - path: /
@@ -18,3 +19,4 @@ spec:
             name: <%= name %>
             port:
               number: <%= port %>
+<% end -%>

data/templates/error-backend.yaml.erb

@@ -0,0 +1,134 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: nvoi-error-pages
+  namespace: ingress-nginx
+data:
+  error.html: |
+    <!DOCTYPE html>
+    <html lang="en">
+    <head>
+      <meta charset="UTF-8">
+      <meta name="viewport" content="width=device-width, initial-scale=1.0">
+      <title>We'll be right back</title>
+      <style>
+        * { margin: 0; padding: 0; box-sizing: border-box; }
+        body {
+          font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
+          background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
+          color: #fff;
+          min-height: 100vh;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
+        .container {
+          text-align: center;
+          padding: 2rem;
+        }
+        .icon {
+          font-size: 4rem;
+          margin-bottom: 1.5rem;
+        }
+        h1 {
+          font-size: 2rem;
+          font-weight: 600;
+          margin-bottom: 0.5rem;
+        }
+        p {
+          color: #a0aec0;
+          font-size: 1.1rem;
+        }
+      </style>
+    </head>
+    <body>
+      <div class="container">
+        <div class="icon">&#9881;</div>
+        <h1>We'll be right back</h1>
+        <p>We're performing some maintenance. Please try again shortly.</p>
+      </div>
+    </body>
+    </html>
+  nginx.conf: |
+    server {
+      listen 8080;
+      server_name _;
+
+      location / {
+        add_header X-Nvoi-Error "true" always;
+        add_header Content-Type "text/html; charset=utf-8" always;
+        root /usr/share/nginx/html;
+        try_files /error.html =404;
+      }
+
+      location /healthz {
+        return 200 "ok";
+        add_header Content-Type "text/plain" always;
+      }
+    }
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: nvoi-error-backend
+  namespace: ingress-nginx
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: nvoi-error-backend
+  template:
+    metadata:
+      labels:
+        app: nvoi-error-backend
+    spec:
+      containers:
+      - name: nginx
+        image: nginx:alpine
+        ports:
+        - containerPort: 8080
+        volumeMounts:
+        - name: error-pages
+          mountPath: /usr/share/nginx/html/error.html
+          subPath: error.html
+        - name: nginx-conf
+          mountPath: /etc/nginx/conf.d/default.conf
+          subPath: nginx.conf
+        livenessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+          initialDelaySeconds: 5
+          periodSeconds: 10
+        readinessProbe:
+          httpGet:
+            path: /healthz
+            port: 8080
+          initialDelaySeconds: 2
+          periodSeconds: 5
+        resources:
+          requests:
+            memory: "16Mi"
+            cpu: "10m"
+          limits:
+            memory: "32Mi"
+            cpu: "50m"
+      volumes:
+      - name: error-pages
+        configMap:
+          name: nvoi-error-pages
+      - name: nginx-conf
+        configMap:
+          name: nvoi-error-pages
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: nvoi-error-backend
+  namespace: ingress-nginx
+spec:
+  selector:
+    app: nvoi-error-backend
+  ports:
+  - port: 80
+    targetPort: 8080

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: nvoi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - NVOI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-09 00:00:00.000000000 Z
+date: 2025-12-12 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,37 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".claude/todo/refactor-execution/00-entrypoint.md"
+- ".claude/todo/refactor-execution/01-objects.md"
+- ".claude/todo/refactor-execution/02-utils.md"
+- ".claude/todo/refactor-execution/03-external-cloud.md"
+- ".claude/todo/refactor-execution/04-external-dns.md"
+- ".claude/todo/refactor-execution/05-external-other.md"
+- ".claude/todo/refactor-execution/06-cli-deploy.md"
+- ".claude/todo/refactor-execution/07-cli-delete.md"
+- ".claude/todo/refactor-execution/08-cli-exec.md"
+- ".claude/todo/refactor-execution/09-cli-credentials.md"
+- ".claude/todo/refactor-execution/10-cli-db.md"
+- ".claude/todo/refactor-execution/11-cli-router.md"
+- ".claude/todo/refactor-execution/12-cleanup.md"
+- ".claude/todo/refactor-execution/_monitoring-strategy.md"
+- ".claude/todo/refactor/00-overview.md"
+- ".claude/todo/refactor/01-objects.md"
+- ".claude/todo/refactor/02-utils.md"
+- ".claude/todo/refactor/03-external-cloud.md"
+- ".claude/todo/refactor/04-external-dns.md"
+- ".claude/todo/refactor/05-external.md"
+- ".claude/todo/refactor/06-cli.md"
+- ".claude/todo/refactor/07-cli-deploy-command.md"
+- ".claude/todo/refactor/08-cli-deploy-steps.md"
+- ".claude/todo/refactor/09-cli-delete-command.md"
+- ".claude/todo/refactor/10-cli-exec-command.md"
+- ".claude/todo/refactor/11-cli-credentials-command.md"
+- ".claude/todo/refactor/12-cli-db-command.md"
+- ".claude/todo/refactor/_target.md"
+- ".claude/todo/scaleway.impl.md"
+- ".claude/todo/scaleway.reference.md"
+- ".claude/todos.md"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -178,7 +223,6 @@ files:
 - examples/golang/Dockerfile
 - examples/golang/README.md
 - examples/golang/deploy.enc
-- examples/golang/deploy.yml
 - examples/golang/go.mod
 - examples/golang/go.sum
 - examples/golang/main.go
@@ -283,56 +327,89 @@ files:
 - examples/rails-single/vendor/.keep
 - examples/rails-single/yarn.lock
 - exe/nvoi
+- ingest
 - lib/nvoi.rb
 - lib/nvoi/cli.rb
-- lib/nvoi/cloudflare/client.rb
-- lib/nvoi/config/config.rb
-- lib/nvoi/config/env_resolver.rb
-- lib/nvoi/config/loader.rb
-- lib/nvoi/config/naming.rb
-- lib/nvoi/config/ssh_keys.rb
-- lib/nvoi/config/types.rb
-- lib/nvoi/constants.rb
-- lib/nvoi/credentials/crypto.rb
-- lib/nvoi/credentials/editor.rb
-- lib/nvoi/credentials/manager.rb
-- lib/nvoi/deployer/cleaner.rb
-- lib/nvoi/deployer/image_builder.rb
-- lib/nvoi/deployer/infrastructure.rb
-- lib/nvoi/deployer/orchestrator.rb
-- lib/nvoi/deployer/retry.rb
-- lib/nvoi/deployer/service_deployer.rb
-- lib/nvoi/deployer/tunnel_manager.rb
-- lib/nvoi/deployer/types.rb
+- lib/nvoi/cli/config/command.rb
+- lib/nvoi/cli/credentials/edit/command.rb
+- lib/nvoi/cli/credentials/show/command.rb
+- lib/nvoi/cli/db/command.rb
+- lib/nvoi/cli/delete/command.rb
+- lib/nvoi/cli/delete/steps/detach_volumes.rb
+- lib/nvoi/cli/delete/steps/teardown_dns.rb
+- lib/nvoi/cli/delete/steps/teardown_firewall.rb
+- lib/nvoi/cli/delete/steps/teardown_network.rb
+- lib/nvoi/cli/delete/steps/teardown_server.rb
+- lib/nvoi/cli/delete/steps/teardown_tunnel.rb
+- lib/nvoi/cli/delete/steps/teardown_volume.rb
+- lib/nvoi/cli/deploy/command.rb
+- lib/nvoi/cli/deploy/steps/build_image.rb
+- lib/nvoi/cli/deploy/steps/cleanup_images.rb
+- lib/nvoi/cli/deploy/steps/configure_tunnel.rb
+- lib/nvoi/cli/deploy/steps/deploy_service.rb
+- lib/nvoi/cli/deploy/steps/provision_network.rb
+- lib/nvoi/cli/deploy/steps/provision_server.rb
+- lib/nvoi/cli/deploy/steps/provision_volume.rb
+- lib/nvoi/cli/deploy/steps/setup_k3s.rb
+- lib/nvoi/cli/exec/command.rb
+- lib/nvoi/cli/logs/command.rb
+- lib/nvoi/cli/onboard/command.rb
+- lib/nvoi/cli/unlock/command.rb
+- lib/nvoi/config_api.rb
+- lib/nvoi/config_api/actions/app.rb
+- lib/nvoi/config_api/actions/compute_provider.rb
+- lib/nvoi/config_api/actions/database.rb
+- lib/nvoi/config_api/actions/domain_provider.rb
+- lib/nvoi/config_api/actions/env.rb
+- lib/nvoi/config_api/actions/init.rb
+- lib/nvoi/config_api/actions/secret.rb
+- lib/nvoi/config_api/actions/server.rb
+- lib/nvoi/config_api/actions/service.rb
+- lib/nvoi/config_api/actions/volume.rb
+- lib/nvoi/config_api/base.rb
+- lib/nvoi/config_api/result.rb
 - lib/nvoi/errors.rb
-- lib/nvoi/k8s/renderer.rb
-- lib/nvoi/k8s/templates.rb
-- lib/nvoi/logger.rb
-- lib/nvoi/providers/aws.rb
-- lib/nvoi/providers/base.rb
-- lib/nvoi/providers/hetzner.rb
-- lib/nvoi/providers/hetzner_client.rb
-- lib/nvoi/remote/docker_manager.rb
-- lib/nvoi/remote/ssh_executor.rb
-- lib/nvoi/remote/volume_manager.rb
-- lib/nvoi/service/delete.rb
-- lib/nvoi/service/deploy.rb
-- lib/nvoi/service/exec.rb
-- lib/nvoi/service/provider.rb
-- lib/nvoi/steps/application_deployer.rb
-- lib/nvoi/steps/database_provisioner.rb
-- lib/nvoi/steps/k3s_cluster_setup.rb
-- lib/nvoi/steps/k3s_provisioner.rb
-- lib/nvoi/steps/server_provisioner.rb
-- lib/nvoi/steps/services_provisioner.rb
-- lib/nvoi/steps/tunnel_configurator.rb
-- lib/nvoi/steps/volume_provisioner.rb
+- lib/nvoi/external/cloud.rb
+- lib/nvoi/external/cloud/aws.rb
+- lib/nvoi/external/cloud/base.rb
+- lib/nvoi/external/cloud/factory.rb
+- lib/nvoi/external/cloud/hetzner.rb
+- lib/nvoi/external/cloud/scaleway.rb
+- lib/nvoi/external/containerd.rb
+- lib/nvoi/external/database.rb
+- lib/nvoi/external/database/mysql.rb
+- lib/nvoi/external/database/postgres.rb
+- lib/nvoi/external/database/provider.rb
+- lib/nvoi/external/database/sqlite.rb
+- lib/nvoi/external/dns/cloudflare.rb
+- lib/nvoi/external/kubectl.rb
+- lib/nvoi/external/ssh.rb
+- lib/nvoi/objects/config_override.rb
+- lib/nvoi/objects/configuration.rb
+- lib/nvoi/objects/database.rb
+- lib/nvoi/objects/dns.rb
+- lib/nvoi/objects/firewall.rb
+- lib/nvoi/objects/network.rb
+- lib/nvoi/objects/server.rb
+- lib/nvoi/objects/service_spec.rb
+- lib/nvoi/objects/tunnel.rb
+- lib/nvoi/objects/volume.rb
+- lib/nvoi/utils/config_loader.rb
+- lib/nvoi/utils/constants.rb
+- lib/nvoi/utils/credential_store.rb
+- lib/nvoi/utils/crypto.rb
+- lib/nvoi/utils/env_resolver.rb
+- lib/nvoi/utils/logger.rb
+- lib/nvoi/utils/namer.rb
+- lib/nvoi/utils/retry.rb
+- lib/nvoi/utils/templates.rb
 - lib/nvoi/version.rb
 - templates/app-deployment.yaml.erb
 - templates/app-ingress.yaml.erb
 - templates/app-secret.yaml.erb
 - templates/app-service.yaml.erb
 - templates/db-statefulset.yaml.erb
+- templates/error-backend.yaml.erb
 - templates/service-deployment.yaml.erb
 - templates/worker-deployment.yaml.erb
 homepage: https://github.com/getnvoi/cli