neetodeploy 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19af255afa80f69e3d6e3587f8917788e866cef5b296525c641415e9285d8720
-  data.tar.gz: d851f2610614e2f0f7d3054e72d70b770bb8deb3896fe3c70eafd9ebe70efe22
+  metadata.gz: 7758b6320f1b7a4e6ca6245794c802800ade04945bfa1396ea027a67629a02ec
+  data.tar.gz: 95f3f1b502eaf798d0dfc00d79db4f4b5e2badc5c015043c2e65b0525f56486b
 SHA512:
-  metadata.gz: 40566c170d6f756b33446a237a670532188b5f32eac9cd8ee738b531793e9218e187efe091ec677b8730c68cc2e1ee27511e453cd5503dee7ee2f76f172fb554
-  data.tar.gz: efe2823e4c1aa55006f7284f69547e6292e378886bce2fd0ef214fbca559d185240dfd36ff498267c98698bd78fa055965359d05d26553187620c0c7d38c61b9
+  metadata.gz: 4654d5e1e23becddf4b9726aaed9619100933d81a06a495f119ef51c63a4466bd4cf371d77706cd58fd15e07cc9930c7ae3b1e05e0c5110a11e3f8969ea61f19
+  data.tar.gz: 06bff1ef5ad906b62f0d26dcb59170f8d1569476cb3e9a09321813c94cf02d319eb722327049163f64e654fa295637f33798550627d7b518d2a17b3eada1495a

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.4)
+    neetodeploy (1.1.6)
       colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)
       terminal-table (~> 3.0.2)
       thor (~> 1.3.0)
+      tty-spinner
       websocket-client-simple
 
 GEM
@@ -30,6 +31,9 @@ GEM
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.0)
+    tty-cursor (0.7.1)
+    tty-spinner (0.9.3)
+      tty-cursor (~> 0.7)
     unicode-display_width (2.4.2)
     websocket (1.2.9)
     websocket-client-simple (0.6.1)

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "./info"
+require_relative "./scheduled_exports_settings"
+
+module NeetoDeploy
+  class CLI
+    module Addon
+      class Commands < Thor
+        desc "info", "Get addon informations"
+        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def info
+          Info.new(options).run
+        end
+
+        desc "scheduled_exports_enabled", "Check whether scheduled exports is enabled for an app"
+        option :app_name, type: :string, aliases: "-a", required: true, desc: "App name"
+        def scheduled_exports_enabled
+          ScheduledExportsSettings.new(options).run
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Addon
+      module Constants
+        NEETO_DEPLOY_CLI_API_ADDON_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons".freeze
+
+        def addon_url(addon_name)
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/#{addon_name}"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+require "thor"
+
+require_relative "../session"
+require_relative "./constants"
+
+module NeetoDeploy
+  class CLI
+    module Addon
+      class Info < CLI::Base
+        include Constants
+        include Session
+
+        attr_reader :addon_name
+
+        def initialize(options)
+          super()
+          @addon_name = options[:addon_name]
+        end
+
+        def run
+          ui.execute_with_loading("Fetching info...") do
+            send_request
+          end
+          print_output
+        end
+
+        private
+
+          def flatten_hash_from(hash)
+            hash.each_with_object({}) do |(key, value), memo|
+              next flatten_hash_from(value).each do |k, v|
+                memo["#{k}".intern] = v
+              end if value.is_a? Hash
+              memo[key] = value
+            end
+          end
+
+          def send_request
+            @response = send_get_request(addon_url(addon_name), {})
+          end
+
+          def print_output
+            ui.error(@response["error"]) and return unless @response.success?
+
+            flatten_hash_from(JSON[@response.body]).each do |k, v|
+              ui.info("#{k}: #{v}")
+            end
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "thor"
+
+require_relative "../session"
+require_relative "./constants"
+
+module NeetoDeploy
+  class CLI
+    module Addon
+      class ScheduledExportsSettings < CLI::Base
+        include Constants
+        include Session
+
+        attr_reader :app_name
+
+        def initialize(options)
+          super()
+          @app_name = options[:app_name]
+        end
+
+        def run
+          ui.execute_with_loading("Fetching info...") do
+            send_request
+          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?
+
+            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")
+            else
+              ui.info("Scheduled exports is turned #{scheduled_exports ? "\u001b[32mon\u001b[0m" : "\u001b[31moff\u001b[0m"} for #{app_name}'s primary database")
+            end
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "thor"
+
+require_relative "./list"
+
+module NeetoDeploy
+  class CLI
+    module AutoscalingConfig
+      class Commands < Thor
+        desc "list", "List autoscaling configs of an app"
+        option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
+        def list
+          List.new(options:).run
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module NeetoDeploy
+  class CLI
+    module AutoscalingConfig
+      class List < CLI::Base
+        include Session
+
+        attr_reader :app_slug
+
+        def initialize(options:)
+          super()
+          @app_slug = options[:app]
+        end
+
+        def run
+          response = send_get_request(
+            "#{NEETO_DEPLOY_CLI_API_BASE_URL}/autoscaling_configs/#{app_slug}", {
+              app_slug:
+            }
+          )
+
+          ui.error(response) and return unless response.success?
+
+          ui.success(JSON.parse(response.body)["autoscaling_status"])
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/base.rb

@@ -4,7 +4,7 @@ require_relative "ui"
 require_relative "../version"
 
 module NeetoDeploy
-  class CLI
+  class CLI 
     NEETO_DEPLOY_HOST = ENV["NEETO_DEPLOY_HOST"] || "https://app.neetodeploy.com"
     NEETO_DEPLOY_CLI_API_BASE_URL = "#{NEETO_DEPLOY_HOST}/api/cli/#{CLI_API_VERSION}"
 

data/lib/neeto_deploy/cli/dyno_console_manager.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "thor"
+
+module NeetoDeploy
+  class CLI
+    class DynoConsoleManager < Base
+      DYNO_CONSOLE_MANAGER_URL = "wss://neeto-deploy-lc.neetodeployapp.com"
+
+      def initialize
+        super()
+        @prompt = ""
+      end
+
+      def run_console
+        start_spinner
+        send_console_session_request
+        ui.error(response) and return unless @response.success?
+
+        send_websocket_request
+        define_websocket_blocks
+      end
+
+      private
+
+        def start_spinner
+          @spinner = TTY::Spinner.new("[:spinner] Connecting to #{@instance_name}", format: :classic)
+          @spinner.auto_spin
+        end
+
+        def define_websocket_blocks
+          stop_spinner = lambda do
+            @spinner.stop unless @connection_established
+          end
+
+          cleanup = lambda do
+            connection_cleanup
+          end
+
+          @ws.on :message do |msg|
+            message = msg.data
+            if message.to_s.eql?("{\"exitCode\":0,\"signal\":0}")
+              cleanup.call
+              exit 0
+            end
+            cmd = message[0]
+            if cmd == "1"
+              extracted_message = message.delete_prefix("1")
+              stop_spinner.call && @connection_established = true unless extracted_message == ""
+              @prompt = "\u001b[2K\u001b[0G#{extracted_message.split("\r\n").last}"
+              print extracted_message
+            end
+          end
+
+          @ws.on :open do
+          end
+
+          @ws.on :close do |e|
+            puts e
+            exit 1
+          end
+
+          @ws.on :error do |e|
+            puts e
+            puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
+            $@.each { |backtrace| puts backtrace }
+            exit 1
+          end
+
+          trap("SIGINT") do
+            Thread.new { @ws.send "4" }
+          end
+
+          loop do
+            sleep 0.1
+            input = Readline.readline(@prompt, true)
+            @ws.send "1" + input
+          end
+        end
+
+        def connection_cleanup
+        end
+    end
+  end
+end

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

@@ -1,15 +1,17 @@
 # frozen_string_literal: true
+
 require "websocket-client-simple"
 require "thor"
 require "readline"
 
 require_relative "../session"
 require_relative "./constants"
+require_relative "../dyno_console_manager"
 
 module NeetoDeploy
   class CLI
     module Exec
-      class Base < CLI::Base
+      class Base < CLI::DynoConsoleManager
         include Constants
         include Session
 
@@ -18,75 +20,32 @@ module NeetoDeploy
         def initialize(app_name)
           super()
           @app_name = app_name
+          @instance_name = app_name
+          @connection_established = false
         end
 
         def process!
-          puts "Opening console for #{app_name}"
-
-          response = send_post_request(
-            console_session_base_url, {
-              # TODO refactor app_slug to app_name in dashboard app
-              app_slug: app_name,
-            }
-          )
-
-          ui.error(response) and return unless response.success?
-
-          console_token = response.parsed_response["console_token"]
-
-          ws = WebSocket::Client::Simple.connect "wss://neeto-deploy-lc.neetodeployapp.com/cli_console?deployment_name=#{app_name}&console_token=#{console_token}"
-
-          prompt = ''
-
-          delete_url = "#{console_session_base_url}/#{console_token}"
-          app_slug = app_name
-          
-          send_delete_request = lambda do |url, body|
-            send_delete_request(url, body)
-          end
+          run_console
+        end
 
-          ws.on :message do |msg|
-            message = msg.data
-            if message.to_s.eql?("{\"exitCode\":0,\"signal\":0}")
-              send_delete_request.call(
-                delete_url, {
-                  app_slug:
-                }
-              )
-              exit 0
-            end
-            cmd = message[0]
-            if cmd == "1"
-              prompt = "\u001b[2K\u001b[0G#{message.delete_prefix("1").split("\r\n").last}"
-              print message.delete_prefix("1")
-            end
-          end
+        private
 
-          ws.on :open do
+          def send_console_session_request
+            @response = send_post_request(console_session_base_url, { app_slug: @app_name })
           end
 
-          ws.on :close do |e|
-            puts e
-            exit 1
-          end
+          def send_websocket_request
+            @console_token = @response.parsed_response["console_token"]
+            pubsub_token = @response.parsed_response["console_pubsub_token"]
+            deployment_name = "#{app_name}-#{pubsub_token}-console-deployment"
 
-          ws.on :error do |e|
-            puts e
-            puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
-            $@.each { |backtrace| puts backtrace }
-            exit 1
+            @ws = WebSocket::Client::Simple.connect "#{DYNO_CONSOLE_MANAGER_URL}/cli_console?app_name=#{app_name}&deployment_name=#{deployment_name}&console_token=#{@console_token}&kind=web"
           end
 
-          trap("SIGINT") do
-            Thread.new {  ws.send "4" }
+          def connection_cleanup
+            url = "#{console_session_base_url}/#{@console_token}"
+            send_delete_request(url, { app_slug: app_name })
           end
-
-          loop do
-            sleep 0.1
-            input = Readline.readline(prompt, true)
-            ws.send "1" + input
-          end
-        end
       end
     end
   end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "./console"
+
+module NeetoDeploy
+  class CLI
+    module Pg
+      class Commands < Thor
+        desc "cli", "Connect to postgresql console"
+        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+
+        def cli
+          Console.new(options).run
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/pg/console.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "../session"
+require_relative "./constants"
+require_relative "../dyno_console_manager"
+
+module NeetoDeploy
+  class CLI
+    module Pg
+      class Console < CLI::DynoConsoleManager
+        include Constants
+        include Session
+
+        attr_reader :addon_name
+
+        def initialize(options)
+          super()
+          @addon_name = options[:addon_name]
+          @instance_name = options[:addon_name]
+          @connection_established = false
+        end
+
+        def run
+          run_console
+        end
+
+        private
+
+          def send_console_session_request
+            @response = send_post_request(console_session_base_url(addon_name), {})
+          end
+
+          def send_websocket_request
+            console_token = @response.parsed_response["console_token"]
+            database_url = @response.parsed_response["url"]
+            deployment_name = @response.parsed_response["internal_name"]
+            app_name = @response.parsed_response["app_name"]
+
+            @ws = WebSocket::Client::Simple.connect "#{DYNO_CONSOLE_MANAGER_URL}/cli_console?app_name=#{app_name}&deployment_name=#{deployment_name}&console_token=#{console_token}&database_url=#{database_url}&kind=postgres"
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Pg
+      module Constants
+        def console_session_base_url(addon_name)
+          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/#{addon_name}/console_session"
+        end
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 require "thor"
 require_relative "./set"
 require_relative "./get"
+require_relative "./reset_stats"
 
 module NeetoDeploy
   class CLI
@@ -23,6 +24,13 @@ module NeetoDeploy
         def get
           Get.new(options).run
         end
+
+        desc "reset-stats", "Resets the statistics of the Redis instance"
+        option :addon_name, type: :string, aliases: "-n", required: true, desc: "Addon name"
+        def reset_stats
+          ResetStats.new(options).run
+        end
+
       end
     end
   end

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

@@ -5,7 +5,7 @@ module NeetoDeploy
     module Redis
       module Constants
         NEETO_DEPLOY_CLI_API_ADDONS_REDIS_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/redis".freeze
-        AVAILABLE_REDIS_CONFIGS_TO_EDIT = ["maxmemory-policy"]
+        AVAILABLE_REDIS_CONFIGS_TO_EDIT = ["maxmemory-policy", "notify-keyspace-events"]
 
         def redis_addon_url
           NEETO_DEPLOY_CLI_API_ADDONS_REDIS_URL

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

@@ -20,17 +20,28 @@ module NeetoDeploy
         end
 
         def run
-          response = send_patch_request(
-            redis_addon_url, {
-              addon_name:,
-              command: "CONFIG get #{key}"
-            }
-          )
+          ui.execute_with_loading("Fetching info...") do
+            send_request
+          end
+          print_output
+        end
 
-          ui.error(response) and return unless response.success?
+        private
 
-          ui.success(response["message"])
-        end
+          def send_request
+            @response = send_patch_request(
+              redis_addon_url, {
+                addon_name:,
+                command: "CONFIG get #{key}"
+              }
+            )
+          end
+
+          def print_output
+            ui.error(@response["error"]) and return unless @response.success?
+
+            ui.success(@response["message"])
+          end
       end
     end
   end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "../session"
+require_relative "./constants"
+
+module NeetoDeploy
+  class CLI
+    module Redis
+      class ResetStats < CLI::Base
+        include Constants
+        include Session
+
+        attr_reader :addon_name
+
+        def initialize(options)
+          super()
+          @addon_name = options[:addon_name]
+        end
+
+        def run
+          if ui.yes?("Are you sure you want to reset the statistics (y/n)")
+            response = send_patch_request(
+              redis_addon_url, {
+                addon_name:,
+                command: "CONFIG RESETSTAT"
+              }
+            )
+            ui.error(response["error"]) and return unless response.success?
+
+            ui.success("Stats reset successful.")
+          else
+            puts "Reset cancelled."
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "thor"
-require "byebug"
 
 require_relative "../session"
 require_relative "./constants"
@@ -28,16 +27,10 @@ module NeetoDeploy
             return
           end
 
-          response = send_patch_request(
-            redis_addon_url, {
-              addon_name:,
-              command: "CONFIG set #{key} #{value}"
-            }
-          )
-
-          ui.error(response) and return unless response.success?
-
-          ui.success("Done")
+          ui.execute_with_loading("Setting config...") do
+            send_request
+          end
+          print_output
         end
 
         private
@@ -45,6 +38,21 @@ module NeetoDeploy
           def valid_config?
             AVAILABLE_REDIS_CONFIGS_TO_EDIT.include?(key)
           end
+
+          def send_request
+            @response = send_patch_request(
+              redis_addon_url, {
+                addon_name:,
+                command: "CONFIG set #{key} #{value}"
+              }
+            )
+          end
+
+          def print_output
+            ui.error(@response["error"]) and return unless @response.success?
+
+            ui.success("#{key} config for #{addon_name} set to #{value}")
+          end
       end
     end
   end

data/lib/neeto_deploy/cli/ui.rb

@@ -34,6 +34,13 @@ module NeetoDeploy
       def info(statement)
         shell.say(statement)
       end
+
+      def execute_with_loading(msg)
+        @spinner = TTY::Spinner.new("[:spinner] #{msg}", format: :classic)
+        @spinner.auto_spin
+        yield
+        @spinner.stop
+      end
     end
   end
 end

data/lib/neeto_deploy/cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "thor"
+require 'tty-spinner'
 
 # TODO: make this like neetob
 
@@ -12,6 +13,9 @@ module NeetoDeploy
     require_relative "cli/logs/base"
     require_relative "cli/env/commands"
     require_relative "cli/redis/commands"
+    require_relative "cli/pg/commands"
+    require_relative "cli/addon/commands"
+    require_relative "cli/autoscaling_config/commands"
 
     def self.start(*)
       super
@@ -40,5 +44,14 @@ module NeetoDeploy
 
     desc "redis", "Manage redis addons"
     subcommand "redis", Redis::Commands
+
+    desc "pg", "Manage postgresql addons"
+    subcommand "pg", Pg::Commands
+
+    desc "addon", "Manage addons"
+    subcommand "addon", Addon::Commands
+
+    desc "autoscaling_config", "Manage autoscaling"
+    subcommand "autoscaling_config", AutoscalingConfig::Commands
   end
 end

data/lib/neeto_deploy/version.rb

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

data/neetodeploy.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "thor", "~> 1.3.0" # for cli
   spec.add_dependency "websocket-client-simple"
   spec.add_dependency "colorize"
+  spec.add_dependency "tty-spinner"
 
   # 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.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-16 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tty-spinner
+  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'
 description: Manage neetoDeploy apps with CLI
 email:
 - subin.siby@bigbinary.com
@@ -122,7 +136,14 @@ files:
 - exe/neetodeploy
 - lib/neeto_deploy.rb
 - lib/neeto_deploy/cli.rb
+- lib/neeto_deploy/cli/addon/commands.rb
+- lib/neeto_deploy/cli/addon/constants.rb
+- 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/list.rb
 - lib/neeto_deploy/cli/base.rb
+- lib/neeto_deploy/cli/dyno_console_manager.rb
 - lib/neeto_deploy/cli/env/commands.rb
 - lib/neeto_deploy/cli/env/constants.rb
 - lib/neeto_deploy/cli/env/list.rb
@@ -134,9 +155,13 @@ files:
 - lib/neeto_deploy/cli/login/constants.rb
 - lib/neeto_deploy/cli/logs/base.rb
 - lib/neeto_deploy/cli/logs/constants.rb
+- lib/neeto_deploy/cli/pg/commands.rb
+- lib/neeto_deploy/cli/pg/console.rb
+- lib/neeto_deploy/cli/pg/constants.rb
 - lib/neeto_deploy/cli/redis/commands.rb
 - lib/neeto_deploy/cli/redis/constants.rb
 - lib/neeto_deploy/cli/redis/get.rb
+- lib/neeto_deploy/cli/redis/reset_stats.rb
 - lib/neeto_deploy/cli/redis/set.rb
 - lib/neeto_deploy/cli/session.rb
 - lib/neeto_deploy/cli/ui.rb