arql 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4f6b01a4cae5f453322b2adf85b21ca4442d83dc07c504b73048b2640322af5
-  data.tar.gz: 78b66856a6bb72ae2247b3f1f6ea82434696fd5f5f345fda904f6017fcd4c009
+  metadata.gz: dc86cf0d1862e52ea16793c51d8bd46e9c0d9463bbb2c096bb265e524d74edf9
+  data.tar.gz: d66f20e0a5f969179dcf70404f3a9c4c698618793e51c3bb0ddd928c7668ef8f
 SHA512:
-  metadata.gz: d01f9fe3b5a3264476e76eb8446054daec67648edefe1d67c7b1c97ed96f8695d924b48b4a5c7b3f60ac535ccfdb9919d2106f6517b7f898289c8970a0574642
-  data.tar.gz: c6be97e00d33908f45866c267b054c913e615b4f594b6baccf72d374a8e92b30136b7cd4e122cacdd7ffbf80dd1a8925b2e7e2a676edf4a2aec0f56a9058e054
+  metadata.gz: 5b201e845a4c691a274874b31c9b3a9cd3d23212d47496becea0ad167653f79126071329ba0f1c5bcc4bbeb6552a2c0b240006aa11f8c3ae36828ca931f595e7
+  data.tar.gz: e2d7bd2a8a3da1122e8624ef09e6854aac9f7708b4c2bd88985d43d0a5610e0fe4a5bfd85e6764492e9c8f7067209de3959fd6364e15ec4da51d0525ed722e87

data/Gemfile.lock

@@ -1,27 +1,28 @@
 PATH
   remote: .
   specs:
-    arql (0.1.1)
+    arql (0.1.2)
       activerecord (~> 6.0.0)
       activesupport (~> 6.0.0)
       mysql2 (~> 0.5.3)
+      net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activesupport (6.0.2.2)
+    activemodel (6.0.3)
+      activesupport (= 6.0.3)
+    activerecord (6.0.3)
+      activemodel (= 6.0.3)
+      activesupport (= 6.0.3)
+    activesupport (6.0.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.1.3)
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
@@ -30,6 +31,9 @@ GEM
     method_source (1.0.0)
     minitest (5.14.0)
     mysql2 (0.5.3)
+    net-ssh (6.0.2)
+    net-ssh-gateway (2.0.0)
+      net-ssh (>= 4.0.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)

data/arql.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mysql2', '~> 0.5.3'
   spec.add_dependency 'activerecord', '~> 6.0.0'
   spec.add_dependency 'activesupport', '~> 6.0.0'
+  spec.add_dependency 'net-ssh-gateway', '~> 2.0.0'
   spec.add_dependency 'pry', '~> 0.13.1'
   spec.add_dependency 'pry-byebug', '~> 3.9.0'
 end

data/lib/arql/app.rb

@@ -1,3 +1,5 @@
+require 'net/ssh/gateway'
+
 module Arql
   class App
     def initialize(options)
@@ -7,38 +9,46 @@ module Arql
     end
 
     def connect_options
-      if use_db_cmd_options?
-        {
-          adapter: @options.db_adapter,
-          host: @options.db_host,
-          username: @options.db_user,
-          password: @options.db_password || '',
-          database: @options.db_name,
-          encoding: @options.db_encoding,
-          pool: @options.db_pool,
-          port: @options.db_port
-        }
-      else
-        db_config
+      connect_conf = effective_config.slice(:adapter, :host, :username,
+                             :password, :database, :encoding,
+                             :pool, :port)
+      if effective_config[:ssh].present?
+        connect_conf.merge!(start_ssh_proxy!)
       end
+
+      connect_conf
+    end
+
+    def start_ssh_proxy!
+      ssh_config = effective_config[:ssh]
+      @ssh_gateway = Net::SSH::Gateway.new(ssh_config[:host], ssh_config[:user])
+      @local_ssh_proxy_port = @ssh_gateway.open(effective_config[:host], effective_config[:port], ssh_config[:local_port])
+      {
+        host: '127.0.0.1',
+        port: @local_ssh_proxy_port
+      }
     end
 
     def config
       @config ||= YAML.load(IO.read(@options.config_file)).with_indifferent_access
     end
 
-    def db_config
-      config[:db][@options.env]
+    def selected_config
+      config[@options.env]
+    end
+
+    def effective_config
+      @effective_config ||= selected_config.merge(@options.to_h)
     end
 
     def run!
       show_sql if should_show_sql?
       write_sql if should_write_sql?
       append_sql if should_append_sql?
-      if @options.code.present?
-        eval(@options.code)
-      elsif @options.args.present?
-        @options.args.each { |rb| load(rb) }
+      if effective_config[:code].present?
+        eval(effective_config[:code])
+      elsif effective_config[:args].present?
+        effective_config[:args].each { |rb| load(rb) }
       else
         run_repl!
       end
@@ -48,20 +58,16 @@ module Arql
       Repl.new
     end
 
-    def use_db_cmd_options?
-      @options.db_host.present?
-    end
-
     def should_show_sql?
-      @options.show_sql || db_config[:show_sql]
+      effective_config[:show_sql]
     end
 
     def should_write_sql?
-      @options.write_sql || db_config[:write_sql]
+      effective_config[:write_sql]
     end
 
     def should_append_sql?
-      @options.append_sql || db_config[:append_sql]
+      effective_config[:append_sql]
     end
 
     def show_sql
@@ -71,14 +77,14 @@ module Arql
     end
 
     def write_sql
-      write_sql_file = @options.write_sql || db_config[:write_sql]
+      write_sql_file = effective_config[:write_sql]
       @log_io ||= MultiIO.new
       ActiveRecord::Base.logger = Logger.new(@log_io)
       @log_io << File.new(write_sql_file, 'w')
     end
 
     def append_sql
-      write_sql_file = @options.append_sql || db_config[:append_sql]
+      write_sql_file = effective_config[:append_sql]
       @log_io ||= MultiIO.new
       ActiveRecord::Base.logger = Logger.new(@log_io)
       @log_io << File.new(write_sql_file, 'a')

data/lib/arql/cli.rb

@@ -10,9 +10,9 @@ module Arql
       end
 
       def parse_options!
-        @options = OpenStruct.new(db_adapter: 'mysql2',
-                                  db_encoding: 'UFF-8',
-                                  db_pool: 5,
+        @options = OpenStruct.new(adapter: 'mysql2',
+                                  encoding: 'utf8',
+                                  pool: 5,
                                   config_file: default_config_file,
                                   initializer: default_initializer)
 
@@ -43,35 +43,35 @@ module Arql
           end
 
           opts.on('-ADB_ADAPTER', '--db-adapter=DB_ADAPTER', 'Specify DB Adapter, default is mysql2') do |db_adapter|
-            @options.db_adapter = db_adapter
+            @options.dapter = db_adapter
           end
 
           opts.on('-HDB_HOST', '--db-host=DB_HOST', 'Specify DB host, if specified -E option will be ignored') do |db_host|
-            @options.db_host = db_host
+            @options.host = db_host
           end
 
           opts.on('-PDB_PORT', '--db-port=DB_PORT', 'Specify DB port, if specified -E option will be ignored') do |db_port|
-            @options.db_port = db_port.to_i
+            @options.port = db_port.to_i
           end
 
           opts.on('-DDB_NAME', '--db-name=DB_NAME', 'Specify database name, if specified -E option will be ignored') do |db_name|
-            @options.db_name = db_name
+            @options.database = db_name
           end
 
           opts.on('-UDB_USER', '--db-user=DB_USER', 'Specify database user, if specified -E option will be ignored') do |db_user|
-            @options.db_user = db_user
+            @options.username = db_user
           end
 
           opts.on('-pDB_PASSWORD', '--db-password=DB_PASSWORD', 'Specify database password, if specified -E option will be ignored') do |db_password|
-            @options.db_password = db_password
+            @options.password = db_password
           end
 
           opts.on('-n', '--db-encoding=DB_ENCODING', 'Specify database encoding, default is UTF-8') do |db_encoding|
-            @options.db_encoding = db_encoding
+            @options.encoding = db_encoding
           end
 
           opts.on('-o', '--db-pool=DB_POOL', 'Specify database pool size, default is 5') do |db_pool|
-            @options.db_pool = db_pool
+            @options.pool = db_pool
           end
 
           opts.on('-eCODE', '--eval=CODE', 'evaluate CODE') do |code|

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Liu Xiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2020-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: net-ssh-gateway
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement