nvoi 0.1.7 → 0.2.0

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"]
@@ -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/external/ssh.rb

@@ -62,18 +62,6 @@ module Nvoi
         raise Errors::SshCommandError, "SCP download failed: #{output}" unless status.success?
       end
 
-      def rsync(local_path, remote_path)
-        rsync_args = [
-          "-avz",
-          "-e", "ssh #{build_ssh_args.join(' ')}",
-          local_path,
-          "#{@user}@#{@ip}:#{remote_path}"
-        ]
-
-        output, status = Open3.capture2e("rsync", *rsync_args)
-        raise Errors::SshCommandError, "rsync failed: #{output}" unless status.success?
-      end
-
       private
 
         def build_ssh_args

data/lib/nvoi/external/ssh_tunnel.rb

@@ -0,0 +1,100 @@
+# frozen_string_literal: true
+
+require "net/ssh"
+
+module Nvoi
+  module External
+    # SshTunnel manages SSH port forwarding using net-ssh
+    class SshTunnel
+      attr_reader :local_port, :remote_port
+
+      def initialize(ip:, user:, key_path:, local_port:, remote_port:)
+        @ip = ip
+        @user = user
+        @key_path = key_path
+        @local_port = local_port
+        @remote_port = remote_port
+        @session = nil
+        @thread = nil
+        @running = false
+      end
+
+      def start
+        Nvoi.logger.info "Starting SSH tunnel: localhost:%d -> %s:%d", @local_port, @ip, @remote_port
+
+        @session = Net::SSH.start(
+          @ip,
+          @user,
+          keys: [@key_path],
+          non_interactive: true,
+          verify_host_key: :never
+        )
+
+        @session.forward.local(@local_port, "localhost", @remote_port)
+        @running = true
+
+        @thread = Thread.new do
+          Thread.current.report_on_exception = false
+          @session.loop { @running }
+        rescue IOError, Net::SSH::Disconnect, Errno::EBADF
+          # Session closed during shutdown, exit gracefully
+        end
+
+        # Wait for tunnel to establish
+        sleep 0.3
+        verify_tunnel!
+
+        Nvoi.logger.success "SSH tunnel established"
+      end
+
+      def stop
+        return unless @running
+
+        Nvoi.logger.info "Stopping SSH tunnel"
+        @running = false
+
+        # Give the event loop a moment to see @running = false
+        sleep 0.1
+
+        begin
+          @session&.forward&.cancel_local(@local_port)
+        rescue StandardError
+          # Ignore errors during cleanup
+        end
+
+        begin
+          @session&.close
+        rescue StandardError
+          # Ignore errors during cleanup
+        end
+
+        # Wait for thread to exit gracefully
+        @thread&.join(1)
+
+        @session = nil
+        @thread = nil
+
+        Nvoi.logger.success "SSH tunnel closed"
+      end
+
+      def alive?
+        @running && @thread&.alive? && @session && !@session.closed?
+      end
+
+      private
+
+        def verify_tunnel!
+          unless alive?
+            raise Errors::SshError, "SSH tunnel failed to start"
+          end
+
+          # Verify the port is actually listening
+          require "socket"
+          socket = TCPSocket.new("localhost", @local_port)
+          socket.close
+        rescue Errno::ECONNREFUSED
+          raise Errors::SshError, "SSH tunnel started but port #{@local_port} not accessible"
+        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.7"
+  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