nvoi 0.1.6 → 0.1.8

data/lib/nvoi/cli/unlock/command.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Nvoi
+  class Cli
+    module Unlock
+      # Command removes deployment lock from remote server
+      class Command
+        def initialize(options)
+          @options = options
+          @log = Nvoi.logger
+        end
+
+        def run
+          config_path = resolve_config_path
+          @config = Utils::ConfigLoader.load(config_path)
+
+          # Apply branch override if specified
+          apply_branch_override if @options[:branch]
+
+          # Initialize cloud provider
+          @provider = External::Cloud.for(@config)
+
+          # Find main server
+          server = @provider.find_server(@config.server_name)
+          raise Errors::ServiceError, "server not found: #{@config.server_name}" unless server
+
+          ssh = External::Ssh.new(server.public_ipv4, @config.ssh_key_path)
+          lock_file = @config.namer.deployment_lock_file_path
+
+          # Check if lock exists and show info
+          output = ssh.execute("test -f #{lock_file} && cat #{lock_file} || echo ''").strip
+
+          if output.empty?
+            @log.info "No lock file found: %s", lock_file
+            return
+          end
+
+          timestamp = output.to_i
+          if timestamp > 0
+            lock_time = Time.at(timestamp)
+            age = Time.now - lock_time
+            @log.info "Lock file age: %ds (since %s)", age.round, lock_time.strftime("%H:%M:%S")
+          end
+
+          ssh.execute("rm -f #{lock_file}")
+          @log.success "Removed lock file: %s", lock_file
+        end
+
+        private
+
+          def resolve_config_path
+            config_path = @options[:config] || "deploy.enc"
+            working_dir = @options[:dir]
+
+            if config_path == "deploy.enc" && working_dir && working_dir != "."
+              File.join(working_dir, "deploy.enc")
+            else
+              config_path
+            end
+          end
+
+          def apply_branch_override
+            branch = @options[:branch]
+            return if branch.nil? || branch.empty?
+
+            override = Objects::ConfigOverride.new(branch:)
+            override.apply(@config)
+          end
+      end
+    end
+  end
+end

data/lib/nvoi/cli.rb

@@ -21,6 +21,12 @@ module Nvoi
       puts "nvoi #{VERSION}"
     end
 
+    desc "onboard", "Interactive setup wizard"
+    def onboard
+      require_relative "cli/onboard/command"
+      Cli::Onboard::Command.new.run
+    end
+
     desc "deploy", "Deploy application"
     option :dockerfile_path, desc: "Path to Dockerfile (optional, defaults to ./Dockerfile)"
     option :config_dir, desc: "Directory containing SSH keys (optional, defaults to ~/.ssh)"
@@ -36,6 +42,20 @@ module Nvoi
       Cli::Delete::Command.new(options).run
     end
 
+    desc "unlock", "Remove deployment lock (use when deploy hangs)"
+    def unlock
+      require_relative "cli/unlock/command"
+      Cli::Unlock::Command.new(options).run
+    end
+
+    desc "logs APP_NAME", "Stream logs from an app"
+    option :follow, aliases: "-f", type: :boolean, default: false, desc: "Follow log output"
+    option :tail, aliases: "-n", type: :numeric, default: 100, desc: "Number of lines to show"
+    def logs(app_name)
+      require_relative "cli/logs/command"
+      Cli::Logs::Command.new(options).run(app_name)
+    end
+
     desc "exec [COMMAND...]", "Execute command on remote server or open interactive shell"
     option :server, default: "main", desc: "Server to execute on (main, worker-1, worker-2, etc.)"
     option :all, type: :boolean, default: false, desc: "Execute on all servers"
@@ -75,6 +95,243 @@ module Nvoi
       end
     }
 
