neetodeploy 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c89f6daf95ba95dadcfcbfdf897ff3b9642003da42240d53a566549ab7c80039
-  data.tar.gz: 890eb532d959f1807b315d8fde953bbbe0590bca1b13abfd3f743a77d238b768
+  metadata.gz: 19af255afa80f69e3d6e3587f8917788e866cef5b296525c641415e9285d8720
+  data.tar.gz: d851f2610614e2f0f7d3054e72d70b770bb8deb3896fe3c70eafd9ebe70efe22
 SHA512:
-  metadata.gz: c492b22e65f9e9f4eeccee4f0720346e94a42885efda1086bad9644414a216aea06dec6881b6764ed011867bb76a1132065c6fd77772e70d001c82e0950de4ac
-  data.tar.gz: ef3ca43ae3235150ca96ebbd5685ec744774ececa07bc8cf9c35f1267f641200de666f2afae80a28f291afcd214cec21979a158186de519c13ed141fdf405491
+  metadata.gz: 40566c170d6f756b33446a237a670532188b5f32eac9cd8ee738b531793e9218e187efe091ec677b8730c68cc2e1ee27511e453cd5503dee7ee2f76f172fb554
+  data.tar.gz: efe2823e4c1aa55006f7284f69547e6292e378886bce2fd0ef214fbca559d185240dfd36ff498267c98698bd78fa055965359d05d26553187620c0c7d38c61b9

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.1.1)
+    neetodeploy (1.1.4)
+      colorize
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)
       terminal-table (~> 3.0.2)
-      thor (~> 1.2.1)
+      thor (~> 1.3.0)
       websocket-client-simple
 
 GEM
@@ -15,6 +16,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)
@@ -27,7 +29,7 @@ GEM
     public_suffix (5.0.1)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    thor (1.2.1)
+    thor (1.3.0)
     unicode-display_width (2.4.2)
     websocket (1.2.9)
     websocket-client-simple (0.6.1)

data/lib/neeto_deploy/cli/{config → env}/commands.rb

@@ -8,24 +8,24 @@ require_relative "./unset"
 
 module NeetoDeploy
   class CLI
-    module Config
+    module Env
       class Commands < Thor
-        desc "list", "List all config vars"
+        desc "list", "List all environment variable"
         option :app, type: :string, aliases: "-a", required: true, desc: "App slug" # TODO make this a common static function
         def list
           List.new(options:).run
         end
 
-        desc "set CONFIG_VARS", "Set one or more config vars"
+        desc "set ENVIRONMENT_VARIABLES", "Set one or more environment variables"
         option :app, type: :string, aliases: "-a", required: true, desc: "App slug" # TODO make this a common static function
-        def set(*config_vars)
-          Set.new(config_vars, options:).run
+        def set(*environment_variables)
+          Set.new(environment_variables, options:).run
         end
 
-        desc "unset CONFIG_VARS", "Unset one or more config vars"
+        desc "unset ENVIRONMENT_VARIABLES", "Unset one or more environment variables"
         option :app, type: :string, aliases: "-a", required: true, desc: "App slug" # TODO make this a common static function
-        def unset(*config_vars)
-          Unset.new(config_vars, options:).run
+        def unset(*environment_variables)
+          Unset.new(environment_variables, options:).run
         end
       end
     end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Env
+      module Constants
+        NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/environment_variables".freeze
+
+        def environment_variables_url
+          NEETO_DEPLOY_CLI_API_ENVIRONMENT_VARIABLES_URL
+        end
+      end
+    end
+  end
+end

data/lib/neeto_deploy/cli/{config → env}/list.rb

@@ -8,7 +8,7 @@ require_relative "./constants"
 
 module NeetoDeploy
   class CLI
-    module Config
+    module Env
       class List < CLI::Base
         include Constants
         include Session
