arql 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21ead482a62e2bad4589f8756b4c5db0e5d4152d54e08b2707bf3ce1441e24cd
-  data.tar.gz: d51796aed86a97001c59e927073a8fefdc82c14c5b45a8417db4aed167ab4125
+  metadata.gz: 26a222ddbbce9305531742f9b9f160406fe36351aaac3026a1c93879de257e35
+  data.tar.gz: f324c816f59dc993fca822d5482f0ee43cd973f1659abcd2f2fa48b7fd80acd7
 SHA512:
-  metadata.gz: 8be01074982b47fb01a0992f35e2504379ef51edbc9ad9f29d14f31aeedb0d297542ca7f9f98671a3b5a4a38567858c83a60f2025eed63832dc1951b994e4a3a
-  data.tar.gz: f66fea7d15fbd6a99e7c84ebe90540d6c86467ed108c94707b07fe081251d1d4e647c43d8577e560eaf7bdfe56c286069a5ca95d5de27ce76a7bf97aa0ea4043
+  metadata.gz: 5935a72b159a97a09dbdcfa761ba57b4375c7d78a680569ba8cd88a6f95fb9543b9d70e56d62c0973dc6a99a11347d32f87bce5f8b9ea5335c35f3176b9e5ca4
+  data.tar.gz: 84313b888ed601eafdce1b5e1867ca7580058b575e34de9291c489b4e318966ec169bff22c1d070960f3d1cf55020e8930b2212d78300a331ce122ccc868c87e

data/.solargraph.yml

@@ -0,0 +1,10 @@
+require:
+- actioncable
+- actionmailer
+- actionpack
+- actionview
+- activejob
+- activemodel
+- activerecord
+- activestorage
+- activesupport

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.3.2)
+    arql (0.3.6)
       activerecord (>= 6.0.3, < 6.2.0)
       activesupport (~> 6.0.3)
       caxlsx (~> 3.0.2)
@@ -10,7 +10,7 @@ PATH
       net-ssh-gateway (~> 2.0.0)
       pry (~> 0.13.1)
       pry-byebug (~> 3.9.0)
-      pry-doc (~> 1.2.0)
+      pry-doc (>= 1.0.0)
       rainbow (~> 3.0.0)
       roo (~> 2.8.3)
       sqlite3 (~> 1.4)
@@ -40,7 +40,7 @@ GEM
     coderay (1.1.3)
     composite_primary_keys (12.0.10)
       activerecord (~> 6.0.0)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     htmlentities (4.3.4)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
@@ -48,14 +48,12 @@ GEM
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
-    mini_portile2 (2.6.1)
     minitest (5.15.0)
     mysql2 (0.5.3)
     net-ssh (6.1.0)
     net-ssh-gateway (2.0.0)
       net-ssh (>= 4.0.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.0-x86_64-darwin)
       racc (~> 1.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -63,7 +61,7 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
-    pry-doc (1.2.0)
+    pry-doc (1.3.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
     racc (1.6.0)
@@ -84,7 +82,7 @@ GEM
     webrick (1.7.0)
     yard (0.9.27)
       webrick (~> 1.7.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   ruby

data/arql.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |spec|
   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.2.0'
+  spec.add_dependency 'pry-doc', '>= 1.0.0'
   spec.add_dependency 'rainbow', '~> 3.0.0'
   spec.add_dependency 'terminal-table', '~> 1.8.0'
   spec.add_dependency 'table_print', '~> 1.5.6'

data/lib/arql/commands/sandbox.rb

@@ -0,0 +1,33 @@
+module Arql::Commands
+  module Sandbox
+    class << self
+      attr_accessor :enabled
+
+      @sandbox_callback = proc do
+        begin_transaction(joinable: false)
+      end
+
+      def enter
+        ActiveRecord::ConnectionAdapters::AbstractAdapter.set_callback(:checkout, :after, &@sandbox_callback)
+        ActiveRecord::Base.connection.begin_transaction(joinable: false)
+        @enabled = true
+      end
+
+      def quit
+        ActiveRecord::ConnectionAdapters::AbstractAdapter.skip_callback(:checkout, :after, &@sandbox_callback)
+        @enabled = false
+
+        puts "begin_transaction callbacks removed."
+        puts "You still have open %d transactions open, don't forget commit or rollback them." % ActiveRecord::Base.connection.open_transactions if ActiveRecord::Base.connection.open_transactions > 0
+      end
+    end
+
+    Pry.commands.block_command 'sandbox-enter' do
+      Sandbox.enter
+    end
+
+    Pry.commands.block_command 'sandbox-quit' do
+      Sandbox.quit
+    end
+  end
+end

data/lib/arql/commands/vd.rb

@@ -0,0 +1,46 @@
+require 'arql/vd'
+
+module Arql::Commands
+  module VD
+    class << self
+      def get_table_name(name)
+        name = name.to_s
+        return name if name =~ /^[a-z]/
+        if Object.const_defined?(name)
+          klass = Object.const_get(name)
+          return klass.table_name if klass < ActiveRecord::Base
+        end
+        name
+      end
+
+      def table_info_vd(table_name)
+        Arql::VD.new do |vd|
+          table_info(table_name).each { |row| vd << row }
+        end
+      end
+
+      def table_info(table_name)
+        t = []
+        t << ['PK', 'Name', 'SQL Type', 'Ruby Type', 'Limit', 'Precision', 'Scale', 'Default', 'Nullable', 'Comment']
+        connection = ::ActiveRecord::Base.connection
+        connection.columns(table_name).each do |column|
+          pk = if [connection.primary_key(table_name)].flatten.include?(column.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
+        t
+      end
+    end
+
+    Pry.commands.block_command 'vd' do |name|
+      table_name = VD::get_table_name(name)
+      VD::table_info_vd(table_name)
+    end
+  end
+end

data/lib/arql/commands.rb

@@ -4,6 +4,8 @@ require 'arql/commands/table'
 require 'arql/commands/reconnect'
 require 'arql/commands/redefine'
 require 'arql/commands/show_sql'
+require 'arql/commands/sandbox'
+require 'arql/commands/vd'
 
 module Arql::Commands
 end

data/lib/arql/definition.rb

@@ -1,4 +1,5 @@
 require 'arql/concerns'
+require 'arql/vd'
 module Arql
   module Extension
     extend ActiveSupport::Concern
@@ -9,6 +10,15 @@ module Arql
       }
     end
 
+    def vd
+      VD.new do |vd|
+        vd << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
+        self.class.connection.columns(self.class.table_name).each do |column|
+          vd << [column.name, read_attribute(column.name), column.sql_type, column.comment || '']
+        end
+      end
+    end
+
     def v
       t = []
       t << ['Attribute Name', 'Attribute Value', 'SQL Type', 'Comment']
@@ -49,6 +59,12 @@ module Arql
         puts Commands::Table::table_info_table(table_name)
       end
 
+      def vd
+        table_name = Commands::Table::get_table_name(name)
+        Commands::VD::table_info_vd(table_name)
+        nil
+      end
+
       def v
         table_name = Commands::Table::get_table_name(name)
         Commands::Table::table_info(table_name)
@@ -229,6 +245,10 @@ module Arql
         records.t(*attrs, **options)
       end
 
+      def vd(*attrs, **options)
+        records.vd(*attrs, **options)
+      end
+
       def v
         records.v
       end

data/lib/arql/ext/array.rb

@@ -1,3 +1,5 @@
+require 'arql/vd'
+
 class Array
   def to_insert_sql(batch_size=500)
     raise 'All element should be an ActiveRecord instance object' unless all? { |e| e.is_a?(ActiveRecord::Base) }
@@ -48,6 +50,33 @@ class Array
     end
   end
 
+  def vd(*attrs, **options)
+    if (attrs.present? || options.present? && options[:except]) && present? && first.is_a?(ActiveRecord::Base)
+      column_names = first.attribute_names.map(&:to_sym)
+      attrs = attrs.flat_map { |e| e.is_a?(Regexp) ? column_names.grep(e) : e }.uniq
+      if options.present? && options[:except]
+        attrs = column_names if attrs.empty?
+        if options[:except].is_a?(Regexp)
+          attrs.reject! { |e| e =~ options[:except] }
+        else
+          attrs -= [options[:except]].flatten
+        end
+      end
+
+      Arql::VD.new do |vd|
+        vd << attrs
+        each do |e|
+          vd << e.attributes.values_at(*attrs.map(&:to_s))
+        end
+      end
+    else
+      Arql::VD.new do |vd|
+        v.each { |row| vd << row if row }
+      end
+    end
+    nil
+  end
+
   def v
     return self unless present?
     t = []

data/lib/arql/multi_io.rb

@@ -5,7 +5,14 @@ module Arql
     end
 
     def write(*args)
-      @targets.each {|t| t.write(*args)}
+      @targets.each do |t|
+        if t.isatty
+          t.write(*args)
+        else
+          t.write(*(args.map { |str| str.gsub(/\e\[(\d+)m/, '')}))
+        end
+        t.flush
+      end
     end
 
     def close

data/lib/arql/repl.rb

@@ -35,7 +35,12 @@ module Arql
                                  "(#{obj}:#{nest_level})"
                                end
          end
-         "%s#{Rainbow('@').green}%s#{nest_level_prompt} [%d] %s " % [Rainbow('ARQL').red, Rainbow(App.prompt).yellow, pry_instance.input_ring.count, Rainbow('❯').green]
+          if Arql::Commands::Sandbox.enabled
+            sandbox_indicator = ' [%s] ' % Rainbow('sandbox').green.bright
+          else
+            sandbox_indicator = ''
+          end
+         "%s#{Rainbow('@').green}%s%s#{nest_level_prompt} [%d] %s " % [Rainbow('ARQL').red, Rainbow(App.prompt).yellow, sandbox_indicator, pry_instance.input_ring.count, Rainbow('❯').green]
        end]
     end
   end

data/lib/arql/vd.rb

@@ -0,0 +1,41 @@
+require 'csv'
+
+module Arql
+  class VD
+    COMMAND = 'vd'
+
+    attr_accessor :rows
+
+    def initialize
+      return unless check_command_installation
+      @rows = []
+      yield self
+      command = "#{COMMAND} -f csv"
+      IO.popen(command, 'w+') do |io|
+        io.puts(csv)
+        io.close_write
+      end
+    end
+
+    def <<(row)
+      rows << row
+    end
+
+    def csv
+      CSV.generate do |csv|
+        rows.each do |row|
+          csv << row
+        end
+      end
+    end
+
+    def check_command_installation
+      `which #{COMMAND}`
+      if $?.exitstatus != 0
+        puts "Please install vd (visidata) command, see: https://www.visidata.org/"
+      else
+        true
+      end
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.2"
+  VERSION = "0.3.6"
 end

data/lib/arql.rb

@@ -11,6 +11,7 @@ require "arql/ssh_proxy"
 require "arql/app"
 require "arql/cli"
 require "arql/mysqldump"
+require "arql/vd"
 
 module Arql
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-27 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -132,16 +132,16 @@ dependencies:
   name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".solargraph.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -241,8 +242,10 @@ files:
 - lib/arql/commands/models.rb
 - lib/arql/commands/reconnect.rb
 - lib/arql/commands/redefine.rb
+- lib/arql/commands/sandbox.rb
 - lib/arql/commands/show_sql.rb
 - lib/arql/commands/table.rb
+- lib/arql/commands/vd.rb
 - lib/arql/concerns.rb
 - lib/arql/concerns/global_data_definition.rb
 - lib/arql/concerns/table_data_definition.rb
@@ -261,6 +264,7 @@ files:
 - lib/arql/repl.rb
 - lib/arql/ssh_proxy.rb
 - lib/arql/ssh_proxy_patch.rb
+- lib/arql/vd.rb
 - lib/arql/version.rb
 homepage: https://github.com/lululau/arql
 licenses: