arql 0.1.28 → 0.1.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a60cf3e7b24cf3967d9e566fbb89011ce12b727bd6ef9f4e6e7b83aa2ef58bfc
-  data.tar.gz: 06152be12dff3594db513cbca09e8f53d0250d634d05b4a4bf1e1532c593097a
+  metadata.gz: 823a5527aa1dfc5e12de5284dc43d7afcba4978608a00f31bcf53e8058e4ad67
+  data.tar.gz: ed6026bf27d00fc953400a4776081d7f17de730dc70e96143cd448b42e21d779
 SHA512:
-  metadata.gz: b2a3f77a0119b6188437187fb23bc8da4d0129f038d325b2112dcc67eb4621484bed0c3cef28bcad6f7d2eb35957c3977ad923cdef667108b2ecfc15a4030296
-  data.tar.gz: 309d4f09b2b475625e006a66faea1cef2473368bab41933188de5f47cc75bd2b6a9ee47a6c86fa3096f84e118c1cce402be18b65605bf76564dee123c092364f
+  metadata.gz: a47d663c5b8a2297e16f895b1d74add187da511b3abeec29e142d03a2ec6ae9fe577e942c8a471590f6312c8f937945912ea12db1e620fcf29973dbac5f4297f
+  data.tar.gz: f700d21883edbddef9c82f748dbc01c99ba984cd52048a5e9e93fc29d701036ada9fe07441746020b400a8ed632343dae3a6cdd3d04848fc0a2781b2875c9006

data/Gemfile.lock

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

data/lib/arql/app.rb

@@ -36,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!
@@ -56,14 +57,16 @@ 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]
+      sc = config[@options.env]
+      sc[:database] = File.expand_path(sc[:database]) if sc[:adapter] == 'sqlite3'
+      sc
     end
 
     def effective_config

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

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

metadata

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