neetodeploy 1.1.23 → 1.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7c04dddccb926fbd8c26f28d31e9aa6ed098b653b29da7e8711c4452d5ede10
-  data.tar.gz: 0d44f122ba5a598006ac7c6d0a002233e82407a4dc371c5b808cc84f2dc28bfc
+  metadata.gz: a0396bbc473e87998286bdc95905c601721c24787da18a64e7ab67a9cd42ddfa
+  data.tar.gz: 8d002597268fcca2205aa42a5fcdeb371f2a9edcbdfeb14ff80bff449407b7e0
 SHA512:
-  metadata.gz: 1efe8207bae407d607719fcb4774421dc0186dbc086325833fd069de62c45085c696c8db208467ad24a5178323fe0835ba76721d5c101bd8c6b55085d2999ca3
-  data.tar.gz: 8368430e6da97dca5969caacb139cdc89dfd19b6ca850e07633d9c35f3471975ce503d023e185ecbb051eae3e131eb6e58e9a0838456ec6c50f03ef301f85b84
+  metadata.gz: 0f07f591022176db4bd74ab0b6a5c3839634c728f5db28cef1cd504d2ff728fcec857fe84d85a9c02ba9b01a99a56d1086d41c023a318d789b5f3b26ddcd32b0
+  data.tar.gz: d7bc9e789cf2174cca1beb3fc37b816ceeb7d554fab45be4d50e46d24d0f4cec7d4f1d094b78f5b22847f46c59bf65c125317fa7180c307cfb202a07d8e5286b

data/Gemfile.lock

@@ -1,18 +1,21 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.22)
-      aws-sdk-cloudwatchlogs (~> 1.0)
-      aws-sdk-cognitoidentity (~> 1.0)
-      colorize (~> 1.1)
+    neetodeploy (1.1.25)
+      base64
+      bigdecimal
+      colorize
+      csv
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)
-      rexml (~> 3.2)
+      logger
+      ostruct
+      rexml
       terminal-table (~> 3.0.2)
-      thor (~> 1.3.0)
-      tty-spinner (~> 0.9)
-      websocket-eventmachine-client (~> 1.2)
+      thor (~> 1.5.0)
+      tty-spinner
+      websocket-eventmachine-client
 
 GEM
   remote: https://rubygems.org/
@@ -34,8 +37,11 @@ GEM
       jmespath (~> 1, >= 1.6.1)
     aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
+    base64 (0.3.0)
+    bigdecimal (4.0.1)
     byebug (11.1.3)
     colorize (1.1.0)
+    csv (3.3.5)
     dotenv (2.8.1)
     eventmachine (1.2.7)
     httparty (0.21.0)
@@ -44,13 +50,15 @@ GEM
     jmespath (1.6.2)
     launchy (2.5.2)
       addressable (~> 2.8)
+    logger (1.7.0)
     mini_mime (1.1.2)
     multi_xml (0.6.0)
+    ostruct (0.6.3)
     public_suffix (5.0.1)
     rexml (3.4.1)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.3.0)
+    thor (1.5.0)
     tty-cursor (0.7.1)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
@@ -68,6 +76,8 @@ PLATFORMS
   arm64-darwin-20
   arm64-darwin-21
   arm64-darwin-23
+  arm64-darwin-24
+  arm64-darwin-25
   x86_64-darwin-21
   x86_64-darwin-23
   x86_64-linux

data/lib/neeto_deploy/cli/addon/constants.rb

@@ -9,6 +9,10 @@ module NeetoDeploy
         def addon_url(addon_name)
           "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/#{addon_name}"
         end
+
+        def scheduled_exports_url(app_slug)
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/scheduled_exports/#{app_slug}"
+        end
       end
     end
   end

data/lib/neeto_deploy/cli/addon/info.rb

@@ -42,7 +42,7 @@ module NeetoDeploy
           end
 
           def print_output
-            ui.error(@response["error"]) and return unless @response.success?
+            ui.error(@response["error"] || @response.message) and return unless @response.success?
 
             flatten_hash_from(JSON[@response.body]).each do |k, v|
               ui.info("#{k}: #{v}")

data/lib/neeto_deploy/cli/addon/scheduled_exports_settings.rb

@@ -12,34 +12,32 @@ module NeetoDeploy
         include Constants
         include Session
 
-        attr_reader :app_name
+        attr_reader :app_slug
 
         def initialize(options)
           super()
-          @app_name = options[:app]
+          @app_slug = options[:app]
         end
 
         def run
           ui.execute_with_loading("Fetching info...") do
-            send_request
+            @response = send_get_request(scheduled_exports_url(app_slug), { app_slug: })
           end
           print_output
         end
 
         private
 
-          def send_request
-            @response = send_get_request("#{NEETO_DEPLOY_CLI_API_BASE_URL}/scheduled_exports/#{app_name}", {app_slug: app_name})
-          end
-
           def print_output
-            ui.error(@response["error"]) and return unless @response.success?
+            ui.error(@response["error"] || @response.message) and return unless @response.success?
 
             scheduled_exports = JSON.parse(@response.body)["scheduled_exports_enabled"]
             if scheduled_exports.nil?
               ui.error("App doesn't seem to have a primary database addon")
+            elsif scheduled_exports
+              ui.success("Scheduled exports is turned on for #{app_slug}'s primary database")
             else
-              ui.info("Scheduled exports is turned #{scheduled_exports ? "\u001b[32mon\u001b[0m" : "\u001b[31moff\u001b[0m"} for #{app_name}'s primary database")
+              ui.info("Scheduled exports is turned off for #{app_slug}'s primary database")
             end
           end
       end

data/lib/neeto_deploy/cli/autoscaling_config/commands.rb

@@ -2,6 +2,7 @@
 
 require "thor"
 
+require_relative "./constants"
 require_relative "./list"
 
 module NeetoDeploy

data/lib/neeto_deploy/cli/autoscaling_config/constants.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module AutoscalingConfig
+      module Constants
+        def autoscaling_configs_url(app_slug)
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/autoscaling_configs/#{app_slug}"
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/autoscaling_config/list.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
 require "thor"
+require "terminal-table"
+
+require_relative "../session"
+require_relative "./constants"
 
 module NeetoDeploy
   class CLI
     module AutoscalingConfig
       class List < CLI::Base
         include Session
+        include Constants
 
         attr_reader :app_slug
 
@@ -16,15 +21,22 @@ module NeetoDeploy
         end
 
         def run
-          response = send_get_request(
-            "#{NEETO_DEPLOY_CLI_API_BASE_URL}/autoscaling_configs/#{app_slug}", {
-              app_slug:
-            }
-          )
+          ui.execute_with_loading("Fetching autoscaling configs...") do
+            @response = send_get_request(autoscaling_configs_url(app_slug), { app_slug: })
+          end
+
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
+
+          status = JSON.parse(@response.body)["autoscaling_status"]
 
-          ui.error(response) and return unless response.success?
+          if status.nil? || status.empty?
+            ui.info("No autoscaling configs found for #{app_slug}.")
+            return
+          end
 
-          ui.success(JSON.parse(response.body)["autoscaling_status"])
+          rows = status.map { |process_type, config| [process_type, config&.[]("enabled") ? "Yes" : "No", config&.[]("type") || "-"] }
+          table = Terminal::Table.new(headings: ["Process Type", "Enabled", "Type"], rows: rows)
+          ui.info(table)
         end
       end
     end

data/lib/neeto_deploy/cli/certificates/commands.rb

@@ -2,6 +2,7 @@
 
 require "thor"
 
+require_relative "./constants"
 require_relative "./list"
 
 module NeetoDeploy

data/lib/neeto_deploy/cli/certificates/constants.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Certificates
+      module Constants
+        def certificates_url
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/certificates"
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/certificates/list.rb

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
 require "thor"
+require "terminal-table"
+
+require_relative "../session"
+require_relative "./constants"
 
 module NeetoDeploy
   class CLI
     module Certificates
       class List < CLI::Base
         include Session
+        include Constants
 
         attr_reader :app_slug
 
@@ -16,15 +21,27 @@ module NeetoDeploy
         end
 
         def run
-          response = send_get_request(
-            "#{NEETO_DEPLOY_CLI_API_BASE_URL}/certificates", {
-              app_slug:
-            }
-          )
+          ui.execute_with_loading("Fetching certificates...") do
+            @response = send_get_request(certificates_url, { app_slug: })
+          end
+
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
+
+          certificates = JSON.parse(@response.body)["certificates"]
+
+          if certificates.nil? || certificates.empty?
+            ui.info("No certificates found for #{app_slug}.")
+            return
+          end
 
-          ui.error(response) and return unless response.success?
+          rows = certificates.map do |cert|
+            domains = Array(cert["domains"]).map { |d| d["hostname"] }.join(", ")
+            expiring_soon = cert["expires_before_30_days"] ? " (expiring soon)" : ""
+            [cert["name"], cert["expiration"], domains + expiring_soon]
+          end
 
-          ui.success(JSON.parse(response.body)["certificates"])
+          table = Terminal::Table.new(headings: ["Name", "Expiration", "Domains"], rows: rows)
+          ui.info(table)
         end
       end
     end

data/lib/neeto_deploy/cli/dyno_console_manager.rb

@@ -15,21 +15,39 @@ module NeetoDeploy
       def process!
         start_spinner
         send_console_session_request
-        ui.error("\n#{@response.body}") and return unless @response.success?
+        ui.error(@response["error"] || @response.message) and return unless @response.success?
 
+        print_connection_banner
         start_console
+        print_session_end
         connection_cleanup_callback
       end
 
       private
 
         def console_executable_path
-          gem_spec = Gem::Specification.find_by_name("neetodeploy")
-          gem_dir = gem_spec.gem_dir
-          executable_path = File.join(gem_dir, "exe", console_executable_name)
+          if ENV["DEV_ENVIRONMENT"]
+            File.expand_path("../../../exe/#{console_executable_name}", __dir__)
+          else
+            gem_spec = Gem::Specification.find_by_name("neetodeploy")
+            File.join(gem_spec.gem_dir, "exe", console_executable_name)
+          end
+        end
+
+        def print_connection_banner
+          separator = "─" * 60
+          ui.success("Connected to #{addon_name}. Type \"exit\" to end the session.")
+          ui.info(separator)
+        end
+
+        def print_session_end
+          separator = "─" * 60
+          ui.info(separator)
+          ui.info("Session ended.")
         end
 
         def start_console
+          @pubsub_token = @response.parsed_response["console_pubsub_token"]
           console_access_token = @response.parsed_response["console_access_token"]
           pod_name = @response.parsed_response["pod_name"]
           database_url = @response.parsed_response["database_url"]
@@ -39,7 +57,7 @@ module NeetoDeploy
         end
 
         def execute_console(pod_name, console_access_token, container_name, kind, database_url)
-          system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -kind #{kind} -container #{container_name} -url #{database_url}")
+          system(console_executable_path, "-podname", pod_name, "-token", console_access_token, "-kind", kind, "-container", container_name, "-url", database_url, err: File::NULL)
         end
 
         def send_console_session_request
@@ -49,11 +67,12 @@ module NeetoDeploy
 
         def connection_cleanup_callback
           url = "#{console_session_base_url}/#{addon_name}"
-          send_delete_request(url, { pubsub_token: @pubsub_token })
+          response = send_delete_request(url, { pubsub_token: @pubsub_token })
+          ui.error("Warning: failed to clean up session — #{response["error"] || response.message}") unless response.success?
         end
 
         def start_spinner
-          @spinner = TTY::Spinner.new("Setting up dyno [:spinner]", format: :classic)
+          @spinner = TTY::Spinner.new("Setting up console for #{addon_name} [:spinner]", format: :classic)
           @spinner.auto_spin
         end
     end

data/lib/neeto_deploy/cli/env/list.rb

@@ -2,6 +2,7 @@
 
 require "terminal-table"
 require "thor"
+require "io/console"
 
 require_relative "../session"
 require_relative "./constants"
@@ -22,16 +23,14 @@ module NeetoDeploy
         end
 
         def run
-          response = send_get_request(
-            environment_variables_url, {
-              app_slug:
-            }
-          )
+          ui.execute_with_loading("Fetching environment variables...") do
+            @response = send_get_request(environment_variables_url, { app_slug: })
+          end
 
-          ui.error(response) and return unless response.success?
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
 
-          data = is_json_format ? json_data(response["environment_variables"]) : table_data(response["environment_variables"])
-          ui.success(data)
+          data = is_json_format ? json_data(@response["environment_variables"]) : table_data(@response["environment_variables"])
+          ui.info(data)
         end
 
         private
@@ -47,7 +46,20 @@ module NeetoDeploy
           end
 
           def table_data(envs)
-            Terminal::Table.new(headings: table_columns, rows: table_rows(envs))
+            rows = table_rows(envs)
+            key_width = rows.map { |r| r[0].length }.max || 10
+            val_width = [terminal_width - key_width - 7, 20].max
+            wrapped_rows = rows.map { |key, value| [key, wrap_value(value, val_width)] }
+            Terminal::Table.new(headings: table_columns, rows: wrapped_rows, style: { all_separators: false })
+          end
+
+          def terminal_width
+            IO.console&.winsize&.last || 120
+          end
+
+          def wrap_value(text, width)
+            return text if text.length <= width
+            text.chars.each_slice(width).map(&:join).join("\n")
           end
 
           def json_data(envs)

data/lib/neeto_deploy/cli/env/set.rb

@@ -25,24 +25,11 @@ module NeetoDeploy
         end
 
         def run
-          table = Terminal::Table.new(
-            headings: table_columns,
-            rows: environment_variables.map { |environment_variable|
-              [environment_variable[:key], environment_variable[:value]]
-            }
-          )
-          ui.info(table)
-
-          ui.info("Setting environment variables and restarting app...")
-
-          response = send_post_request(
-            environment_variables_url, {
-              app_slug:,
-              environment_variables:
-            }
-          )
-
-          ui.error(response) and return unless response.success?
+          ui.execute_with_loading("Setting environment variables and restarting app...") do
+            @response = send_post_request(environment_variables_url, { app_slug:, environment_variables: })
+          end
+
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
 
           ui.success("Done")
         end

data/lib/neeto_deploy/cli/env/unset.rb

@@ -25,16 +25,11 @@ module NeetoDeploy
         end
 
         def run
-          ui.info("Unsetting environment variable keys #{environment_variables_string_array} and restarting app...")
-
-          response = send_delete_request(
-            environment_variables_url, {
-              app_slug:,
-              environment_variables:
-            }
-          )
+          ui.execute_with_loading("Unsetting #{environment_variables_string_array.join(", ")} and restarting app...") do
+            @response = send_delete_request(environment_variables_url, { app_slug:, environment_variables: })
+          end
 
-          ui.error(response) and return unless response.success?
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
 
           ui.success("Done")
         end

data/lib/neeto_deploy/cli/exec/base.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require "readline"
 require "rbconfig"
 
 require_relative "../session"
@@ -27,18 +26,35 @@ module NeetoDeploy
         def process!
           start_spinner
           send_console_session_request
-          ui.error("\n#{@response.body}") and return unless @response.success?
+          ui.error(@response["error"] || @response.message) and return unless @response.success?
 
+          print_connection_banner
           start_console
+          print_session_end
           connection_cleanup_callback
         end
 
         private
 
           def console_executable_path
-            gem_spec = Gem::Specification.find_by_name("neetodeploy")
-            gem_dir = gem_spec.gem_dir
-            executable_path = File.join(gem_dir, "exe", console_executable_name)
+            if ENV["DEV_ENVIRONMENT"]
+              File.expand_path("../../../../exe/#{console_executable_name}", __dir__)
+            else
+              gem_spec = Gem::Specification.find_by_name("neetodeploy")
+              File.join(gem_spec.gem_dir, "exe", console_executable_name)
+            end
+          end
+
+          def print_connection_banner
+            separator = "─" * 60
+            ui.success("Connected to #{app_name}. Type \"exit\" to end the session.")
+            ui.info(separator)
+          end
+
+          def print_session_end
+            separator = "─" * 60
+            ui.info(separator)
+            ui.info("Session ended.")
           end
 
           def start_console
@@ -46,7 +62,7 @@ module NeetoDeploy
             console_access_token = @response.parsed_response["console_access_token"]
             pod_name = "#{app_name}-#{@pubsub_token}-console-deployment"
             container_name = "#{app_name}-#{@pubsub_token}-console"
-            system("#{console_executable_path} -podname #{pod_name} -token #{console_access_token} -container #{container_name}")
+            system(console_executable_path, "-podname", pod_name, "-token", console_access_token, "-container", container_name, err: File::NULL)
           end
 
           def send_console_session_request
@@ -56,11 +72,12 @@ module NeetoDeploy
 
           def connection_cleanup_callback
             url = "#{console_session_base_url}/#{app_name}"
-            send_delete_request(url, { pubsub_token: @pubsub_token })
+            response = send_delete_request(url, { pubsub_token: @pubsub_token })
+            ui.error("Warning: failed to clean up session — #{response["error"] || response.message}") unless response.success?
           end
 
           def start_spinner
-            @spinner = TTY::Spinner.new("Setting up dyno [:spinner]", format: :classic)
+            @spinner = TTY::Spinner.new("Setting up console for #{app_name} [:spinner]", format: :classic)
             @spinner.auto_spin
           end
 

data/lib/neeto_deploy/cli/login/base.rb

@@ -53,13 +53,15 @@ module NeetoDeploy
 
           def wait_until_user_authenticates!
             two_minutes_later = Time.now.utc + 120
-            loop_running = true
-            while loop_running
-              loop_running = false if check_if_user_authenticated
-              loop_running = false if Time.now.utc >= two_minutes_later
+            authenticated = false
+            while Time.now.utc < two_minutes_later
+              if check_if_user_authenticated
+                authenticated = true
+                break
+              end
               sleep LOGIN_STATUS_CHECK_INTERVAL_SECONDS
             end
-            ui.say("Logged in successfully")
+            authenticated ? ui.success("Logged in successfully") : ui.error("Login timed out. Please try again.")
           end
 
           def check_if_user_authenticated

data/lib/neeto_deploy/cli/logs/base.rb

@@ -3,8 +3,6 @@
 require "thor"
 require "colorize"
 
-require "aws-sdk-cloudwatchlogs"
-require "aws-sdk-cognitoidentity"
 require_relative "../session"
 require_relative "./constants"
 
@@ -15,86 +13,97 @@ module NeetoDeploy
         include Constants
         include Session
 
+        POLL_INTERVAL_SECONDS = 2
+        INITIAL_LIMIT = 100
+        POLL_LIMIT = 1000
+
         attr_reader :app_slug, :process_type
 
         def initialize(app_slug, process_type = nil)
           super()
           @app_slug = app_slug
           @process_type = process_type
-          @log_client = nil
+          @last_timestamp_ms = nil
         end
 
         def process!
           start_spinner
-          response = authenticate_user
-          return unless response.success?
+          response = fetch_logs
+          @spinner.stop
+
+          unless response.success?
+            ui.error(response["error"] || response.message)
+            return
+          end
+
+          data = JSON.parse(response.body)
+
+          unless data["configured"]
+            ui.error("Logs are not configured for this app.")
+            return
+          end
 
-          log_params = JSON[response.body]
-          @log_client = cloud_watch_client(log_params)
-          start_log_streaming(log_params)
+          # Initial batch returned DESC — reverse for chronological display
+          logs = data["logs"].reverse
+          logs.each { |log| print_log(log) }
+          # Subtract 10s buffer to account for potential client/server clock skew
+          @last_timestamp_ms = logs.any? ? logs.last["timestamp"] : ((Time.now.to_f - 10) * 1000).to_i
+
+          poll_for_logs
         end
 
         private
 
-          def authenticate_user
-            response = send_post_request(authenticate_live_stream_url, { app_slug:, process_type: })
-            @spinner.stop && ui.error(response) unless response.success?
-            response
-          end
+          def fetch_logs(after_timestamp_ms: nil)
+            params = { app_slug:, process_type:, limit: INITIAL_LIMIT }
 
-          def cloud_watch_client(log_params)
-            cognito = Aws::CognitoIdentity::Client.new(region: log_params["region"])
-            identity_id = cognito.get_id(identity_pool_id: log_params["identity_pool_id"]).identity_id
-            credentials = cognito.get_credentials_for_identity(identity_id:).credentials
-
-            Aws::CloudWatchLogs::Client.new(
-              region: log_params["region"],
-              access_key_id: credentials.access_key_id,
-              secret_access_key: credentials.secret_key,
-              session_token: credentials.session_token
-            )
-          end
+            if after_timestamp_ms
+              params[:after_timestamp] = ms_to_iso8601(after_timestamp_ms)
+              params[:limit] = POLL_LIMIT
+            end
 
-          def start_spinner
-            @spinner = TTY::Spinner.new("Starting live stream session [:spinner]", format: :classic)
-            @spinner.auto_spin
+            send_get_request(logs_v2_url, params)
           end
 
-          def start_log_streaming(log_params)
-            next_token = nil
-            @spinner.stop
+          def poll_for_logs
             loop do
-              begin
-                params = {
-                  log_group_name: log_params["log_group_name"],
-                  log_stream_name: log_params["log_stream_name"],
-                  start_from_head: !next_token.nil?,
-                  limit: next_token.nil? ? 100 : 1000
-                }
-
-                params[:next_token] = next_token unless next_token.nil?
-                response = @log_client.get_log_events(params)
-
-                response.events.each do |event|
-                 puts "\e[35m#{Time.at(event.timestamp / 1000)}\e[0m #{event.message}"
-                end
-
-                if next_token == response.next_forward_token
-                  sleep 3
-                else
-                  next_token = response.next_forward_token
-                end
-              rescue Aws::CloudWatchLogs::Errors::ExpiredTokenException,
-Aws::CloudWatchLogs::Errors::UnrecognizedClientException => e
-                warn "Stream time limit has been reached"
-                exit 1
-              rescue => e
+              response = fetch_logs(after_timestamp_ms: @last_timestamp_ms)
+
+              if response.success?
+                data = JSON.parse(response.body)
+                logs = data["logs"]
+                logs.each { |log| print_log(log) }
+                @last_timestamp_ms = logs.last["timestamp"] if logs.any?
+                next if data["has_more_forward"]
+              elsif response.code.between?(400, 499)
+                ui.error("Error #{response.code}: #{response["error"] || response.message}")
+                break
+              else
                 warn "Connection lost. Reconnecting..."
-                sleep 5
               end
-              sleep 2
+
+              sleep POLL_INTERVAL_SECONDS
+            rescue Interrupt
+              raise
+            rescue => e
+              warn "Error: #{e.message}. Reconnecting..."
+              sleep 5
             end
           end
+
+          def print_log(log)
+            timestamp = Time.at(log["timestamp"] / 1000.0)
+            puts "#{timestamp.to_s.colorize(:magenta)} #{log["message"]}"
+          end
+
+          def ms_to_iso8601(ms)
+            Time.at(ms / 1000.0).utc.iso8601(3)
+          end
+
+          def start_spinner
+            @spinner = TTY::Spinner.new("Starting live stream session [:spinner]", format: :classic)
+            @spinner.auto_spin
+          end
       end
     end
   end

data/lib/neeto_deploy/cli/logs/constants.rb

@@ -4,10 +4,11 @@ module NeetoDeploy
   class CLI
     module Logs
       module Constants
-        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/logs".freeze
+        NEETO_DEPLOY_CLI_V2_API_BASE_URL = "#{NEETO_DEPLOY_HOST}/api/cli/v2".freeze
+        NEETO_DEPLOY_CLI_API_V2_LOGS_URL = "#{NEETO_DEPLOY_CLI_V2_API_BASE_URL}/logs".freeze
 
-        def authenticate_live_stream_url
-          NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL
+        def logs_v2_url
+          NEETO_DEPLOY_CLI_API_V2_LOGS_URL
         end
       end
     end

data/lib/neeto_deploy/cli/redis/get.rb

@@ -38,7 +38,7 @@ module NeetoDeploy
           end
 
           def print_output
-            ui.error(@response["error"]) and return unless @response.success?
+            ui.error(@response["error"] || @response.message) and return unless @response.success?
 
             ui.success(@response["message"])
           end

data/lib/neeto_deploy/cli/redis/reset_stats.rb

@@ -26,11 +26,11 @@ module NeetoDeploy
                 command: "CONFIG RESETSTAT"
               }
             )
-            ui.error(response["error"]) and return unless response.success?
+            ui.error(response["error"] || response.message) and return unless response.success?
 
             ui.success("Stats reset successful.")
           else
-            puts "Reset cancelled."
+            ui.info("Reset cancelled.")
           end
         end
       end

data/lib/neeto_deploy/cli/redis/set.rb

@@ -23,7 +23,7 @@ module NeetoDeploy
 
         def run
           unless valid_config?
-            ui.error("Could not set cofig \"#{key}\". Please refer manageable redis configs: #{AVAILABLE_REDIS_CONFIGS_TO_EDIT}")
+            ui.error("Could not set config \"#{key}\". Manageable Redis configs: #{AVAILABLE_REDIS_CONFIGS_TO_EDIT.join(", ")}")
             return
           end
 
@@ -49,7 +49,7 @@ module NeetoDeploy
           end
 
           def print_output
-            ui.error(@response["error"]) and return unless @response.success?
+            ui.error(@response["error"] || @response.message) and return unless @response.success?
 
             ui.success("#{key} config for #{addon_name} set to #{value}")
           end

data/lib/neeto_deploy/cli/session.rb

@@ -19,19 +19,19 @@ module NeetoDeploy
       end
 
       def send_get_request(url, body)
-        HTTParty.get(url, headers:, body:, format: :json)
+        HTTParty.get(url, { body: common_body.merge(body), format: :json })
       end
 
       def send_post_request(url, body)
-        HTTParty.post(url, headers:, body:, format: :json)
+        HTTParty.post(url, { body: common_body.merge(body), format: :json })
       end
 
       def send_patch_request(url, body)
-        HTTParty.patch(url, headers:, body:, format: :json)
+        HTTParty.patch(url, { body: common_body.merge(body), format: :json })
       end
 
       def send_delete_request(url, body)
-        HTTParty.delete(url, headers:, body:, format: :json)
+        HTTParty.delete(url, { body: common_body.merge(body), format: :json })
       end
 
       def common_body
@@ -41,16 +41,6 @@ module NeetoDeploy
         raise Error.new("Unable to retrieve session info. Try logging in again.")
       end
 
-      def session_token
-        JSON.parse(File.read(CLI_SESSION_STORE_FILE_PATH))["session_token"]
-      rescue
-        raise Error.new("Unable to retrieve session token. Try logging in again.")
-      end
-
-      def headers
-        { "Session-Token" => session_token }
-      end
-
       def os
         @os ||= (
           host_os = RbConfig::CONFIG["host_os"]
@@ -60,7 +50,7 @@ module NeetoDeploy
           when /linux/
             :linux
           else
-            raise Error::WebDriverError, "unsupported os: #{host_os.inspect}"
+            raise Error, "unsupported os: #{host_os.inspect}"
           end
         )
       end

data/lib/neeto_deploy/cli.rb

@@ -18,6 +18,13 @@ module NeetoDeploy
     require_relative "cli/autoscaling_config/commands"
     require_relative "cli/certificates/commands"
 
+    # Define exit behavior for Thor 1.5.0+
+    # Set to false to maintain current behavior (exit with status 0)
+    # Set to true if you want to exit with status 1 on failures
+    def self.exit_on_failure?
+      false
+    end
+
     def self.start(*)
       super
     end
@@ -38,7 +45,7 @@ module NeetoDeploy
 
     desc "logs", "Show logs"
     option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
-    option :process_type, type: :string, aliases: "-p", required: true, desc: "Process type"
+    option :process_type, type: :string, aliases: "-p", desc: "Process type (optional)"
     def logs
       CLI::Logs::Base.new(options[:app], options[:process_type]).process!
     end

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.1.23"
+  VERSION = "1.1.25"
   CLI_API_VERSION = "v1"
 end

data/neetodeploy.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
     end
   end
   spec.bindir = "exe"
-  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }.reject { |f| f.match?(/console-linux-(amd64|arm64)$/) }
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   # Must have deps
@@ -34,13 +34,17 @@ Gem::Specification.new do |spec|
   spec.add_dependency "httparty", "~> 0.21.0" # for http requests
   spec.add_dependency "launchy", "~> 2.5.0" # for opening in browser
   spec.add_dependency "terminal-table", "~> 3.0.2" # for building cli table
-  spec.add_dependency "thor", "~> 1.3.0" # for cli
-  spec.add_dependency "websocket-eventmachine-client", "~> 1.2"
-  spec.add_dependency "colorize", "~> 1.1"
-  spec.add_dependency "tty-spinner", "~> 0.9"
-  spec.add_dependency "aws-sdk-cloudwatchlogs", "~> 1.0"
-  spec.add_dependency "aws-sdk-cognitoidentity", "~> 1.0"
-  spec.add_dependency "rexml", "~> 3.2"
+  spec.add_dependency "thor", "~> 1.5.0" # for cli
+  spec.add_dependency "websocket-eventmachine-client"
+  spec.add_dependency "colorize"
+  spec.add_dependency "tty-spinner"
+  spec.add_dependency "rexml"
+  # Gems removed from Ruby stdlib in 3.4/4.0, required by our dependencies
+  spec.add_dependency "base64"
+  spec.add_dependency "bigdecimal"
+  spec.add_dependency "csv"
+  spec.add_dependency "logger"
+  spec.add_dependency "ostruct"
 
   # To add the files from submodules
   `git submodule --quiet foreach pwd`.split($\).each do |submodule_path|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.23
+  version: 1.1.25
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-12 00:00:00.000000000 Z
+date: 2026-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -72,103 +72,146 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tty-spinner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-cloudwatchlogs
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-cognitoidentity
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rexml
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 description: Manage neetoDeploy apps with CLI
 email:
 - subin.siby@bigbinary.com
 executables:
-- console
+- console-linux-amd64
+- console-linux-arm64
 - neetodeploy
 extensions: []
 extra_rdoc_files: []
@@ -176,7 +219,6 @@ files:
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
-- exe/console
 - exe/console-linux-amd64
 - exe/console-linux-arm64
 - exe/neetodeploy
@@ -187,9 +229,11 @@ files:
 - lib/neeto_deploy/cli/addon/info.rb
 - lib/neeto_deploy/cli/addon/scheduled_exports_settings.rb
 - lib/neeto_deploy/cli/autoscaling_config/commands.rb
+- lib/neeto_deploy/cli/autoscaling_config/constants.rb
 - lib/neeto_deploy/cli/autoscaling_config/list.rb
 - lib/neeto_deploy/cli/base.rb
 - lib/neeto_deploy/cli/certificates/commands.rb
+- lib/neeto_deploy/cli/certificates/constants.rb
 - lib/neeto_deploy/cli/certificates/list.rb
 - lib/neeto_deploy/cli/dyno_console_manager.rb
 - lib/neeto_deploy/cli/env/commands.rb
@@ -239,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: CLI for neetoDeploy