arql 0.1.23 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb803df936a94d7bb9599aff2dd0db0b625a576e6736799fb50c89d3402808e
-  data.tar.gz: 72e84b31307d1bb6d0dad35eeb96702debb55a54a7db0f5a007cd0edd1bf0d28
+  metadata.gz: 564734f7acc9af2155ed815a64d8409e7ba3cf1478186271802ae5885bab0aca
+  data.tar.gz: 94171bccabc7a2e8a48d8a8dcbb29922dd30a50e22d696e2552fcae670a8efb8
 SHA512:
-  metadata.gz: a7e4905293900ad7e515c35fd8b96a16357dedd940d2f65473a5a087e84444585d335e9922225a87156a453c7eff439cf015b9fbaed318ae8a9c80018dd99350
-  data.tar.gz: 69871e396b27eb0b9ceca1f5d3f66aef292d8eb82154018da720878373d95b5554971f5c492327d445bd5762fa1c118d299d9cacda3a163c8d75e94072cf4ddd
+  metadata.gz: 3be7226f6ba22d715fd56b2c8b51fa86195be8167d080c41c6f1308e69366d8bc95d773260440fe48dcee0b1df3bee1260e1e836e70f0d470446057dff49f746
+  data.tar.gz: '0846f6882b40846f8f42293a9e08d474e4306719fd5fd817bd19590a893efde21d67d2af41d91b7a552283fd33510ab698ba7efe016bc95418ab4bf9550566cc'

data/Gemfile.lock

@@ -1,14 +1,11 @@
 PATH
   remote: .
   specs:
-    arql (0.1.22)
+    arql (0.1.24)
       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/commands/reconnect.rb

@@ -2,12 +2,12 @@ module Arql::Commands
   module Reconnect
     class << self
       def reconnect
-        Arql::SSHProxy.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!
+        Arql::SSHProxy.reconnect! if Arql::App.config[:ssh].present?
         ActiveRecord::Base.connection.reconnect!
       end
     end

data/lib/arql/ssh_proxy.rb

@@ -8,7 +8,7 @@ module Arql
 
       def connect(config)
         @config = config
-        @ssh_gateway = Net::SSH::Gateway.new(config[:host], config[:user], config.slice(:port, :password).symbolize_keys)
+        @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
 

data/lib/arql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.24
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-22 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