neetodeploy 1.0.6 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38aaafe1332d72299302a1e8e23b51c9bb331247855747ff89447a78e096c3db
-  data.tar.gz: de0682177ba35603b9a324557a7e3a1447595815895d01ce0b02790991e74236
+  metadata.gz: 4ea4f99fbeaf0fbd93641b5efb3d492d16417095156ead2075b38f9554aed01e
+  data.tar.gz: 0d209c71f40f53589929a71d741025fc44bafd4f4c2ad13bc80a5d4265e1d77b
 SHA512:
-  metadata.gz: 61c4a3349bdcb2adea201d5df0111a4299532b4693280ad59466b827d0b6b6f4e96133671d65933de9ef9e1f06a04a63dcc89afca2dda50b0f41fd9db2aea4b6
-  data.tar.gz: 76de2334e8b337aff37239e8e167e27e05d75a6a6112e3b15e6e9480229a9c1d22ccc1dd9b70c6124408578f336df1047b6a25909bacbb43c6cd51e29828896b
+  metadata.gz: 31defc5670116331de581587d1e235a08026f5b58833eca0bff8a0eb7d6750303cd9dc6571fd057e04191433b6d21bee3dc3db92d044f36722a015161e2e393c
+  data.tar.gz: 3bcdcda2d127a42aded214d4e8fac649762b6e26e599c09fb35d564615410185646bd1ded577bcd2104523ed040cd9d7f90c7f46d1d07efaded2c6a4a596a0d0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    neetodeploy (1.0.6)
+    neetodeploy (1.0.7)
       dotenv (~> 2.8.1)
       httparty (~> 0.21.0)
       launchy (~> 2.5.0)

data/lib/neeto_deploy/cli/base.rb

@@ -5,7 +5,7 @@ require_relative "../version"
 
 module NeetoDeploy
   class CLI
-    NEETO_DEPLOY_HOST = ENV["NEETO_DEPLOY_HOST"] || "https://neeto-engineering.neetodeploy.net" # TODO make this org generic
+    NEETO_DEPLOY_HOST = ENV["NEETO_DEPLOY_HOST"] || "https://app.neetodeploy.net"
     NEETO_DEPLOY_CLI_API_BASE_URL = "#{NEETO_DEPLOY_HOST}/api/cli/#{CLI_API_VERSION}"
 
     CLI_CONFIG_DIR = "~/.config/neetodeploy".freeze

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

@@ -3,19 +3,38 @@ require "websocket-client-simple"
 require "thor"
 require "readline"
 
+require_relative "../session"
+require_relative "./constants"
+
 module NeetoDeploy
   class CLI
     module Exec
       class Base < CLI::Base
+        include Constants
+        include Session
+
         attr_reader :app_name
+
         def initialize(app_name)
+          super()
           @app_name = app_name
         end
 
         def process!
           puts "Opening console for #{app_name}"
 
-          ws = WebSocket::Client::Simple.connect "wss://neeto-deploy-lc.neetoreviewapp.net/cli_console?deployment_name=#{app_name}-web-deployment"
+          response = send_post_request(
+            console_session_create_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.neetoreviewapp.net/cli_console?deployment_name=#{app_name}&console_token=#{console_token}"
 
           prompt = ''
 
@@ -46,6 +65,10 @@ module NeetoDeploy
             exit 1
           end
 
+          trap("SIGINT") do
+            Thread.new {  ws.send "4" }
+          end
+
           loop do
             sleep 0.1
             input = Readline.readline(prompt, true)

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module NeetoDeploy
+  class CLI
+    module Exec
+      module Constants
+        NEETO_DEPLOY_CLI_API_CONSOLE_SESSION_CREATE_URL = "#{NEETO_DEPLOY_CLI_API_BASE_URL}/console_sessions".freeze
+
+        def console_session_create_url
+          NEETO_DEPLOY_CLI_API_CONSOLE_SESSION_CREATE_URL
+        end
+      end
+    end
+  end
+end

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

@@ -12,10 +12,11 @@ module NeetoDeploy
       class Base < CLI::Base
         include Constants
 
-        attr_accessor :login_token
+        attr_accessor :login_token, :org_subdomain
 
         def process!
           init_session
+          ask_for_org_subdomain
           show_login_link_and_open_in_browser
           wait_until_user_authenticates!
         end
@@ -27,14 +28,27 @@ module NeetoDeploy
             self.login_token = response["login_token"]
           end
 
+          def ask_for_org_subdomain
+            ui.say(
+              <<~EOF
+              Welcome to neetoDeploy CLI. To get started, we need your organization's subdomain.
+
+              If your organization URL is "myorg.neetodeploy.com", your organization subdomain is "myorg".
+              More information: https://help.neetodeploy.com/articles/neetodeploy-cli
+
+              EOF
+            )
+            self.org_subdomain = ui.ask("Please enter the subdomain of your organization:")
+          end
+
           def show_login_link_and_open_in_browser
             ui.say(
               <<~EOF
-              A webpage will be opened in a browser. If it didn't, please open this URL in browser:
-              #{session_login_url}
+              The login page will be opened in your browser. If it didn't, please open this URL in your browser:
+              #{session_login_url(org_subdomain)}
               EOF
             )
-            Launchy.open(session_login_url)
+            Launchy.open(session_login_url(org_subdomain))
           end
 
           def wait_until_user_authenticates!

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

@@ -11,8 +11,9 @@ module NeetoDeploy
           NEETO_DEPLOY_CLI_API_SESSIONS_URL
         end
 
-        def session_login_url
-          "#{NEETO_DEPLOY_CLI_API_BASE_URL}/sessions/#{login_token}/authenticate"
+        def session_login_url(org_subdomain)
+          org_url = NEETO_DEPLOY_HOST.sub("app.", "#{org_subdomain}.")
+          "#{org_url}/cli/login?token=#{login_token}"
         end
 
         def session_login_status_url

data/lib/neeto_deploy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neetodeploy
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Subin Siby
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-15 00:00:00.000000000 Z
+date: 2023-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
@@ -115,6 +115,7 @@ files:
 - lib/neeto_deploy/cli/config/set.rb
 - lib/neeto_deploy/cli/config/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