arql 0.1.23 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb803df936a94d7bb9599aff2dd0db0b625a576e6736799fb50c89d3402808e
-  data.tar.gz: 72e84b31307d1bb6d0dad35eeb96702debb55a54a7db0f5a007cd0edd1bf0d28
+  metadata.gz: a60cf3e7b24cf3967d9e566fbb89011ce12b727bd6ef9f4e6e7b83aa2ef58bfc
+  data.tar.gz: 06152be12dff3594db513cbca09e8f53d0250d634d05b4a4bf1e1532c593097a
 SHA512:
-  metadata.gz: a7e4905293900ad7e515c35fd8b96a16357dedd940d2f65473a5a087e84444585d335e9922225a87156a453c7eff439cf015b9fbaed318ae8a9c80018dd99350
-  data.tar.gz: 69871e396b27eb0b9ceca1f5d3f66aef292d8eb82154018da720878373d95b5554971f5c492327d445bd5762fa1c118d299d9cacda3a163c8d75e94072cf4ddd
+  metadata.gz: b2a3f77a0119b6188437187fb23bc8da4d0129f038d325b2112dcc67eb4621484bed0c3cef28bcad6f7d2eb35957c3977ad923cdef667108b2ecfc15a4030296
+  data.tar.gz: 309d4f09b2b475625e006a66faea1cef2473368bab41933188de5f47cc75bd2b6a9ee47a6c86fa3096f84e118c1cce402be18b65605bf76564dee123c092364f

data/Gemfile.lock

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

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+ArqlSetsidWrrapper = File.dirname(File.absolute_path(__FILE__)) + '/arql_setsid_wrapper'
+
 require "arql"
 
 Arql::Cli.start

data/exe/arql_setsid_wrapper

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+Process.setsid
+
+exec(*ARGV)

data/lib/arql/app.rb

@@ -4,7 +4,7 @@ module Arql
   class App
 
     class << self
-      attr_accessor :log_io
+      attr_accessor :log_io, :env
 
       def config
         @@effective_config
@@ -17,6 +17,7 @@ module Arql
       require "arql/connection"
       require "arql/definition"
       @options = options
+      App.env = @options.env
       Connection.open(connect_options)
       @definition = Definition.new(effective_config)
       load_initializer!

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/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/repl.rb

@@ -31,7 +31,7 @@ module Arql
          else
            nest_level_prompt = "(#{obj}:#{nest_level})"
          end
-         "%s#{nest_level_prompt} %s " % [Rainbow('ARQL').red, Rainbow('❯').green]
+         "%s#{Rainbow('@').green}%s#{nest_level_prompt} %s " % [Rainbow('ARQL').red, Rainbow(App.env).yellow, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/ssh_proxy.rb

@@ -1,4 +1,5 @@
 require 'net/ssh/gateway'
+require 'arql/ssh_proxy_patch'
 
 module Arql
   class SSHProxy
@@ -8,7 +9,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, loop_wait: 1))
         @local_ssh_proxy_port = @ssh_gateway.open(config[:forward_host], config[:forward_port], config[:local_port])
       end
 

data/lib/arql/ssh_proxy_patch.rb

@@ -0,0 +1,88 @@
+require 'net/ssh/proxy/command'
+
+module Net
+  module SSH
+    module Proxy
+     class Command
+
+        # Return a new socket connected to the given host and port via the
+        # proxy that was requested when the socket factory was instantiated.
+        def open(host, port, connection_options = nil)
+          command_line = @command_line_template.gsub(/%(.)/) {
+            case $1
+            when 'h'
+              host
+            when 'p'
+              port.to_s
+            when 'r'
+              remote_user = connection_options && connection_options[:remote_user]
+              if remote_user
+                remote_user
+              else
+                raise ArgumentError, "remote user name not available"
+              end
+            when '%'
+              '%'
+            else
+              raise ArgumentError, "unknown key: #{$1}"
+            end
+          }
+          command_line = '%s %s' % [ArqlSetsidWrrapper, command_line]
+          begin
+            io = IO.popen(command_line, "r+")
+            begin
+              if result = IO.select([io], nil, [io], @timeout)
+                if result.last.any? || io.eof?
+                  raise "command failed"
+                end
+              else
+                raise "command timed out"
+              end
+            rescue StandardError
+              close_on_error(io)
+              raise
+            end
+          rescue StandardError => e
+            raise ConnectError, "#{e}: #{command_line}"
+          end
+          @command_line = command_line
+          if Gem.win_platform?
+            # read_nonblock and write_nonblock are not available on Windows
+            # pipe. Use sysread and syswrite as a replacement works.
+            def io.send(data, flag)
+              syswrite(data)
+            end
+
+            def io.recv(size)
+              sysread(size)
+            end
+          else
+            def io.send(data, flag)
+              begin
+                result = write_nonblock(data)
+              rescue IO::WaitWritable, Errno::EINTR
+                IO.select(nil, [self])
+                retry
+              end
+              result
+            end
+
+            def io.recv(size)
+              begin
+                result = read_nonblock(size)
+              rescue IO::WaitReadable, Errno::EINTR
+                timeout_in_seconds = 20
+                if IO.select([self], nil, [self], timeout_in_seconds) == nil
+                  raise "Unexpected spurious read wakeup"
+                end
+                retry
+              end
+              result
+            end
+          end
+          io
+        end
+      end
+    end
+  end
+end

data/lib/arql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.1.28
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-22 00:00:00.000000000 Z
+date: 2020-07-06 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
@@ -217,6 +169,7 @@ email:
 - liuxiang921@gmail.com
 executables:
 - arql
+- arql_setsid_wrapper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -231,6 +184,7 @@ files:
 - bin/console
 - bin/setup
 - exe/arql
+- exe/arql_setsid_wrapper
 - lib/arql.rb
 - lib/arql/app.rb
 - lib/arql/cli.rb
@@ -253,6 +207,7 @@ files:
 - lib/arql/multi_io.rb
 - lib/arql/repl.rb
 - lib/arql/ssh_proxy.rb
+- lib/arql/ssh_proxy_patch.rb
 - lib/arql/version.rb
 homepage: https://github.com/lululau/arql
 licenses: