neetodeploy 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 852a444976eabbc736b6ab65c2e93c980fa32281f80d0b99f870ca3c7300ffbb
-  data.tar.gz: 5cb3f42d7f20af3186a77aef7d2c8d8bf4f0e80cebda965180dbeab17b2a7139
+  metadata.gz: 305d6867816ecbca9f4c86d447117ff8fefebac877e6177000cf29f338c2b11b
+  data.tar.gz: 97243a423a38b634cb30289dfaf93ca71cb7bc96e9d83e3c9c57e16a54814f64
 SHA512:
-  metadata.gz: 651e70c339bb1d36aa29d967357e13e34e1511e6af1b60e50ca6761c988bccbb31b2093589e980cd5bad3837ec842e7da61dbba5d403cf962135e4bdfef05ed4
-  data.tar.gz: 2c2864829f60f732e64a59fcc406cb6f6a9cbef01866c7af2a101f2f1747526a126a042034054f7099bd53a0cfc6e2740b9970e5746e6a391bdf4f5757a844dc
+  metadata.gz: de103bbd5f402dd3903b49f85008299652b7680b7a7a1e0fc8835dc3804cd91a7e204915183497fa020a9eedd7fbae20590af4c833c58e7327e276bf473c4770
+  data.tar.gz: 7f13ee1a14bc878f0c8e718d2fa045b3ceea1f44614e78ffbcfad9cdf6fbdeca38793ef2629f33950ceb9e30f2aeb0b226987fbc6e649498bfcda841ac00fa58

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.3)
+    neetodeploy (1.1.5)
+      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
@@ -15,6 +17,7 @@ GEM
     addressable (2.8.1)
       public_suffix (>= 2.0.2, < 6.0)
     byebug (11.1.3)
+    colorize (1.1.0)
     dotenv (2.8.1)
     event_emitter (0.2.6)
     httparty (0.21.0)
@@ -28,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,18 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "./info"
+
+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
+      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/exec/base.rb

@@ -33,8 +33,10 @@ module NeetoDeploy
           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"
 
-          ws = WebSocket::Client::Simple.connect "wss://neeto-deploy-lc.neetodeployapp.com/cli_console?deployment_name=#{app_name}&console_token=#{console_token}"
+          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 = ''
 

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

@@ -1,45 +1,89 @@
 # frozen_string_literal: true
+
 require "websocket-client-simple"
 require "thor"
+require "colorize"
+
+require_relative "../session"
+require_relative "./constants"
 
 module NeetoDeploy
   class CLI
     module Logs
       class Base < CLI::Base
+        include Constants
+        include Session
+
         attr_reader :app_name, :process_type
 
         def initialize(app_name, process_type = nil)
+          super()
           @app_name = app_name
           @process_type = process_type
         end
 
         def process!
-          ws = WebSocket::Client::Simple.connect "wss://loki-gateway.neetodeployapp.com/loki/api/v1/tail?query={container=~\".*#{app_name}.*\"}&start=#{(Time.now - 300).to_i}"
+          stream_logs
+        end
 
-          ws.on :message do |msg|
-            begin
-              data = JSON.parse(msg.data)
-              puts data["streams"].map { |stream| stream["values"][0][1] }
-            rescue JSON::ParserError => e
-            end
-          end
+        private
 
-          ws.on :open do
+          def uri
+            "wss://connect.neetodeploy.com/cable"
           end
 
-          ws.on :close do |e|
-            p e
-            exit 1
+          def ensure_app_access?
+            response = send_get_request(app_verify_access_url, { app_slug: app_name })
+            @ui.error(JSON[response.body]["error"]) unless response.success?
+            response.success?
           end
 
-          ws.on :error do |e|
-            p e
-            exit 1
-          end
+          def stream_logs
+            ws_connection = WebSocket::Client::Simple.connect(uri)
+            session_token = common_body[:session_token]
+            app_slug = @app_name
+            process_type = @process_type
+            pubsub_token = SecureRandom.hex(16)
+
+            ws_connection.on :open do
+              payload = {
+                command: "subscribe",
+                identifier: {
+                  channel: "Cli::LogChannel", app_slug:, pubsub_token:, process_type:,
+                  session_token:
+                }.to_json
+              }
+              ws_connection.send(payload.to_json)
+            end
+
+            ws_connection.on :message do |msg|
+              unless msg.data.empty?
+                parsed_msg = JSON.parse(msg.data)
+                if parsed_msg["type"].nil?
+                  parsed_msg["message"]&.each do |log|
+                    STDOUT.write "#{Time.at(log[0].to_i / 1e9).to_s.light_magenta} #{log[1]}\n"
+                  end
+                elsif parsed_msg["type"] == "disconnect"
+                  puts parsed_msg["error"].red
+                  exit
+                end
+              end
+            end
+
+            ws_connection.on :close do |e|
+              p e unless e.nil?
+              exit 1
+            end
+
+            ws_connection.on :error do |e|
+              p e
+              puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
+              $@.each { |backtrace| puts backtrace }
+              exit 1
+            end
 
-          loop do
+            loop do end
           end
-        end
       end
     end
   end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Logs
+      module Constants
+        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/apps/access".freeze
+
+        def app_verify_access_url
+          NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL
+        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,7 @@ module NeetoDeploy
     require_relative "cli/logs/base"
     require_relative "cli/env/commands"
     require_relative "cli/redis/commands"
+    require_relative "cli/addon/commands"
 
     def self.start(*)
       super
@@ -33,12 +35,15 @@ module NeetoDeploy
 
     desc "logs", "Show logs"
     option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
-    option :process_type, type: :string, aliases: "-p", desc: "Process type"
+    option :process_type, type: :string, aliases: "-p", required: true, desc: "Process type"
     def logs
       CLI::Logs::Base.new(options[:app], options[:process_type]).process!
     end
 
     desc "redis", "Manage redis addons"
     subcommand "redis", Redis::Commands
+
+    desc "addon", "Manage addons"
+    subcommand "addon", Addon::Commands
   end
 end

data/lib/neeto_deploy/version.rb

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

data/neetodeploy.gemspec

@@ -36,6 +36,8 @@ Gem::Specification.new do |spec|
   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-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.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-29 00:00:00.000000000 Z
+date: 2024-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  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: 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
@@ -108,6 +136,9 @@ 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/base.rb
 - lib/neeto_deploy/cli/env/commands.rb
 - lib/neeto_deploy/cli/env/constants.rb
@@ -119,9 +150,11 @@ files:
 - lib/neeto_deploy/cli/login/base.rb
 - 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/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