@@ -22,14 +22,14 @@ module NeetoDeploy
 
         def run
           response = send_get_request(
-            config_vars_url, {
+            environment_variables_url, {
               app_slug:
             }
           )
 
           ui.error(response) and return unless response.success?
 
-          table = Terminal::Table.new(headings: table_columns, rows: table_rows(response["config_vars"]))
+          table = Terminal::Table.new(headings: table_columns, rows: table_rows(response["environment_variables"]))
           ui.success(table)
         end
 
@@ -39,9 +39,9 @@ module NeetoDeploy
             ["Key", "Value"]
           end
 
-          def table_rows(config_vars)
-            config_vars.map do |config_var|
-              [config_var["key"], config_var["value"].gsub("\\n", "\n")]
+          def table_rows(environment_variables)
+            environment_variables.map do |environment_variable|
+              [environment_variable["key"], environment_variable["value"].gsub("\\n", "\n")]
             end
           end
       end

data/lib/neeto_deploy/cli/{config → env}/set.rb

@@ -8,18 +8,18 @@ require_relative "./constants"
 
 module NeetoDeploy
   class CLI
-    module Config
+    module Env
       class Set < CLI::Base
         include Constants
         include Session
 
-        attr_reader :app_slug, :config_vars
+        attr_reader :app_slug, :environment_variables
 
-        def initialize(config_vars_string_array, options:)
+        def initialize(environment_variables_string_array, options:)
           super()
           @app_slug = options[:app]
-          @config_vars = config_vars_string_array.map do |config_var|
-            key, value = config_var.split("=")
+          @environment_variables = environment_variables_string_array.map do |environment_variable|
+            key, value = environment_variable.split("=")
             { key:, value: }
           end
         end
@@ -27,18 +27,18 @@ module NeetoDeploy
         def run
           table = Terminal::Table.new(
             headings: table_columns,
-            rows: config_vars.map { |config_var|
-              [config_var[:key], config_var[:value]]
+            rows: environment_variables.map { |environment_variable|
+              [environment_variable[:key], environment_variable[:value]]
             }
           )
           ui.info(table)
 
-          ui.info("Setting config vars and restarting app...")
+          ui.info("Setting environment variables and restarting app...")
 
           response = send_post_request(
-            config_vars_url, {
+            environment_variables_url, {
               app_slug:,
-              config_vars:
+              environment_variables:
             }
           )
 

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require "terminal-table"
+require "thor"
+
+require_relative "../session"
+require_relative "./constants"
+
+module NeetoDeploy
+  class CLI
+    module Env
+      class Unset < CLI::Base
+        include Constants
+        include Session
+
+        attr_reader :app_slug, :environment_variables_string_array, :environment_variables
+
+        def initialize(environment_variables_string_array, options:)
+          super()
+          @app_slug = options[:app]
+          @environment_variables_string_array = environment_variables_string_array
+          @environment_variables = environment_variables_string_array.map do |environment_variable_key|
+            { key: environment_variable_key }
+          end
+        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.error(response) and return unless response.success?
+
+          ui.success("Done")
+        end
+      end
+    end
+  end
+end

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

@@ -1,48 +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)
-          @app_name     = app_name
+          super()
+          @app_name = app_name
           @process_type = process_type
         end
 
         def process!
-          ws = WebSocket::Client::Simple.connect "wss://neeto-deploy-lc.neetodeployapp.com/cli_logs?deployment_name=#{app_name}&&process_type=#{process_type}"
-
-          ws.on :message do |msg|
-            message = msg.data
-            cmd = message[0]
-            if cmd == "1"
-              STDOUT.write message.delete_prefix("1")
-              STDOUT.flush
-            end
-          end
+          stream_logs
+        end
 
-          ws.on :open do
-          end
+        private
 
-          ws.on :close do |e|
-            p e
-            exit 1
+          def uri
+            "wss://connect.neetodeploy.com/cable"
           end
 
-          ws.on :error do |e|
-            p e
-            puts "MyserverBackend>> Close entered. Last error:#{$!.class}:#{$!.to_s};Module:#{$0};"
-            $@.each { |backtrace| puts backtrace }
-            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
 
-          loop do
+          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 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/constants.rb

@@ -7,7 +7,7 @@ module NeetoDeploy
         NEETO_DEPLOY_CLI_API_ADDONS_REDIS_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/addons/redis".freeze
         AVAILABLE_REDIS_CONFIGS_TO_EDIT = ["maxmemory-policy"]
 
-        def config_vars_url
+        def redis_addon_url
           NEETO_DEPLOY_CLI_API_ADDONS_REDIS_URL
         end
 

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

@@ -21,7 +21,7 @@ module NeetoDeploy
 
         def run
           response = send_patch_request(
-            config_vars_url, {
+            redis_addon_url, {
               addon_name:,
               command: "CONFIG get #{key}"
             }

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

@@ -29,7 +29,7 @@ module NeetoDeploy
           end
 
           response = send_patch_request(
-            config_vars_url, {
+            redis_addon_url, {
               addon_name:,
               command: "CONFIG set #{key} #{value}"
             }

data/lib/neeto_deploy/cli.rb

@@ -10,7 +10,7 @@ module NeetoDeploy
     require_relative "cli/login/base"
     require_relative "cli/exec/base"
     require_relative "cli/logs/base"
-    require_relative "cli/config/commands"
+    require_relative "cli/env/commands"
     require_relative "cli/redis/commands"
 
     def self.start(*)
@@ -22,8 +22,8 @@ module NeetoDeploy
       CLI::Login::Base.new.process!
     end
 
-    desc "config", "Manage config vars"
-    subcommand "config", Config::Commands
+    desc "env", "Manage environment variable"
+    subcommand "env", Env::Commands
 
     desc "exec", "Exec into deployment"
     option :app, type: :string, aliases: "-a", required: true, desc: "App slug"
@@ -33,7 +33,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", 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

data/lib/neeto_deploy/version.rb

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

data/neetodeploy.gemspec

@@ -34,8 +34,9 @@ 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.2.1" # for cli
+  spec.add_dependency "thor", "~> 1.3.0" # for cli
   spec.add_dependency "websocket-client-simple"
+  spec.add_dependency "colorize"
 
   # 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.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-21 00:00:00.000000000 Z
+date: 2024-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: websocket-client-simple
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ 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'
 description: Manage neetoDeploy apps with CLI
 email:
 - subin.siby@bigbinary.com
@@ -109,16 +123,17 @@ files:
 - lib/neeto_deploy.rb
 - lib/neeto_deploy/cli.rb
 - lib/neeto_deploy/cli/base.rb
-- lib/neeto_deploy/cli/config/commands.rb
-- lib/neeto_deploy/cli/config/constants.rb
-- lib/neeto_deploy/cli/config/list.rb
-- lib/neeto_deploy/cli/config/set.rb
-- lib/neeto_deploy/cli/config/unset.rb
+- lib/neeto_deploy/cli/env/commands.rb
+- lib/neeto_deploy/cli/env/constants.rb
+- lib/neeto_deploy/cli/env/list.rb
+- lib/neeto_deploy/cli/env/set.rb
+- lib/neeto_deploy/cli/env/unset.rb
 - lib/neeto_deploy/cli/exec/base.rb
 - lib/neeto_deploy/cli/exec/constants.rb
 - 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

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

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module NeetoDeploy
-  class CLI
-    module Config
-      module Constants
-        NEETO_DEPLOY_CLI_API_CONFIG_VARS_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/config_vars".freeze
-
-        def config_vars_url
-          NEETO_DEPLOY_CLI_API_CONFIG_VARS_URL
-        end
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require "terminal-table"
-require "thor"
-
-require_relative "../session"
-require_relative "./constants"
-
-module NeetoDeploy
-  class CLI
-    module Config
-      class Unset < CLI::Base
-        include Constants
-        include Session
-
-        attr_reader :app_slug, :config_vars_string_array, :config_vars
-
-        def initialize(config_vars_string_array, options:)
-          super()
-          @app_slug = options[:app]
-          @config_vars_string_array = config_vars_string_array
-          @config_vars = config_vars_string_array.map do |config_var_key|
-            { key: config_var_key }
-          end
-        end
-
-        def run
-          ui.info("Unsetting config var keys #{config_vars_string_array} and restarting app...")
-
-          response = send_delete_request(
-            config_vars_url, {
-              app_slug:,
-              config_vars:
-            }
-          )
-
-          ui.error(response) and return unless response.success?
-
-          ui.success("Done")
-        end
-      end
-    end
-  end
-end