arql 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5c7a264d240ee1cac06ad0f79ebf578f877e5e151f7ab294c43f742ba110d2
-  data.tar.gz: 738eb831752775b5c55fa919e9a064eca8439e239a4b345aea36c3cbab9e0500
+  metadata.gz: ebb803df936a94d7bb9599aff2dd0db0b625a576e6736799fb50c89d3402808e
+  data.tar.gz: 72e84b31307d1bb6d0dad35eeb96702debb55a54a7db0f5a007cd0edd1bf0d28
 SHA512:
-  metadata.gz: 3e6f61c3cf125f1cfa81be9737ed7aa54857651344916d10ba587580842d4985b4873fb6ae042cac917dbdfe73a0306e4ead523d4f99613e0786f377da10b228
-  data.tar.gz: 5c6ba812cde58dfb5ece38cbb89d369c078d4c06d42a48df55eba59a064eaeeae4de9a1273b3b0f882acc88130d0379d1800fa4f9cadd316cc8dc67683d0a75f
+  metadata.gz: a7e4905293900ad7e515c35fd8b96a16357dedd940d2f65473a5a087e84444585d335e9922225a87156a453c7eff439cf015b9fbaed318ae8a9c80018dd99350
+  data.tar.gz: 69871e396b27eb0b9ceca1f5d3f66aef292d8eb82154018da720878373d95b5554971f5c492327d445bd5762fa1c118d299d9cacda3a163c8d75e94072cf4ddd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.1.21)
+    arql (0.1.22)
       activerecord (~> 6.0.3)
       activerecord-oracle_enhanced-adapter
       activerecord-sqlserver-adapter

data/lib/arql.rb

@@ -4,6 +4,7 @@ require 'arql/id'
 require 'arql/multi_io'
 require 'arql/ext'
 require "arql/repl"
+require "arql/ssh_proxy"
 require "arql/app"
 require "arql/cli"
 

data/lib/arql/app.rb

@@ -9,10 +9,6 @@ module Arql
       def config
         @@effective_config
       end
-
-      def local_ssh_proxy_port
-        @@local_ssh_proxy_port
-      end
     end
 
     def initialize(options)
@@ -48,11 +44,13 @@ module Arql
 
     def start_ssh_proxy!
       ssh_config = effective_config[:ssh]
-      @ssh_gateway = Net::SSH::Gateway.new(ssh_config[:host], ssh_config[:user], ssh_config.slice(:port, :password).symbolize_keys)
-      @@local_ssh_proxy_port = @ssh_gateway.open(effective_config[:host], effective_config[:port], ssh_config[:local_port])
+      local_ssh_proxy_port = Arql::SSHProxy.connect(ssh_config.slice(:host, :user, :port, :password).merge(
+                                                                                                           forward_host: effective_config[:host],
+                                                                                                           forward_port: effective_config[:port],
+                                                                                                           local_port: ssh_config[:local_port]))
       {
         host: '127.0.0.1',
-        port: @@local_ssh_proxy_port
+        port: local_ssh_proxy_port
       }
     end
 

data/lib/arql/commands/info.rb

@@ -1,3 +1,5 @@
+require 'rainbow'
+
 module Arql::Commands
   module Info
     class << self
@@ -5,6 +7,8 @@ module Arql::Commands
         <<~EOF
 
         Database Connection Information:
+
+            Active:    #{color_boolean(ActiveRecord::Base.connection.active?)}
             Host:      #{Arql::App.config[:host]}
             Port:      #{Arql::App.config[:port]}
             Username:  #{Arql::App.config[:username]}
@@ -20,13 +24,24 @@ module Arql::Commands
         <<~EOF
 
         SSH Connection Information:
+
+            Active:     #{color_boolean(Arql::SSHProxy.active?)}
             Host:       #{Arql::App.config[:ssh][:host]}
             Port:       #{Arql::App.config[:ssh][:port]}
             Username:   #{Arql::App.config[:ssh][:user]}
             Password:   #{(Arql::App.config[:ssh][:password] || '').gsub(/./, '*')}
-            Local Port: #{Arql::App.local_ssh_proxy_port}
+            Local Port: #{Arql::SSHProxy.local_ssh_proxy_port}
         EOF
       end
+
+      private
+      def color_boolean(bool)
+        if bool
+          Rainbow('TRUE').green
+        else
+          Rainbow('FALSE').red
+        end
+      end
     end
 
     Pry.commands.block_command 'info' do

data/lib/arql/commands/reconnect.rb

@@ -2,6 +2,12 @@ module Arql::Commands
   module Reconnect
     class << self
       def reconnect
+        Arql::SSHProxy.reconnect
+        ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
+      end
+
+      def reconnect!
+        Arql::SSHProxy.reconnect!
         ActiveRecord::Base.connection.reconnect!
       end
     end
@@ -9,5 +15,9 @@ module Arql::Commands
     Pry.commands.block_command 'reconnect' do
       Reconnect.reconnect
     end
+
+    Pry.commands.block_command 'reconnect!' do
+      Reconnect.reconnect!
+    end
   end
 end

data/lib/arql/ssh_proxy.rb

@@ -0,0 +1,30 @@
+require 'net/ssh/gateway'
+
+module Arql
+  class SSHProxy
+    class << self
+
+      attr_accessor :config, :ssh_gateway, :local_ssh_proxy_port
+
+      def connect(config)
+        @config = config
+        @ssh_gateway = Net::SSH::Gateway.new(config[:host], config[:user], config.slice(:port, :password).symbolize_keys)
+        @local_ssh_proxy_port = @ssh_gateway.open(config[:forward_host], config[:forward_port], config[:local_port])
+      end
+
+      def reconnect
+        reconnect! unless @ssh_gateway.active?
+      end
+
+      def reconnect!
+        @ssh_gateway.shutdown!
+        @ssh_gateway = Net::SSH::Gateway.new(@config[:host], @config[:user], @config.slice(:port, :password).symbolize_keys)
+        @ssh_gateway.open(config[:forward_host], config[:forward_port], @local_ssh_proxy_port)
+      end
+
+      def active?
+        @ssh_gateway.active?
+      end
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-09 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -252,6 +252,7 @@ files:
 - lib/arql/id.rb
 - lib/arql/multi_io.rb
 - lib/arql/repl.rb
+- lib/arql/ssh_proxy.rb
 - lib/arql/version.rb
 homepage: https://github.com/lululau/arql
 licenses: