neetodeploy 1.1.6 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7758b6320f1b7a4e6ca6245794c802800ade04945bfa1396ea027a67629a02ec
-  data.tar.gz: 95f3f1b502eaf798d0dfc00d79db4f4b5e2badc5c015043c2e65b0525f56486b
+  metadata.gz: 1a80b1dc99cd84c07a2d0892accedceae3492a5ec4e5f8291854649634737d45
+  data.tar.gz: 93ac86192e895e77d8d5a39e406d006da45de22e2ff0cc06f51906c0442632b8
 SHA512:
-  metadata.gz: 4654d5e1e23becddf4b9726aaed9619100933d81a06a495f119ef51c63a4466bd4cf371d77706cd58fd15e07cc9930c7ae3b1e05e0c5110a11e3f8969ea61f19
-  data.tar.gz: 06bff1ef5ad906b62f0d26dcb59170f8d1569476cb3e9a09321813c94cf02d319eb722327049163f64e654fa295637f33798550627d7b518d2a17b3eada1495a
+  metadata.gz: 353eea681bf9353635f4d1951eb11622854618ae43f4e0d26c3acb5ca49f5104320ac8f7c05722460af7b67eb0cb2170628f8cf3c13bef0fc2907672af1e58f9
+  data.tar.gz: 56c6c9ed6a00b6d1e1ef6071b511e4bf630652a12fca0cf6e300f905c99335e7a14dbedcf5e04193b5bd994248a31dbe72b8b69983a27b81a2b97d256de6b3e1

data/Gemfile.lock

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

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

@@ -11,7 +11,7 @@ require_relative "../dyno_console_manager"
 module NeetoDeploy
   class CLI
     module Exec
-      class Base < CLI::DynoConsoleManager
+      class Base < CLI::Base
         include Constants
         include Session
 
@@ -20,31 +20,51 @@ module NeetoDeploy
         def initialize(app_name)
           super()
           @app_name = app_name
-          @instance_name = app_name
-          @connection_established = false
         end
 
         def process!
-          run_console
+          start_spinner
+          send_console_session_request
+          ui.error("\n#{@response.body}") and return unless @response.success?
+
+
+          buffer_wait_block
+          start_console
+          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")
+          end
+
+          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
+
           def send_console_session_request
             @response = send_post_request(console_session_base_url, { app_slug: @app_name })
           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"
+          def connection_cleanup_callback
+            url = "#{console_session_base_url}/#{app_name}"
+            send_delete_request(url, { pubsub_token: @pubsub_token })
+          end
 
-            @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"
+          def start_spinner
+            @spinner = TTY::Spinner.new("[:spinner] Connecting to #{app_name}", format: :classic)
+            @spinner.auto_spin
           end
 
-          def connection_cleanup
-            url = "#{console_session_base_url}/#{@console_token}"
-            send_delete_request(url, { app_slug: app_name })
+          def buffer_wait_block
+            sleep 5
+            @spinner.stop
           end
       end
     end

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

@@ -6,12 +6,12 @@ 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"
+        # 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
+        # def cli
+        #   Console.new(options).run
+        # end
       end
     end
   end

data/lib/neeto_deploy/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module NeetoDeploy
-  VERSION = "1.1.6"
+  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.6
+  version: 1.1.7
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-01 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,6 +134,7 @@ files:
 - ".ruby-version"
 - Gemfile
 - Gemfile.lock
+- exe/console
 - exe/neetodeploy
 - lib/neeto_deploy.rb
 - lib/neeto_deploy/cli.rb