deploio-cli 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4464fa0c5bfb5ca034fc5b7936d2b3d856224068fb984bea2bf03018b1e33841
-  data.tar.gz: 8b9a0dc13c1262ebc81b8bee5e4aac9d9d47e70fb2850a6259ded636a40ea3af
+  metadata.gz: eae3786b2b0c98a4d02b1ac9037e9536da6cfc90ab7120ce80d4e98a76df90d7
+  data.tar.gz: ac86804058048327a006cd3343839299408425dd4e3702fe99aafc571e8e372c
 SHA512:
-  metadata.gz: 61678961554d647509a198b88510862d178774814e2fe094aa42e891ed655f079a8216b9663addd75da1861a2d24d7d9c0419ec6abb50bed139cdbab1176dec3
-  data.tar.gz: 9fcedee868c9a4621b4e0441618267074dc6963cb7ff0f8e7d00565b9f2e4f01c8f926e38e1d8ec5029c4775f975cd687e40b13f7b6e35141c2c20d814841d18
+  metadata.gz: 9a6a68ed578e07a9d0026f1dd61f3971ddd5f5e6b2ec590e2960644bef88de65cf054c04c2255051e0b550061eaa965a521b5700bfaf139ae5e3d76bf1f1aa19
+  data.tar.gz: 36614043d839a6a59c7ecc761f6d47ce8b9ff05cf149a630f33b17cb10b45ed8e374c2d1293c3ef7b9d98324290eeeb9332c2c530aea90642e18878faa08b9c4

data/README.md

@@ -71,8 +71,25 @@ AUTHENTICATION
 
 APPS
   deploio apps                    List all apps
+  deploio apps -p PROJECT         List apps in a specific project
+  deploio apps --chf              Show estimated monthly price (CHF) for each app
   deploio apps:info -a APP        Show app details
 
+PROJECTS
+  deploio projects                List all projects
+  deploio projects --chf          Show estimated total price (CHF) for each project
+
+BUILDS
+  deploio builds                  List all builds
+  deploio builds -a APP           List builds for a specific app
+
+SERVICES
+  deploio services                            List all services
+  deploio services -p PROJECT                 List services in a specific project
+  deploio services -p PROJECT --url List services with connection URLs (requires -p)
+  deploio services -p PROJECT --connected-apps  Show which apps use each service (requires -p)
+  deploio services --chf                    Show estimated monthly price (CHF) for each service
+
 LOGS
   deploio logs -a APP             Show recent logs
   deploio logs -a APP --tail      Stream logs continuously
@@ -111,11 +128,58 @@ deploio auth:whoami
 # List all apps
 deploio apps
 
+# List apps in a specific project
+deploio apps -p myproject
+
+# List apps with estimated monthly prices (CHF)
+deploio apps --chf
+
 # Show app info
 deploio apps:info -a myproject-staging
+```
+
+### Working with projects
+
+```bash
+# List all projects
+deploio projects
+
+# List projects with estimated total prices (apps + services)
+deploio projects --chf
+
+# Output as JSON
+deploio projects --json
+```
 
 ```
 
+### Working with services
+
+```bash
+# List all services
+deploio services
+
+# List services in a specific project
+deploio services -p myproject
+
+# List services with estimated monthly prices (CHF)
+deploio services --chf
+
+# List services with connection URLs (requires --project)
+deploio services -p myproject --url
+
+# Show which apps are connected to each service (requires --project)
+deploio services -p myproject --connected-apps
+
+# Combine options
+deploio services -p myproject --url --connected-apps --chf
+
+# Output as JSON
+deploio services --json
+```
+
+Note: Prices (--chf) are fetched from the Nine calculator API and cached locally in `~/.deploio/prices.json` for 24 hours.
+
 ### Logs and execution
 
 ```bash

data/deploio-cli.gemspec

@@ -18,6 +18,13 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "#{spec.homepage}/blob/main/CHANGELOG.md"
 
+  spec.post_install_message = <<~MSG
+    To enable shell autocompletion for deploio, add this to your ~/.zshrc:
+
+        eval "$(deploio completion)"
+
+  MSG
+
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject do |f|
       (File.expand_path(f) == __FILE__) ||

data/lib/deploio/cli.rb

@@ -3,7 +3,12 @@
 require "thor"
 require_relative "commands/auth"
 require_relative "commands/apps"
+require_relative "commands/builds"
 require_relative "commands/orgs"
+require_relative "commands/projects"
+require_relative "commands/services"
+require_relative "commands/postgresql_backups"
+require_relative "commands/postgresql"
 require_relative "completion_generator"
 
 module Deploio
@@ -40,6 +45,18 @@ module Deploio
     desc "orgs COMMAND", "Organization management commands"
     subcommand "orgs", Commands::Orgs
 
+    desc "projects COMMAND", "Project management commands"
+    subcommand "projects", Commands::Projects
+
+    desc "services COMMAND", "Service management commands"
+    subcommand "services", Commands::Services
+
+    desc "builds COMMAND", "Build management commands"
+    subcommand "builds", Commands::Builds
+
+    desc "pg COMMAND", "PostgreSQL database management commands"
+    subcommand "pg", Commands::PostgreSQL
+
     # Shortcut for auth:login
     desc "login", "Authenticate with nctl (alias for auth:login)"
     def login

data/lib/deploio/commands/apps.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../price_fetcher"
+
 module Deploio
   module Commands
     class Apps < Thor
@@ -11,10 +13,15 @@ module Deploio
 
       default_task :list
 
-      desc "list", "List all apps"
+      desc "list", "List apps (all or filtered by project)"
+      method_option :project, aliases: "-p", type: :string,
+        desc: "Filter by project name"
+      method_option :chf, type: :boolean, default: false,
+        desc: "Show estimated price (CHF) for each app"
       def list
         setup_options
-        raw_apps = @nctl.get_all_apps
+        project = merged_options[:project] ? resolve_project(merged_options[:project]) : nil
+        raw_apps = project ? @nctl.get_apps_by_project(project) : @nctl.get_all_apps
 
         if options[:json]
           puts JSON.pretty_generate(raw_apps)
@@ -22,11 +29,14 @@ module Deploio
         end
 
         if raw_apps.empty?
-          Output.warning("No apps found") unless merged_options[:dry_run]
+          msg = project ? "No apps found in project #{merged_options[:project]}" : "No apps found"
+          Output.warning(msg) unless merged_options[:dry_run]
           return
         end
 
         resolver = AppResolver.new(nctl_client: @nctl)
+        show_price = merged_options[:chf]
+        price_fetcher = PriceFetcher.new if show_price
 
         rows = raw_apps.map do |app|
           metadata = app["metadata"] || {}
@@ -37,15 +47,24 @@ module Deploio
           namespace = metadata["namespace"] || ""
           name = metadata["name"] || ""
 
-          [
+          row = [
             resolver.short_name_for(namespace, name),
             project_from_namespace(namespace, resolver.current_org),
             presence(config["size"], default: "micro"),
             presence(git["revision"])
           ]
+
+          if show_price
+            price = price_fetcher.price_for_app(app)
+            row << price_fetcher.format_price(price)
+          end
+
+          row
         end
 
-        Output.table(rows, headers: %w[APP PROJECT SIZE REVISION])
+        headers = %w[APP PROJECT SIZE REVISION]
+        headers << "PRICE" if show_price
+        Output.table(rows, headers: headers)
       end
 
       desc "info", "Show app details"
@@ -93,10 +112,13 @@ module Deploio
         ready_condition = conditions.find { |c| c["type"] == "Ready" }
         synced_condition = conditions.find { |c| c["type"] == "Synced" }
 
+        default_url = at_provider["defaultURL"]
+        default_url_display = default_url ? Output.link(default_url) : "-"
+
         Output.table([
           ["Ready", presence(ready_condition&.dig("status"))],
           ["Synced", presence(synced_condition&.dig("status"))],
-          ["Default URL", presence(at_provider["defaultURL"])],
+          ["Default URL", default_url_display],
           ["Latest Build", presence(at_provider["latestBuild"])],
           ["Latest Release", presence(at_provider["latestRelease"])]
         ])
@@ -106,7 +128,7 @@ module Deploio
         hosts = for_provider["hosts"] || []
         if hosts.any?
           Output.header("Hosts")
-          Output.table(hosts.map { |h| [presence(h)] })
+          Output.list(hosts.map { |h| Output.link(h, "https://#{h}") })
           puts
         end
 

data/lib/deploio/commands/builds.rb

@@ -0,0 +1,139 @@
+# frozen_string_literal: true
+
+require "time"
+
+module Deploio
+  module Commands
+    class Builds < Thor
+      include SharedOptions
+
+      namespace "builds"
+
+      class_option :json, type: :boolean, default: false, desc: "Output as JSON"
+
+      desc "list", "List builds (all or for a specific app)"
+      def list
+        setup_options
+
+        if merged_options[:app]
+          list_for_app
+        else
+          list_all
+        end
+      end
+
+      desc "logs [BUILD_NAME]", "Show build logs"
+      method_option :tail, aliases: "-t", type: :boolean, default: false, desc: "Stream logs continuously"
+      method_option :lines, aliases: "-n", type: :numeric, default: 5000, desc: "Number of lines to show"
+      def logs(build_name = nil)
+        setup_options
+        app_ref = merged_options[:app] ? resolve_app : nil
+        @nctl.build_logs(build_name, app_ref: app_ref, tail: options[:tail], lines: options[:lines])
+      end
+
+      private
+
+      def list_all
+        raw_builds = @nctl.get_all_builds
+
+        if options[:json]
+          puts JSON.pretty_generate(raw_builds)
+          return
+        end
+
+        if raw_builds.empty?
+          Output.warning("No builds found") unless merged_options[:dry_run]
+          return
+        end
+
+        resolver = AppResolver.new(nctl_client: @nctl)
+
+        rows = raw_builds.map do |build|
+          metadata = build["metadata"] || {}
+          spec = build["spec"] || {}
+          status = build["status"] || {}
+          for_provider = spec["forProvider"] || {}
+          git = for_provider["sourceConfig"]&.dig("git") || {}
+          at_provider = status["atProvider"] || {}
+          labels = metadata["labels"] || {}
+          app_name = labels["application.apps.nine.ch/name"] || "-"
+          namespace = metadata["namespace"] || ""
+
+          [
+            resolver.short_name_for(namespace, app_name),
+            presence(metadata["name"]),
+            format_status(at_provider["buildStatus"]),
+            presence(git["revision"], max_length: 20),
+            format_timestamp(metadata["creationTimestamp"])
+          ]
+        end
+
+        Output.table(rows, headers: %w[APP BUILD STATUS REVISION CREATED])
+      end
+
+      def list_for_app
+        app_ref = resolve_app
+        raw_builds = @nctl.get_builds(app_ref)
+
+        if options[:json]
+          puts JSON.pretty_generate(raw_builds)
+          return
+        end
+
+        if raw_builds.empty?
+          Output.warning("No builds found for #{app_ref.full_name}") unless merged_options[:dry_run]
+          return
+        end
+
+        rows = raw_builds.map do |build|
+          metadata = build["metadata"] || {}
+          spec = build["spec"] || {}
+          status = build["status"] || {}
+          for_provider = spec["forProvider"] || {}
+          git = for_provider["sourceConfig"]&.dig("git") || {}
+          at_provider = status["atProvider"] || {}
+
+          [
+            presence(metadata["name"]),
+            format_status(at_provider["buildStatus"]),
+            presence(git["revision"], max_length: 30),
+            format_timestamp(metadata["creationTimestamp"])
+          ]
+        end
+
+        Output.table(rows, headers: %w[BUILD STATUS REVISION CREATED])
+      end
+
+      def presence(value, default: "-", max_length: nil)
+        return default if value.nil? || value.to_s.empty?
+
+        str = value.to_s
+        (max_length && str.length > max_length) ? "#{str[0, max_length - 3]}..." : str
+      end
+
+      def format_status(status)
+        return "-" if status.nil? || status.to_s.empty?
+
+        case status.downcase
+        when "succeeded", "success"
+          Output.color_enabled ? "\e[32m#{status}\e[0m" : status
+        when "error", "failed"
+          Output.color_enabled ? "\e[31m#{status}\e[0m" : status
+        when "building", "running", "pending"
+          Output.color_enabled ? "\e[33m#{status}\e[0m" : status
+        else
+          status
+        end
+      end
+
+      def format_timestamp(timestamp)
+        return "-" if timestamp.nil? || timestamp.to_s.empty?
+
+        time = Time.parse(timestamp)
+        time.strftime("%Y-%m-%d %H:%M")
+      rescue ArgumentError
+        timestamp
+      end
+    end
+  end
+end

data/lib/deploio/commands/postgresql.rb

@@ -0,0 +1,131 @@
+module Deploio
+  module Commands
+    class PostgreSQL < Thor
+      include SharedOptions
+
+      namespace "pg"
+
+      class_option :json, type: :boolean, default: false, desc: "Output as JSON"
+
+      default_task :list
+
+      desc "list", "List all PostgreSQL databases"
+      def list
+        setup_options
+        raw_dbs = @nctl.get_all_pg_databases
+
+        if options[:json]
+          puts JSON.pretty_generate(raw_dbs)
+          return
+        end
+
+        if raw_dbs.empty?
+          Output.warning("No PostgreSQL databases found") unless merged_options[:dry_run]
+          return
+        end
+
+        resolver = PgDatabaseResolver.new(nctl_client: @nctl)
+
+        rows = raw_dbs.map do |pg|
+          kind = pg["kind"] || ""
+          metadata = pg["metadata"] || {}
+          spec = pg["spec"] || {}
+          for_provider = spec["forProvider"] || {}
+          version = for_provider["version"]
+          namespace = metadata["namespace"] || ""
+          name = metadata["name"] || ""
+
+          [
+            resolver.short_name_for(namespace, name),
+            project_from_namespace(namespace, resolver.current_org),
+            presence(kind, default: "-"),
+            presence(version, default: "?")
+          ]
+        end
+
+        Output.table(rows, headers: ["NAME", "PROJECT", "KIND", "VERSION"])
+      end
+
+      desc "info NAME", "Show PostgreSQL database details"
+      def info(name)
+        setup_options
+        resolver = PgDatabaseResolver.new(nctl_client: @nctl)
+        db_ref = resolver.resolve(database_name: name)
+        data = @nctl.get_pg_database(db_ref)
+
+        if options[:json]
+          puts JSON.pretty_generate(data)
+          return
+        end
+
+        kind = data["kind"]
+        metadata = data["metadata"] || {}
+        spec = data["spec"] || {}
+        for_provider = spec["forProvider"] || {}
+        status = data["status"] || {}
+        at_provider = status["atProvider"] || {}
+
+        Output.header("PostgreSQL Database: #{db_ref.full_name}")
+        puts
+
+        Output.header("General")
+        Output.table([
+          ["Name", presence(metadata["name"])],
+          ["Project", presence(metadata["namespace"])],
+          ["Kind", presence(kind, default: "-")],
+          ["Version", presence(for_provider["version"], default: "?")],
+          ["FQDN", presence(at_provider["fqdn"])],
+          ["Size", presence(at_provider["size"], default: "-")]
+        ])
+
+        puts
+
+        Output.header("Status")
+        conditions = status["conditions"] || []
+        ready_condition = conditions.find { |c| c["type"] == "Ready" }
+        synced_condition = conditions.find { |c| c["type"] == "Synced" }
+
+        Output.table([
+          ["Ready", presence(ready_condition&.dig("status"))],
+          ["Synced", presence(synced_condition&.dig("status"))]
+        ])
+
+        if for_provider["allowedCIDRs"].is_a?(Array)
+          puts
+
+          Output.header("Access")
+          Output.table([
+            ["Allowed CIDRs", for_provider["allowedCIDRs"].join(", ")]
+          ])
+
+          puts
+
+          Output.header("SSH Keys")
+          for_provider["sshKeys"].each do |key|
+            puts "- #{key}"
+          end
+        end
+      rescue Deploio::Error => e
+        Output.error(e.message)
+        exit 1
+      end
+
+      desc "backups COMMAND", "Manage PostgreSQL database backups"
+      subcommand "backups", Commands::PostgreSQLBackups
+
+      private
+
+      def presence(value, default: "-")
+        (value.nil? || value.to_s.empty?) ? default : value
+      end
+
+      def project_from_namespace(namespace, current_org)
+        if current_org && namespace.start_with?("#{current_org}-")
+          namespace.delete_prefix("#{current_org}-")
+        else
+          namespace
+        end
+      end
+    end
+  end
+end

data/lib/deploio/commands/postgresql_backups.rb

@@ -0,0 +1,75 @@
+module Deploio
+  module Commands
+    class PostgreSQLBackups < Thor
+      include SharedOptions
+
+      namespace "pg:backups"
+
+      desc "capture NAME", "Capture a new backup for the specified PostgreSQL database"
+      def capture(name)
+        setup_options
+        resolver = PgDatabaseResolver.new(nctl_client: @nctl)
+        db_ref = resolver.resolve(database_name: name)
+        data = @nctl.get_pg_database(db_ref)
+        kind = data["kind"] || ""
+
+        unless kind == "Postgres" || @nctl.dry_run
+          Output.error("Backups can only be captured for PostgreSQL databases. (shared dbs are not supported)")
+          exit 1
+        end
+
+        fqdn = data.dig("status", "atProvider", "fqdn")
+        if fqdn.nil? || fqdn.empty?
+          Output.error("Database FQDN not found; cannot capture backup.")
+          exit 1
+        end
+
+        cmd = ["ssh", "dbadmin@#{fqdn}", "sudo nine-postgresql-backup"]
+        Output.command(cmd.join(" "))
+        system(*cmd) unless @nctl.dry_run
+      end
+
+      desc "download NAME [--output destination_path]", "Download the latest backup for the specified PostgreSQL database instance"
+      method_option :output, type: :string, desc: "Output file path (defaults to current directory with auto-generated name)"
+      method_option :db_name, type: :string, desc: "If there are multiple DBs, specify which one to download the backup for", default: nil
+      def download(name)
+        destination = options[:output] || "./#{name}-latest-backup.zst"
+
+        setup_options
+        resolver = PgDatabaseResolver.new(nctl_client: @nctl)
+        db_ref = resolver.resolve(database_name: name)
+        data = @nctl.get_pg_database(db_ref)
+        kind = data["kind"] || ""
+
+        unless kind == "Postgres" || @nctl.dry_run
+          Output.error("Backups can only be downloaded for PostgreSQL databases. (shared dbs are not supported)")
+          exit 1
+        end
+
+        databases = data.dig("status", "atProvider", "databases")&.keys || []
+        databases.reject! { |db| db.strip.empty? }
+        if databases.empty?
+          Output.error("No databases found in PostgreSQL instance; cannot download backup.")
+          exit 1
+        elsif databases.size > 1 && options[:db_name].nil?
+          Output.error("Multiple databases found in PostgreSQL instance")
+          Output.error("Databases: #{databases.join(", ")}")
+          Output.error("Please specify the database name using the --db_name option.")
+          exit 1
+        end
+
+        db_name = options[:db_name] || databases.first
+
+        fqdn = data.dig("status", "atProvider", "fqdn")
+        if fqdn.nil? || fqdn.empty?
+          Output.error("Database FQDN not found; cannot download backup.")
+          exit 1
+        end
+
+        cmd = ["rsync", "-avz", "dbadmin@#{fqdn}:~/backup/postgresql/latest/customer/#{db_name}/#{db_name}.zst", destination]
+        Output.command(cmd.join(" "))
+        system(*cmd) unless @nctl.dry_run
+      end
+    end
+  end
+end