arql 0.1.27 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7294d448effb453450c0af6a679d949918e23be34fa0323b570ac0e53f408e0
-  data.tar.gz: b8efa518ebd003348f7d5da2659a126bf8d287ae5a6280efb35e0bf105b262ca
+  metadata.gz: 48ce3b7b50ccdb8ab338b73e1895b73cd7ebec18ef779c18931603353e709d12
+  data.tar.gz: 3a9bf2b11cdf4be30ab58590aedb81ea2944f6341ca26fd2ab584c9a490cb512
 SHA512:
-  metadata.gz: acc67b2f93e5321bb45748d356d3eb2c2d76c13134f27d9c9b1983cd9e1d53384e961371f6b859ff08613d1d87de3425202d9fcb3911e8b1a71a286c44a74e1e
-  data.tar.gz: cd98b20c4da880b46c052de32f69fea7bb567524ad515ee23cd4000b3ebaeb38f5d75c975f4dd22e2f7c30be5f817cd5d6b94e1f244e2479f77e47923166c459
+  metadata.gz: 1cb190b2e90d18b08ccc98878b5db934ebb1e008fc4aba6a850fd4e384e917d02f14837700a06aca8bc5bdc7799a8ea6ffd5c737bb38260304f60166db3a63ce
+  data.tar.gz: 3b9c6e813b91904cf39bd044c1ac86925802f52d6f0a4e7a7d3f10f2309db812e01cecb0476555bbcb751df73f640c941fe3e307a96c05f9101d854659e53a70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.1.27)
+    arql (0.1.32)
       activerecord (~> 6.0.3)
       activesupport (~> 6.0.3)
       mysql2 (~> 0.5.3)
@@ -29,14 +29,14 @@ GEM
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.1.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     minitest (5.14.1)
     mysql2 (0.5.3)
-    net-ssh (6.0.2)
+    net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
     pry (0.13.1)
@@ -59,7 +59,7 @@ GEM
       thread_safe (~> 0.1)
     unicode-display_width (1.7.0)
     yard (0.9.25)
-    zeitwerk (2.3.0)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby

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: {})
 
@@ -40,7 +37,7 @@ module Arql
           end
 
           opts.on('-aDB_ADAPTER', '--db-adapter=DB_ADAPTER', 'Specify database Adapter, default is mysql2') do |db_adapter|
-            @options.dapter = db_adapter
+            @options.adapter = db_adapter
           end
 
           opts.on('-hDB_HOST', '--db-host=DB_HOST', 'Specify database host') do |db_host|

data/lib/arql/ext/kernel.rb

@@ -2,4 +2,64 @@ module Kernel
   def sql(sql)
     ActiveRecord::Base.connection.exec_query(sql)
   end
+
+  def print_tables(format = :md)
+    require 'terminal-table'
+
+    tables = ActiveRecord::Base.connection.tables.map do |table_name|
+      {
+        table: table_name,
+        table_comment: ActiveRecord::Base.connection.table_comment(table_name) || '',
+        columns: ::ActiveRecord::Base.connection.columns(table_name)
+      }
+    end
+
+    outputs = tables.map do |table|
+      table_name = table[:table]
+      table_comment = table[:table_comment]
+      case format
+      when :md
+        "# #{table_name} #{table_comment}\n\n" +
+          Terminal::Table.new { |t|
+          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+          t.rows = table[:columns].map { |column|
+            pk = if column.name == ::ActiveRecord::Base.connection.primary_key(table_name)
+                   'Y'
+                 else
+                   ''
+                 end
+            [pk, "`#{column.name}`", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
+             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
+          }
+          t.style = {
+            border_top: false,
+            border_bottom: false,
+            border_i: '|'
+          }
+        }.to_s.lines.map { |l| '  ' + l }.join
+      when :org
+        "* #{table_name} #{table_comment}\n\n" +
+          Terminal::Table.new { |t|
+          t.headings = ['PK', 'Name', 'SQL Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+          t.rows = table[:columns].map { |column|
+            pk = if column.name == ::ActiveRecord::Base.connection.primary_key(table_name)
+                   'Y'
+                 else
+                   ''
+                 end
+            [pk, "=#{column.name}=", column.sql_type, column.sql_type_metadata.limit || '', column.sql_type_metadata.precision || '',
+             column.sql_type_metadata.scale || '', column.default || '', column.null, column.comment || '']
+          }
+          t.style = {
+            border_top: false,
+            border_bottom: false,
+          }
+        }.to_s.lines.map { |l| '  ' + l.gsub(/^\+|\+$/, '|') }.join
+      when :sql
+        "-- Table: #{table_name}\n\n" + ActiveRecord::Base.connection.exec_query("show create table `#{table_name}`").rows.last.last + ';'
+      end
+    end
+
+    outputs.each { |out| puts out; puts }
+  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.prompt).yellow, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.27"
+  VERSION = "0.1.32"
 end

metadata

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