arql 0.1.20 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b383963c2e71446f35b3eba8c9ff365698d93f377407f17e81d4775b5a841bab
-  data.tar.gz: 1efd73946f5f238a90f5d74370525460c25f3a930de2689ca47201cd43f76549
+  metadata.gz: 5129e08083a8abbbed19d1fc8e37d6c1cb5ec82116eb4915574ccf51fbab4604
+  data.tar.gz: 1743d1604a65793c6e36fa85ba1b6cc967a1b626bc2e0c6fb5e66611a9cec6d0
 SHA512:
-  metadata.gz: bc2581c870cd2102fddc37208145c7b84ab3806460de23c2289fafb494b74625aa0ec8fa4a44fdaf06cc18caf6048426a475149df55138c4bc17bbd1d06ca64c
-  data.tar.gz: a42fc963d40ffb65fb21db348321208202c2bd84c89d299e4863143bffd7436fa62591e7d52fe4f3bd9efcc02332872b85fdb76999c132329b9fdd37ddb5cb08
+  metadata.gz: bacfc17e2ddeb7791d6985a990fef8e1eec38a20f4073d6b2b878f0cbeacbcf1fd75b6e326b178d6c7767034810af11720bd1b6324bd5b22c817ee1d60cb79fe
+  data.tar.gz: c35ad64535fcd18840882ab2c415a68a6899db0227ed47a490560548972f2b5a1cb0533842f1d4f6714ce7b37e3c1b6605dbfb34a48090dc6cb12aca76af46bd

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.1.19)
+    arql (0.1.25)
       activerecord (~> 6.0.3)
-      activerecord-oracle_enhanced-adapter
-      activerecord-sqlserver-adapter
       activesupport (~> 6.0.3)
       mysql2 (~> 0.5.3)
       net-ssh-gateway (~> 2.0.0)
-      pg (>= 0.18, < 2.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
       pry-doc (~> 1.1.0)
@@ -25,10 +22,6 @@ GEM
     activerecord (6.0.3.1)
       activemodel (= 6.0.3.1)
       activesupport (= 6.0.3.1)
-    activerecord-oracle_enhanced-adapter (6.0.2)
-      activerecord (~> 6.0.0)
-      ruby-plsql (>= 0.6.0)
-    activerecord-sqlserver-adapter (2.3.8)
     activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
@@ -46,7 +39,6 @@ GEM
     net-ssh (6.0.2)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
-    pg (1.2.3)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -58,7 +50,6 @@ GEM
       yard (~> 0.9.11)
     rainbow (3.0.0)
     rake (12.3.3)
-    ruby-plsql (0.7.1)
     sqlite3 (1.4.2)
     table_print (1.5.6)
     terminal-table (1.8.0)

data/arql.gemspec

@@ -24,10 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'mysql2', '~> 0.5.3'
-  spec.add_dependency 'pg', '>= 0.18', '< 2.0'
+  # spec.add_dependency 'pg', '>= 0.18', '< 2.0'
   spec.add_dependency 'sqlite3', '~> 1.4'
-  spec.add_dependency 'activerecord-sqlserver-adapter'
-  spec.add_dependency 'activerecord-oracle_enhanced-adapter'
+  # spec.add_dependency 'activerecord-sqlserver-adapter'
+  # spec.add_dependency 'activerecord-oracle_enhanced-adapter'
   spec.add_dependency 'activerecord', '~> 6.0.3'
   spec.add_dependency 'activesupport', '~> 6.0.3'
   spec.add_dependency 'net-ssh-gateway', '~> 2.0.0'

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 if Arql::App.config[:ssh].present?
+        ActiveRecord::Base.connection.reconnect! unless ActiveRecord::Base.connection.active?
+      end
+
+      def reconnect!
+        Arql::SSHProxy.reconnect! if Arql::App.config[:ssh].present?
         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/definition.rb

@@ -26,6 +26,9 @@ module Arql
       self.class.to_upsert_sql([self])
     end
 
+    included do
+    end
+
     class_methods do
       def t
         table_name = Commands::Table::get_table_name(name)
@@ -163,5 +166,15 @@ module Arql
         end
       end
     end
+
+    ::ActiveRecord::Relation.class_eval do
+      def t
+        records.t
+      end
+
+      def v
+        records.v
+      end
+    end
   end
 end

data/lib/arql/ext/array.rb

@@ -28,7 +28,7 @@ class Array
       }.to_s
 
       terminal_width = `tput cols`.to_i
-      if table.first.size > terminal_width
+      if table.lines.first.size > terminal_width
         table = table.lines.map(&:chomp)
         puts table[0..2].join("\n")
         puts table[3..-1].join("\n#{'-' * terminal_width}\n")

data/lib/arql/ext/time.rb

@@ -9,7 +9,7 @@ class Time
     to_s
   end
 
-  def as_json
+  def as_json(*args)
     to_s
   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.merge(keepalive: true, keepalive_interval: 30))
+        @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.20"
+  VERSION = "0.1.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.25
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-05 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -24,26 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.18'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.18'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -58,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: activerecord-sqlserver-adapter
-  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: activerecord-oracle_enhanced-adapter
-  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: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -252,6 +204,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: