arql 0.1.25 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5129e08083a8abbbed19d1fc8e37d6c1cb5ec82116eb4915574ccf51fbab4604
-  data.tar.gz: 1743d1604a65793c6e36fa85ba1b6cc967a1b626bc2e0c6fb5e66611a9cec6d0
+  metadata.gz: d8fb2d02931fdd0af7a9eec6b20db222f6f2fff93e0c506186316157987a443f
+  data.tar.gz: ae61f43b49612c316a82aac8e0c63dfc70c34527026c62201397f267ace5c188
 SHA512:
-  metadata.gz: bacfc17e2ddeb7791d6985a990fef8e1eec38a20f4073d6b2b878f0cbeacbcf1fd75b6e326b178d6c7767034810af11720bd1b6324bd5b22c817ee1d60cb79fe
-  data.tar.gz: c35ad64535fcd18840882ab2c415a68a6899db0227ed47a490560548972f2b5a1cb0533842f1d4f6714ce7b37e3c1b6605dbfb34a48090dc6cb12aca76af46bd
+  metadata.gz: 8deb0c597de52fe5d1dd24f7eaa60c07133d7c0d583eb93f746b416d660a5911f556820b1937cb5f0d2d9667de3a53a1b8057e7bc6ad36321eb96b0e93f454e2
+  data.tar.gz: 77ba16537c3fa67c65518db3e5fbca9fa012452c2135a0d26ffabbb47ec9c65f6a3de1c052a98553b65640d9c534467a77ef5993013cb9f3d265c830db70e613

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.1.25)
+    arql (0.1.30)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       mysql2 (~> 0.5.3)

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!
@@ -35,11 +36,12 @@ module Arql
 
     def load_initializer!
       return unless effective_config[:initializer]
-      unless File.exists?(effective_config[:initializer])
+      initializer_file = File.expand_path(effective_config[:initializer])
+      unless File.exists?(initializer_file)
         STDERR.puts "Specified initializer file not found, #{effective_config[:initializer]}"
         exit(1)
       end
-      load(effective_config[:initializer])
+      load(initializer_file)
     end
 
     def start_ssh_proxy!
@@ -55,18 +57,30 @@ module Arql
     end
 
     def config
-      @config ||= YAML.load(IO.read(@options.config_file)).with_indifferent_access
+      @config ||= YAML.load(IO.read(File.expand_path(@options.config_file))).with_indifferent_access
     end
 
     def selected_config
       if @options.env.present? && !config[@options.env].present?
         STDERR.puts "Specified ENV `#{@options.env}' not exists"
       end
-      config[@options.env]
+      if env = @options.env
+        config[env]
+      else
+        {}
+      end
     end
 
     def effective_config
-      @@effective_config ||= selected_config.deep_merge(@options.to_h)
+      @@effective_config ||= nil
+      unless @@effective_config
+        @@effective_config = selected_config.deep_merge(@options.to_h)
+        if @@effective_config[:adapter].blank?
+          @@effective_config[:adapter] = 'sqlite3'
+        end
+        @@effective_config[:database] = File.expand_path(@@effective_config[:database]) if @@effective_config[:adapter] == 'sqlite3'
+      end
+      @@effective_config
     end
 
     def run!

data/lib/arql/cli.rb

@@ -10,10 +10,7 @@ module Arql
       end
 
       def parse_options!
-        @options = OpenStruct.new(adapter: 'mysql2',
-                                  encoding: 'utf8',
-                                  pool: 5,
-                                  config_file: default_config_file,
+        @options = OpenStruct.new(config_file: default_config_file,
                                   initializer: default_initializer,
                                   ssh: {})
 

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.merge(keepalive: true, keepalive_interval: 30))
+        @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.25"
+  VERSION = "0.1.30"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.30
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -169,6 +169,7 @@ email:
 - liuxiang921@gmail.com
 executables:
 - arql
+- arql_setsid_wrapper
 extensions: []
 extra_rdoc_files: []
 files:
@@ -183,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
@@ -205,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: