arql 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc86cf0d1862e52ea16793c51d8bd46e9c0d9463bbb2c096bb265e524d74edf9
-  data.tar.gz: d66f20e0a5f969179dcf70404f3a9c4c698618793e51c3bb0ddd928c7668ef8f
+  metadata.gz: 61c15f55639c3eb58102f4f03c4c5549edf06433da1037efb62372aad6ce5742
+  data.tar.gz: 41d5e0bac8a8d5fdeedaf2d8e23db093be42fb6f8476de674dc1aece8da6c2dd
 SHA512:
-  metadata.gz: 5b201e845a4c691a274874b31c9b3a9cd3d23212d47496becea0ad167653f79126071329ba0f1c5bcc4bbeb6552a2c0b240006aa11f8c3ae36828ca931f595e7
-  data.tar.gz: e2d7bd2a8a3da1122e8624ef09e6854aac9f7708b4c2bd88985d43d0a5610e0fe4a5bfd85e6764492e9c8f7067209de3959fd6364e15ec4da51d0525ed722e87
+  metadata.gz: 13a8e6dc10a7953c02e826e7f4bdd4674e41d7a9e436001b92985fcbf280816ebd916d5cd8e4e59368243c9b94e260bf8bddd4f49139d0f1f46b641dac2125d3
+  data.tar.gz: 0f128278d9de51ff5f95a1c1f598159b2aaf383da947a312579b093a9fccd898fa3e4b9275531d9739455faea51329283c82ca2d266e81c78901316dabc97c40

data/Gemfile.lock

@@ -1,13 +1,16 @@
 PATH
   remote: .
   specs:
-    arql (0.1.2)
-      activerecord (~> 6.0.0)
-      activesupport (~> 6.0.0)
+    arql (0.1.3)
+      activerecord (~> 6.0.3)
+      activesupport (~> 6.0.3)
       mysql2 (~> 0.5.3)
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
+      pry-doc (~> 1.1.0)
+      rainbow (~> 3.0.0)
+      terminal-table (~> 1.8.0)
 
 GEM
   remote: https://rubygems.org/
@@ -40,10 +43,18 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
+    pry-doc (1.1.0)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    rainbow (3.0.0)
     rake (12.3.3)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    unicode-display_width (1.7.0)
+    yard (0.9.25)
     zeitwerk (2.3.0)
 
 PLATFORMS

data/arql.gemspec

@@ -24,9 +24,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'mysql2', '~> 0.5.3'
-  spec.add_dependency 'activerecord', '~> 6.0.0'
-  spec.add_dependency 'activesupport', '~> 6.0.0'
+  spec.add_dependency 'activerecord', '~> 6.0.3'
+  spec.add_dependency 'activesupport', '~> 6.0.3'
   spec.add_dependency 'net-ssh-gateway', '~> 2.0.0'
   spec.add_dependency 'pry', '~> 0.13.1'
   spec.add_dependency 'pry-byebug', '~> 3.9.0'
+  spec.add_dependency 'pry-doc', '~> 1.1.0'
+  spec.add_dependency 'rainbow', '~> 3.0.0'
+  spec.add_dependency 'terminal-table', '~> 1.8.0'
 end

data/lib/arql/app.rb

@@ -2,6 +2,17 @@ require 'net/ssh/gateway'
 
 module Arql
   class App
+
+    class << self
+      def config
+        @@effective_config
+      end
+
+      def local_ssh_proxy_port
+        @@local_ssh_proxy_port
+      end
+    end
+
     def initialize(options)
       @options = options
       Connection.open(connect_options)
@@ -21,11 +32,11 @@ module Arql
 
     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])
+      @ssh_gateway = Net::SSH::Gateway.new(ssh_config[:host], ssh_config[:user], ssh_config.slice(:port, :password).symbolize_keys)
+      @@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
+        port: @@local_ssh_proxy_port
       }
     end
 
@@ -38,7 +49,7 @@ module Arql
     end
 
     def effective_config
-      @effective_config ||= selected_config.merge(@options.to_h)
+      @@effective_config ||= selected_config.deep_merge(@options.to_h)
     end
 
     def run!

data/lib/arql/cli.rb

@@ -14,7 +14,8 @@ module Arql
                                   encoding: 'utf8',
                                   pool: 5,
                                   config_file: default_config_file,
-                                  initializer: default_initializer)
+                                  initializer: default_initializer,
+                                  ssh: {})
 
 
         OptionParser.new do |opts|
@@ -34,7 +35,7 @@ module Arql
             @options.initializer = initializer
           end
 
-          opts.on('-EENVIRON', '--env=ENVIRON', 'Specify config environment.') do |env|
+          opts.on('-eENVIRON', '--env=ENVIRON', 'Specify config environment.') do |env|
             @options.env = env
           end
 
@@ -42,31 +43,31 @@ module Arql
             @options.config_file = config_file
           end
 
-          opts.on('-ADB_ADAPTER', '--db-adapter=DB_ADAPTER', 'Specify DB Adapter, default is mysql2') do |db_adapter|
+          opts.on('-aDB_ADAPTER', '--db-adapter=DB_ADAPTER', 'Specify database Adapter, default is mysql2') do |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|
+          opts.on('-hDB_HOST', '--db-host=DB_HOST', 'Specify database host') do |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|
+          opts.on('-pDB_PORT', '--db-port=DB_PORT', 'Specify database port') do |db_port|
             @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|
+          opts.on('-dDB_NAME', '--db-name=DB_NAME', 'Specify database name') do |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|
+          opts.on('-uDB_USER', '--db-user=DB_USER', 'Specify database user') do |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|
+          opts.on('-PDB_PASSWORD', '--db-password=DB_PASSWORD', 'Specify database password') do |db_password|
             @options.password = db_password
           end
 
-          opts.on('-n', '--db-encoding=DB_ENCODING', 'Specify database encoding, default is UTF-8') do |db_encoding|
+          opts.on('-n', '--db-encoding=DB_ENCODING', 'Specify database encoding, default is utf8') do |db_encoding|
             @options.encoding = db_encoding
           end
 
@@ -74,11 +75,31 @@ module Arql
             @options.pool = db_pool
           end
 
-          opts.on('-eCODE', '--eval=CODE', 'evaluate CODE') do |code|
+          opts.on('-HSSH_HOST', '--ssh-host=SSH_HOST', 'Specify SSH host') do |ssh_host|
+            @options.ssh[:host] = ssh_host
+          end
+
+          opts.on('-OSSH_PORT', '--ssh-port=SSH_PORT', 'Specify SSH port') do |ssh_port|
+            @options.ssh[:port] = ssh_port.to_i
+          end
+
+          opts.on('-USSH_USER', '--ssh-user=SSH_USER', 'Specify SSH user') do |ssh_user|
+            @options.ssh[:user] = ssh_user
+          end
+
+          opts.on('-WSSH_PASSWORD', '--ssh-password=SSH_PASSWORD', 'Specify SSH password') do |ssh_password|
+            @options.ssh[:password] = ssh_password
+          end
+
+          opts.on('-LSSH_LOCAL_PORT', '--ssh-local-port=SSH_LOCAL_PORT', 'Specify local SSH proxy port') do |local_port|
+            @options.ssh[:local_port] = local_port.to_i
+          end
+
+          opts.on('-ECODE', '--eval=CODE', 'evaluate CODE') do |code|
             @options.code = code
           end
 
-          opts.on('-s', '--show-sql', 'Show SQL on STDOUT') do
+          opts.on('-S', '--show-sql', 'Show SQL on STDOUT') do
             @options.show_sql = true
           end
 
@@ -86,11 +107,11 @@ module Arql
             @options.write_sql = file
           end
 
-          opts.on('-aOUTPUT', '--append-sql=OUTPUT', 'Append SQL to OUTPUT file') do |file|
+          opts.on('-AOUTPUT', '--append-sql=OUTPUT', 'Append SQL to OUTPUT file') do |file|
             @options.append_sql = file
           end
 
-          opts.on('-h', '--help', 'Prints this help') do
+          opts.on('', '--help', 'Prints this help') do
             puts opts
             exit
           end

data/lib/arql/commands/info.rb

@@ -0,0 +1,37 @@
+module Arql::Commands
+  module Info
+    class << self
+      def db_info
+        <<~EOF
+
+        Database Connection Information:
+            Host:      #{Arql::App.config[:host]}
+            Port:      #{Arql::App.config[:port]}
+            Username:  #{Arql::App.config[:username]}
+            Password:  #{Arql::App.config[:password].gsub(/./, '*')}
+            Database:  #{Arql::App.config[:database]}
+            Adapter:   #{Arql::App.config[:adapter]}
+            Encoding:  #{Arql::App.config[:encoding]}
+            Pool Size: #{Arql::App.config[:pool]}
+        EOF
+      end
+
+      def ssh_info
+        <<~EOF
+
+        SSH Connection Information:
+            Host:       #{Arql::App.config[:ssh][:host]}
+            Port:       #{Arql::App.config[:ssh][:port]}
+            Username:   #{Arql::App.config[:ssh][:user]}
+            Password:   #{Arql::App.config[:ssh][:password].gsub(/./, '*')}
+            Local Port: #{Arql::App.local_ssh_proxy_port}
+        EOF
+      end
+    end
+
+    Pry.commands.block_command 'info' do
+      puts Info::db_info
+      puts Info::ssh_info if Arql::App.config[:ssh].present?
+    end
+  end
+end

data/lib/arql/commands/models.rb

@@ -0,0 +1,27 @@
+require 'terminal-table'
+
+module Arql::Commands
+  module Models
+    class << self
+      def models
+        Terminal::Table.new do |t|
+          t << ['Table Name', 'Model Class', 'Abbr']
+          t << :separator
+          Arql::Definition.models.each do |definition|
+            t << [definition[:table], definition[:model].name, definition[:abbr] || '']
+          end
+        end
+      end
+
+    end
+
+    Pry.commands.block_command 'models' do
+      puts
+      puts Models::models
+    end
+
+    Pry.commands.alias_command 'm', 'models'
+    Pry.commands.alias_command 'l', 'models'
+    Pry.commands.alias_command 'tables', 'models'
+  end
+end

data/lib/arql/commands/table.rb

@@ -0,0 +1,34 @@
+require 'terminal-table'
+
+module Arql::Commands
+  module Table
+    class << self
+      def table_info(table_name)
+        Terminal::Table.new do |t|
+          t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+          t << :separator
+          connection = ::ActiveRecord::Base.connection
+          connection.columns(table_name).each do |column|
+            pk = if column.name == connection.primary_key(table_name)
+                    'Y'
+                  else
+                    ''
+                  end
+            t << [pk, column.name, column.sql_type,
+                  column.sql_type_metadata.type, column.sql_type_metadata.limit || '',
+                  column.sql_type_metadata.precision || '', column.sql_type_metadata.scale || '', column.default || '',
+                  column.null, column.comment || '']
+          end
+        end
+      end
+
+    end
+
+    Pry.commands.block_command 'table' do |table_name|
+      puts
+      puts Table::table_info(table_name)
+    end
+
+    Pry.commands.alias_command 't', 'table'
+  end
+end

data/lib/arql/commands.rb

@@ -0,0 +1,6 @@
+require 'arql/commands/info'
+require 'arql/commands/models'
+require 'arql/commands/table'
+
+module Arql::Commands
+end

data/lib/arql/definition.rb

@@ -1,6 +1,13 @@
 module Arql
   class Definition
+    class << self
+      def models
+        @@models ||= []
+      end
+    end
+
     def initialize
+      @@models = []
       ActiveRecord::Base.connection.tap do |conn|
         conn.tables.each do |table_name|
           conn.primary_key(table_name).tap do |pkey|
@@ -14,7 +21,16 @@ module Arql
               end.tap do |clazz|
                 Object.const_set(const_name, clazz).tap do |const|
                   const_name.gsub(/[a-z]*/, '').tap do |abbr|
-                    Object.const_set abbr, const unless Object.const_defined?(abbr)
+                    unless Object.const_defined?(abbr)
+                      Object.const_set abbr, const
+                      abbr_const = abbr
+                    end
+
+                    @@models << {
+                      model: const,
+                      abbr: abbr_const,
+                      table: table_name
+                    }
                   end
                 end
               end

data/lib/arql/id.rb

@@ -0,0 +1,59 @@
+module Arql
+  class ID
+    @worker_id_bits = 5
+    @data_center_id_bits = 5
+    @max_worker_id = -1 ^ (-1 << @worker_id_bits)
+    @max_data_center_id = -1 ^ (-1 << @data_center_id_bits)
+
+    @sequence_bits = 12
+    @worker_id_shift = @sequence_bits
+    @data_center_id_shift = @sequence_bits + @worker_id_shift
+    @timestamp_left_shift = @sequence_bits + @worker_id_bits + @data_center_id_bits
+    @sequence_mask = -1 ^ (-1 << @sequence_bits)
+
+    @id_epoch = (Time.new(2018, 1, 1, 0, 0, 0).to_f * 1000).to_i
+    @worker_id = 0
+    @data_center_id = 0
+    @sequence = 0
+
+    @last_timestamp = -1
+
+    class << self
+      def long
+        ts = (Time.now.to_f * 1000).to_i
+        if ts < @last_timestamp
+          raise 'Clock moved backwards.'
+        end
+
+        if ts == @last_timestamp
+          @sequence = (@sequence + 1) & @sequence_mask
+          if (@sequence == 0)
+            ts = til_next_millis(@last_timestamp)
+          end
+        else
+          @sequence = 0
+        end
+        @last_timestamp = ts
+
+        ((ts - @id_epoch) << @timestamp_left_shift) | (@data_center_id << @data_center_id_shift) | (@worker_id << @worker_id_shift) | @sequence
+      end
+
+      def uuid
+        require 'securerandom'
+        SecureRandom.uuid.gsub('-', '')
+      end
+
+      private
+
+      def til_next_millis(last_timestamp)
+        ts = (Time.now.to_f * 1000).to_i
+        while ts <= last_timestamp
+          ts = (Time.now.to_f * 1000).to_i
+        end
+        ts
+      end
+    end
+  end
+end
+
+::ID = Arql::ID

data/lib/arql/repl.rb

@@ -1,5 +1,7 @@
 require 'pry'
 require 'pry-byebug'
+require 'arql/commands'
+require 'rainbow'
 
 module Arql
   class Repl
@@ -29,7 +31,7 @@ module Arql
          else
            nest_level_prompt = "(#{obj}:#{nest_level})"
          end
-         "ARQL#{nest_level_prompt} -> "
+         "%s#{nest_level_prompt} %s " % [Rainbow('ARQL').red, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/version.rb

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

data/lib/arql.rb

@@ -1,6 +1,7 @@
 require 'active_support/all'
 require 'active_record'
 require "arql/version"
+require 'arql/id'
 require 'arql/multi_io'
 require "arql/connection"
 require "arql/definition"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Liu Xiang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: terminal-table
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 description: Use ActiveRecord and Pry as your favorite SQL query editor.
 email:
 - liuxiang921@gmail.com
@@ -116,8 +158,13 @@ files:
 - lib/arql.rb
 - lib/arql/app.rb
 - lib/arql/cli.rb
+- lib/arql/commands.rb
+- lib/arql/commands/info.rb
+- lib/arql/commands/models.rb
+- lib/arql/commands/table.rb
 - lib/arql/connection.rb
 - lib/arql/definition.rb
+- lib/arql/id.rb
 - lib/arql/multi_io.rb
 - lib/arql/repl.rb
 - lib/arql/version.rb