arql 0.1.26 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ed88946e69a6690211fae5d85975ee9674f67cf865cbd8cc472f91cb053f5e6
-  data.tar.gz: 44d68d0a13e023c5c69402f92a07fe356fd234a73ba3664becfc17c916c95815
+  metadata.gz: 720e28d1a714ac8e3d116c6f63ef734476895b28502df43a486a9f7f4348430f
+  data.tar.gz: 654c7011a05dc8631c418504953def7870d33d2fa22922fb3292992e8dbe6ff4
 SHA512:
-  metadata.gz: 25a93383de5e12ec51a1b7986aeec653b0d7c54c75863deff606487ac4a07ee0baec5b52d56f9562900d91e74f14e964ee0d52662b45a02236cc9cb5ca2c9aa6
-  data.tar.gz: 5fafcbe5ed60878e8614cacff2147eb0d29c58e39a30e4ca85e8c2d6d74d7ee2b70fabee880f275a3ae8194df5aa6d3c857396b3930ecb36d1f84087f348f1cd
+  metadata.gz: a5f9271ae382fa37b7ec06907d17a17b47129390f4f0f144aff1b0cf4bbb8ee9bad7fda54cf5afb8d4029d3b02f92725de51968a345367c06c2298eef54c91a6
+  data.tar.gz: 72cbb2b5895da48dcb93b252d43882b6f6005cbe1638d284135e61404fee9a0e96f0ce0db3d585a3b23b2fa256381b37ee05f5abec4072e8af4c452f61608747

data/Gemfile.lock

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

data/lib/arql/app.rb

@@ -4,11 +4,19 @@ module Arql
   class App
 
     class << self
-      attr_accessor :log_io
+      attr_accessor :log_io, :env, :prompt
 
       def config
         @@effective_config
       end
+
+      def prompt
+        if env
+          env
+        else
+          File.basename(@@effective_config[:database])
+        end
+      end
     end
 
     def initialize(options)
@@ -17,6 +25,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 +44,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 +65,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.prompt).yellow, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/ssh_proxy.rb

@@ -9,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/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.26"
+  VERSION = "0.1.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.31
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2