neetodeploy 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 305d6867816ecbca9f4c86d447117ff8fefebac877e6177000cf29f338c2b11b
-  data.tar.gz: 97243a423a38b634cb30289dfaf93ca71cb7bc96e9d83e3c9c57e16a54814f64
+  metadata.gz: 1a80b1dc99cd84c07a2d0892accedceae3492a5ec4e5f8291854649634737d45
+  data.tar.gz: 93ac86192e895e77d8d5a39e406d006da45de22e2ff0cc06f51906c0442632b8
 SHA512:
-  metadata.gz: de103bbd5f402dd3903b49f85008299652b7680b7a7a1e0fc8835dc3804cd91a7e204915183497fa020a9eedd7fbae20590af4c833c58e7327e276bf473c4770
-  data.tar.gz: 7f13ee1a14bc878f0c8e718d2fa045b3ceea1f44614e78ffbcfad9cdf6fbdeca38793ef2629f33950ceb9e30f2aeb0b226987fbc6e649498bfcda841ac00fa58
+  metadata.gz: 353eea681bf9353635f4d1951eb11622854618ae43f4e0d26c3acb5ca49f5104320ac8f7c05722460af7b67eb0cb2170628f8cf3c13bef0fc2907672af1e58f9
+  data.tar.gz: 56c6c9ed6a00b6d1e1ef6071b511e4bf630652a12fca0cf6e300f905c99335e7a14dbedcf5e04193b5bd994248a31dbe72b8b69983a27b81a2b97d256de6b3e1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.5)
+    neetodeploy (1.1.7)
       colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)

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

@@ -2,6 +2,7 @@
 
 require "thor"
 require_relative "./info"
+require_relative "./scheduled_exports_settings"
 
 module NeetoDeploy
   class CLI
@@ -12,6 +13,12 @@ module NeetoDeploy
         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

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/env/commands.rb

@@ -12,6 +12,7 @@ module NeetoDeploy
       class Commands < Thor
         desc "list", "List all environment variable"
         option :app, type: :string, aliases: "-a", required: true, desc: "App slug" # TODO make this a common static function
+        option :json, type: :boolean, aliases: "-j", desc: "Output config vars in json format"
         def list
           List.new(options:).run
         end

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

@@ -13,11 +13,12 @@ module NeetoDeploy
         include Constants
         include Session
 
-        attr_reader :app_slug
+        attr_reader :app_slug, :is_json_format
 
         def initialize(options:)
           super()
           @app_slug = options[:app]
+          @is_json_format = options[:json]
         end
 
         def run
@@ -29,8 +30,8 @@ module NeetoDeploy
 
           ui.error(response) and return unless response.success?
 
-          table = Terminal::Table.new(headings: table_columns, rows: table_rows(response["environment_variables"]))
-          ui.success(table)
+          data = is_json_format ? json_data(response["environment_variables"]) : table_data(response["environment_variables"])
+          ui.success(data)
         end
 
         private
@@ -44,6 +45,18 @@ module NeetoDeploy
               [environment_variable["key"], environment_variable["value"].gsub("\\n", "\n")]
             end
           end
+
+          def table_data(envs)
+            Terminal::Table.new(headings: table_columns, rows: table_rows(envs))
+          end
+
+          def json_data(envs)
+            resulting_hash = envs.each_with_object({}) do |item, hash|
+              hash[item["key"]] = item["value"]
+            end
+            JSON.pretty_generate(resulting_hash)
+          end
+
       end
     end
   end

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

@@ -1,10 +1,12 @@
 # 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
@@ -21,74 +23,49 @@ module NeetoDeploy
         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"]
-          pubsub_token = response.parsed_response["console_pubsub_token"]
-          deployment_name = "#{app_name}-#{pubsub_token}-console-deployment"
+          start_spinner
+          send_console_session_request
+          ui.error("\n#{@response.body}") and return unless @response.success?
 
-          ws = WebSocket::Client::Simple.connect "wss://neeto-deploy-lc.neetodeployapp.com/cli_console?app_name=#{app_name}&deployment_name=#{deployment_name}&console_token=#{console_token}"
 
-          prompt = ''
+          buffer_wait_block
+          start_console
+          connection_cleanup_callback
+        end
 
-          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
+        private
 
-          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
+          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")
           end
 
-          ws.on :open do
+          def start_console
+            @pubsub_token = @response.parsed_response["console_pubsub_token"]
+            console_access_token = @response.parsed_response["console_access_token"]
+            pod_name = "#{app_name}-#{@pubsub_token}-console-deployment"
+            system("#{console_executable_path} #{pod_name} #{console_access_token}")
           end
 
-          ws.on :close do |e|
-            puts e
-            exit 1
+          def send_console_session_request
+            @response = send_post_request(console_session_base_url, { app_slug: @app_name })
           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
+          def connection_cleanup_callback
+            url = "#{console_session_base_url}/#{app_name}"
+            send_delete_request(url, { pubsub_token: @pubsub_token })
           end
 
-          trap("SIGINT") do
-            Thread.new {  ws.send "4" }
+          def start_spinner
+            @spinner = TTY::Spinner.new("[:spinner] Connecting to #{app_name}", format: :classic)
+            @spinner.auto_spin
           end
 
-          loop do
-            sleep 0.1
-            input = Readline.readline(prompt, true)
-            ws.send "1" + input
+          def buffer_wait_block
+            sleep 5
+            @spinner.stop
           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.rb

@@ -13,7 +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
@@ -43,7 +45,13 @@ 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.5"
+  VERSION = "1.1.7"
   CLI_API_VERSION = "v1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-05-16 00:00:00.000000000 Z
+date: 2024-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -126,6 +126,7 @@ description: Manage neetoDeploy apps with CLI
 email:
 - subin.siby@bigbinary.com
 executables:
+- console
 - neetodeploy
 extensions: []
 extra_rdoc_files: []
@@ -133,13 +134,18 @@ files:
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
+- exe/console
 - 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
@@ -151,6 +157,9 @@ 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