+    desc "config SUBCOMMAND", "Manage deployment configuration"
+    subcommand "config", Class.new(Thor) {
+      def self.exit_on_failure?
+        true
+      end
+
+      class_option :credentials, desc: "Path to encrypted config file"
+      class_option :master_key, desc: "Path to master key file"
+      class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+      desc "init", "Initialize new config"
+      option :name, required: true, desc: "Application name"
+      option :environment, default: "production", desc: "Environment"
+      def init
+        require_relative "cli/config/command"
+        Nvoi::Cli::Config::Command.new(options).init(options[:name], options[:environment])
+      end
+
+      desc "provider SUBCOMMAND", "Manage compute provider"
+      subcommand "provider", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set PROVIDER", "Set compute provider (hetzner, aws, scaleway)"
+        option :api_token, desc: "API token (hetzner)"
+        option :server_type, desc: "Server type (cx22, etc)"
+        option :server_location, desc: "Location (fsn1, etc)"
+        option :access_key_id, desc: "AWS access key ID"
+        option :secret_access_key, desc: "AWS secret access key"
+        option :region, desc: "AWS region"
+        option :instance_type, desc: "AWS instance type"
+        option :secret_key, desc: "Scaleway secret key"
+        option :project_id, desc: "Scaleway project ID"
+        option :zone, desc: "Scaleway zone"
+        def set(provider)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).provider_set(provider, **options.slice(
+            :api_token, :server_type, :server_location,
+            :access_key_id, :secret_access_key, :region, :instance_type,
+            :secret_key, :project_id, :zone
+          ).transform_keys(&:to_sym).compact)
+        end
+
+        desc "rm", "Remove compute provider"
+        def rm
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).provider_rm
+        end
+      }
+
+      desc "domain SUBCOMMAND", "Manage domain provider"
+      subcommand "domain", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set PROVIDER", "Set domain provider (cloudflare)"
+        option :api_token, required: true, desc: "API token"
+        option :account_id, required: true, desc: "Account ID"
+        def set(provider)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).domain_set(provider, api_token: options[:api_token], account_id: options[:account_id])
+        end
+
+        desc "rm", "Remove domain provider"
+        def rm
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).domain_rm
+        end
+      }
+
+      desc "server SUBCOMMAND", "Manage servers"
+      subcommand "server", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set NAME", "Add or update server"
+        option :master, type: :boolean, default: false, desc: "Set as master server"
+        option :type, desc: "Server type override"
+        option :location, desc: "Location override"
+        option :count, type: :numeric, default: 1, desc: "Number of servers"
+        def set(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).server_set(name, master: options[:master], type: options[:type], location: options[:location], count: options[:count])
+        end
+
+        desc "rm NAME", "Remove server"
+        def rm(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).server_rm(name)
+        end
+      }
+
+      desc "volume SUBCOMMAND", "Manage volumes"
+      subcommand "volume", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set SERVER NAME", "Add or update volume"
+        option :size, type: :numeric, default: 10, desc: "Volume size in GB"
+        def set(server, name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).volume_set(server, name, size: options[:size])
+        end
+
+        desc "rm SERVER NAME", "Remove volume"
+        def rm(server, name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).volume_rm(server, name)
+        end
+      }
+
+      desc "app SUBCOMMAND", "Manage applications"
+      subcommand "app", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set NAME", "Add or update app"
+        option :servers, type: :array, required: true, desc: "Server names to run on"
+        option :domain, desc: "Domain"
+        option :subdomain, desc: "Subdomain"
+        option :port, type: :numeric, desc: "Port"
+        option :command, desc: "Run command"
+        option :pre_run_command, desc: "Pre-run command (migrations, etc)"
+        def set(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).app_set(name, **options.slice(:servers, :domain, :subdomain, :port, :command, :pre_run_command).transform_keys(&:to_sym).compact)
+        end
+
+        desc "rm NAME", "Remove app"
+        def rm(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).app_rm(name)
+        end
+      }
+
+      desc "database SUBCOMMAND", "Manage database"
+      subcommand "database", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set", "Set database configuration"
+        option :servers, type: :array, required: true, desc: "Server names"
+        option :adapter, required: true, desc: "Database adapter (postgres, mysql, sqlite3)"
+        option :user, desc: "Database user"
+        option :password, desc: "Database password"
+        option :database, desc: "Database name"
+        option :url, desc: "Database URL (alternative to user/pass/db)"
+        option :image, desc: "Custom Docker image"
+        def set
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).database_set(**options.slice(:servers, :adapter, :user, :password, :database, :url, :image).transform_keys(&:to_sym).compact)
+        end
+
+        desc "rm", "Remove database"
+        def rm
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).database_rm
+        end
+      }
+
+      desc "service SUBCOMMAND", "Manage services (redis, etc)"
+      subcommand "service", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set NAME", "Add or update service"
+        option :servers, type: :array, required: true, desc: "Server names"
+        option :image, required: true, desc: "Docker image"
+        option :port, type: :numeric, desc: "Port"
+        option :command, desc: "Command"
+        def set(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).service_set(name, **options.slice(:servers, :image, :port, :command).transform_keys(&:to_sym).compact)
+        end
+
+        desc "rm NAME", "Remove service"
+        def rm(name)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).service_rm(name)
+        end
+      }
+
+      desc "secret SUBCOMMAND", "Manage secrets"
+      subcommand "secret", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set KEY VALUE", "Set secret"
+        def set(key, value)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).secret_set(key, value)
+        end
+
+        desc "rm KEY", "Remove secret"
+        def rm(key)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).secret_rm(key)
+        end
+      }
+
+      desc "env SUBCOMMAND", "Manage environment variables"
+      subcommand "env", Class.new(Thor) {
+        def self.exit_on_failure? = true
+        class_option :credentials, desc: "Path to encrypted config file"
+        class_option :master_key, desc: "Path to master key file"
+        class_option :dir, aliases: "-d", default: ".", desc: "Working directory"
+
+        desc "set KEY VALUE", "Set environment variable"
+        def set(key, value)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).env_set(key, value)
+        end
+
+        desc "rm KEY", "Remove environment variable"
+        def rm(key)
+          require_relative "cli/config/command"
+          Nvoi::Cli::Config::Command.new(options).env_rm(key)
+        end
+      }
+    }
+
     desc "db SUBCOMMAND", "Database operations"
     subcommand "db", Class.new(Thor) {
       def self.exit_on_failure?

data/lib/nvoi/config_api/actions/app.rb

@@ -6,47 +6,47 @@ module Nvoi
       class SetApp < Base
         protected
 
-        def mutate(data, name:, servers:, domain: nil, subdomain: nil, port: nil, command: nil, pre_run_command: nil, env: nil, mounts: nil)
-          raise ArgumentError, "name is required" if name.nil? || name.to_s.empty?
-          raise ArgumentError, "servers is required" if servers.nil? || servers.empty?
-          raise ArgumentError, "servers must be an array" unless servers.is_a?(Array)
-
-          validate_server_refs(data, servers)
-
-          app(data)["app"] ||= {}
-          app(data)["app"][name.to_s] = {
-            "servers" => servers.map(&:to_s),
-            "domain" => domain,
-            "subdomain" => subdomain,
-            "port" => port,
-            "command" => command,
-            "pre_run_command" => pre_run_command,
-            "env" => env,
-            "mounts" => mounts
-          }.compact
-        end
+          def mutate(data, name:, servers:, domain: nil, subdomain: nil, port: nil, command: nil, pre_run_command: nil, env: nil, mounts: nil)
+            raise ArgumentError, "name is required" if name.nil? || name.to_s.empty?
+            raise ArgumentError, "servers is required" if servers.nil? || servers.empty?
+            raise ArgumentError, "servers must be an array" unless servers.is_a?(Array)
+
+            validate_server_refs(data, servers)
+
+            app(data)["app"] ||= {}
+            app(data)["app"][name.to_s] = {
+              "servers" => servers.map(&:to_s),
+              "domain" => domain,
+              "subdomain" => subdomain,
+              "port" => port,
+              "command" => command,
+              "pre_run_command" => pre_run_command,
+              "env" => env,
+              "mounts" => mounts
+            }.compact
+          end
 
         private
 
-        def validate_server_refs(data, servers)
-          defined = (app(data)["servers"] || {}).keys
-          servers.each do |ref|
-            raise Errors::ConfigValidationError, "server '#{ref}' not found" unless defined.include?(ref.to_s)
+          def validate_server_refs(data, servers)
+            defined = (app(data)["servers"] || {}).keys
+            servers.each do |ref|
+              raise Errors::ConfigValidationError, "server '#{ref}' not found" unless defined.include?(ref.to_s)
+            end
           end
-        end
       end
 
       class DeleteApp < Base
         protected
 
-        def mutate(data, name:)
-          raise ArgumentError, "name is required" if name.nil? || name.to_s.empty?
+          def mutate(data, name:)
+            raise ArgumentError, "name is required" if name.nil? || name.to_s.empty?
 
-          apps = app(data)["app"] || {}
-          raise Errors::ConfigValidationError, "app '#{name}' not found" unless apps.key?(name.to_s)
+            apps = app(data)["app"] || {}
+            raise Errors::ConfigValidationError, "app '#{name}' not found" unless apps.key?(name.to_s)
 
-          apps.delete(name.to_s)
-        end
+            apps.delete(name.to_s)
+          end
       end
     end
   end

data/lib/nvoi/config_api/actions/compute_provider.rb

@@ -8,47 +8,47 @@ module Nvoi
 
         protected
 
-        def mutate(data, provider:, **opts)
-          raise ArgumentError, "provider is required" if provider.nil? || provider.to_s.empty?
-          raise ArgumentError, "provider must be one of: #{PROVIDERS.join(', ')}" unless PROVIDERS.include?(provider.to_s)
+          def mutate(data, provider:, **opts)
+            raise ArgumentError, "provider is required" if provider.nil? || provider.to_s.empty?
+            raise ArgumentError, "provider must be one of: #{PROVIDERS.join(', ')}" unless PROVIDERS.include?(provider.to_s)
 
-          app(data)["compute_provider"] = { provider.to_s => build_config(provider.to_s, opts) }
-        end
+            app(data)["compute_provider"] = { provider.to_s => build_config(provider.to_s, opts) }
+          end
 
         private
 
-        def build_config(provider, opts)
-          case provider
-          when "hetzner"
-            {
-              "api_token" => opts[:api_token],
-              "server_type" => opts[:server_type],
-              "server_location" => opts[:server_location]
-            }.compact
-          when "aws"
-            {
-              "access_key_id" => opts[:access_key_id],
-              "secret_access_key" => opts[:secret_access_key],
-              "region" => opts[:region],
-              "instance_type" => opts[:instance_type]
-            }.compact
-          when "scaleway"
-            {
-              "secret_key" => opts[:secret_key],
-              "project_id" => opts[:project_id],
-              "zone" => opts[:zone],
-              "server_type" => opts[:server_type]
-            }.compact
+          def build_config(provider, opts)
+            case provider
+            when "hetzner"
+              {
+                "api_token" => opts[:api_token],
+                "server_type" => opts[:server_type],
+                "server_location" => opts[:server_location]
+              }.compact
+            when "aws"
+              {
+                "access_key_id" => opts[:access_key_id],
+                "secret_access_key" => opts[:secret_access_key],
+                "region" => opts[:region],
+                "instance_type" => opts[:instance_type]
+              }.compact
+            when "scaleway"
+              {
+                "secret_key" => opts[:secret_key],
+                "project_id" => opts[:project_id],
+                "zone" => opts[:zone],
+                "server_type" => opts[:server_type]
+              }.compact
+            end
           end
-        end
       end
 
       class DeleteComputeProvider < Base
         protected
 
-        def mutate(data, **)
-          app(data)["compute_provider"] = {}
-        end
+          def mutate(data, **)
+            app(data)["compute_provider"] = {}
+          end
       end
     end
   end

data/lib/nvoi/config_api/actions/database.rb

@@ -8,62 +8,62 @@ module Nvoi
 
         protected
 
-        def mutate(data, servers:, adapter:, image: nil, url: nil, user: nil, password: nil, database: nil, mount: nil, path: nil)
-          raise ArgumentError, "servers is required" if servers.nil? || servers.empty?
-          raise ArgumentError, "servers must be an array" unless servers.is_a?(Array)
-          raise ArgumentError, "adapter is required" if adapter.nil? || adapter.to_s.empty?
-          raise ArgumentError, "adapter must be one of: #{ADAPTERS.join(', ')}" unless ADAPTERS.include?(adapter.to_s.downcase)
+          def mutate(data, servers:, adapter:, image: nil, url: nil, user: nil, password: nil, database: nil, mount: nil, path: nil)
+            raise ArgumentError, "servers is required" if servers.nil? || servers.empty?
+            raise ArgumentError, "servers must be an array" unless servers.is_a?(Array)
+            raise ArgumentError, "adapter is required" if adapter.nil? || adapter.to_s.empty?
+            raise ArgumentError, "adapter must be one of: #{ADAPTERS.join(', ')}" unless ADAPTERS.include?(adapter.to_s.downcase)
 
-          validate_server_refs(data, servers)
+            validate_server_refs(data, servers)
 
-          secrets = build_secrets(adapter, user, password, database)
+            secrets = build_secrets(adapter, user, password, database)
 
-          app(data)["database"] = {
-            "servers" => servers.map(&:to_s),
-            "adapter" => adapter.to_s,
-            "image" => image,
-            "url" => url,
-            "secrets" => secrets.empty? ? nil : secrets,
-            "mount" => mount,
-            "path" => path
-          }.compact
-        end
+            app(data)["database"] = {
+              "servers" => servers.map(&:to_s),
+              "adapter" => adapter.to_s,
+              "image" => image,
+              "url" => url,
+              "secrets" => secrets.empty? ? nil : secrets,
+              "mount" => mount,
+              "path" => path
+            }.compact
+          end
 
         private
 
-        def validate_server_refs(data, servers)
-          defined = (app(data)["servers"] || {}).keys
-          servers.each do |ref|
-            raise Errors::ConfigValidationError, "server '#{ref}' not found" unless defined.include?(ref.to_s)
+          def validate_server_refs(data, servers)
+            defined = (app(data)["servers"] || {}).keys
+            servers.each do |ref|
+              raise Errors::ConfigValidationError, "server '#{ref}' not found" unless defined.include?(ref.to_s)
+            end
           end
-        end
 
-        def build_secrets(adapter, user, password, database)
-          case adapter.to_s.downcase
-          when "postgres", "postgresql"
-            {
-              "POSTGRES_USER" => user,
-              "POSTGRES_PASSWORD" => password,
-              "POSTGRES_DB" => database
-            }.compact
-          when "mysql"
-            {
-              "MYSQL_USER" => user,
-              "MYSQL_PASSWORD" => password,
-              "MYSQL_DATABASE" => database
-            }.compact
-          else
-            {}
+          def build_secrets(adapter, user, password, database)
+            case adapter.to_s.downcase
+            when "postgres", "postgresql"
+              {
+                "POSTGRES_USER" => user,
+                "POSTGRES_PASSWORD" => password,
+                "POSTGRES_DB" => database
+              }.compact
+            when "mysql"
+              {
+                "MYSQL_USER" => user,
+                "MYSQL_PASSWORD" => password,
+                "MYSQL_DATABASE" => database
+              }.compact
+            else
+              {}
+            end
           end
-        end
       end
 
       class DeleteDatabase < Base
         protected
 
-        def mutate(data, **)
-          app(data).delete("database")
-        end
+          def mutate(data, **)
+            app(data).delete("database")
+          end
       end
     end
   end

data/lib/nvoi/config_api/actions/domain_provider.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Nvoi
+  module ConfigApi
+    module Actions
+      class SetDomainProvider < Base
+        PROVIDERS = %w[cloudflare].freeze
+
+        protected
+
+          def mutate(data, provider:, **opts)
+            raise ArgumentError, "provider is required" if provider.nil? || provider.to_s.empty?
+            raise ArgumentError, "provider must be one of: #{PROVIDERS.join(', ')}" unless PROVIDERS.include?(provider.to_s)
+
+            app(data)["domain_provider"] = { provider.to_s => build_config(provider.to_s, opts) }
+          end
+
+        private
+
+          def build_config(provider, opts)
+            case provider
+            when "cloudflare"
+              {
+                "api_token" => opts[:api_token],
+                "account_id" => opts[:account_id]
+              }.compact
+            end
+          end
+      end
+
+      class DeleteDomainProvider < Base
+        protected
+
+          def mutate(data, **)
+            app(data)["domain_provider"] = {}
+          end
+      end
+    end
+  end
+end