nvoi 0.1.8 → 0.2.0

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"]
@@ -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

@@ -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}"]

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.0"
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nvoi
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - NVOI
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-12 00:00:00.000000000 Z
+date: 2025-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -38,6 +38,76 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: tty-box
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: tty-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -173,38 +243,6 @@ 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"
-- ".claude/todos/buckets.md"
 - ".rubocop.yml"
 - Gemfile
 - Gemfile.lock
@@ -328,7 +366,6 @@ files:
 - examples/rails-single/vendor/.keep
 - examples/rails-single/yarn.lock
 - exe/nvoi
-- ingest
 - lib/nvoi.rb
 - lib/nvoi/cli.rb
 - lib/nvoi/cli/config/command.rb
@@ -355,20 +392,26 @@ files:
 - lib/nvoi/cli/exec/command.rb
 - lib/nvoi/cli/logs/command.rb
 - lib/nvoi/cli/onboard/command.rb
+- lib/nvoi/cli/onboard/steps/app.rb
+- lib/nvoi/cli/onboard/steps/app_name.rb
+- lib/nvoi/cli/onboard/steps/compute.rb
+- lib/nvoi/cli/onboard/steps/database.rb
+- lib/nvoi/cli/onboard/steps/domain.rb
+- lib/nvoi/cli/onboard/steps/env.rb
+- lib/nvoi/cli/onboard/ui.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/configuration/app_service.rb
+- lib/nvoi/configuration/application.rb
+- lib/nvoi/configuration/builder.rb
+- lib/nvoi/configuration/database.rb
+- lib/nvoi/configuration/deploy.rb
+- lib/nvoi/configuration/deployment.rb
+- lib/nvoi/configuration/override.rb
+- lib/nvoi/configuration/providers.rb
+- lib/nvoi/configuration/result.rb
+- lib/nvoi/configuration/root.rb
+- lib/nvoi/configuration/server.rb
+- lib/nvoi/configuration/service.rb
 - lib/nvoi/errors.rb
 - lib/nvoi/external/cloud.rb
 - lib/nvoi/external/cloud/aws.rb
@@ -376,26 +419,19 @@ files:
 - lib/nvoi/external/cloud/factory.rb
 - lib/nvoi/external/cloud/hetzner.rb
 - lib/nvoi/external/cloud/scaleway.rb
+- lib/nvoi/external/cloud/types.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/database/types.rb
 - lib/nvoi/external/dns/cloudflare.rb
+- lib/nvoi/external/dns/types.rb
 - lib/nvoi/external/kubectl.rb
 - lib/nvoi/external/ssh.rb
 - lib/nvoi/external/ssh_tunnel.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
@@ -403,6 +439,7 @@ files:
 - lib/nvoi/utils/env_resolver.rb
 - lib/nvoi/utils/logger.rb
 - lib/nvoi/utils/namer.rb
+- lib/nvoi/utils/presence.rb
 - lib/nvoi/utils/retry.rb
 - lib/nvoi/utils/templates.rb
 - lib/nvoi/version.rb