arql 0.3.1 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7814d23bef8d728235b779a5d8ddcd76565d7240fd37b7d6d9b62e37ed851d2f
-  data.tar.gz: cd9f77c2a41055bd20c18ec38ae3f461b580c3bfb983b4f73bf23df9fc027408
+  metadata.gz: 754f0123178d350470df65a3b627f3ae3890a3de7668d8422429d661e1d271cf
+  data.tar.gz: 5d8241b6d7ba7fca92cd3a645138276fc2c3b0c8fb7658ba514f16794f63e26a
 SHA512:
-  metadata.gz: ef4eb1f78e9419f02155a0f27d6903adcd553ed071eec9f589a86dd69b0d2ca0a8a858865d23d85ec50284ec7dfa7eac0b2290ba9162dbe56f732545e3d81179
-  data.tar.gz: 69ed39eca6d84f869190b7ee8e49aa5080dcfe13c0a46341a5552a01e41bdf03a8d31099257639fa28ce2dd6d81088d060fec402c79a7c1e6f442b94eda38249
+  metadata.gz: 85e3b47d182b593b9a34055141192073844d257d96fbd2319e83eb3b0444c3f747fcc460819a1f8d7b51110487f00afa27c61f8ef280d49724390123c8d759f1
+  data.tar.gz: a5c8898c8384a7ed8685fe0ce758f797cbb530c627e116ad58610b854496d388063dfb0278a5c53586bd17a38740925d39ff9cc9942bda200436da597abaf644

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.1)
+    arql (0.3.5)
       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)
@@ -20,12 +20,12 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activerecord (6.0.4.1)
-      activemodel (= 6.0.4.1)
-      activesupport (= 6.0.4.1)
-    activesupport (6.0.4.1)
+    activemodel (6.0.4.4)
+      activesupport (= 6.0.4.4)
+    activerecord (6.0.4.4)
+      activemodel (= 6.0.4.4)
+      activesupport (= 6.0.4.4)
+    activesupport (6.0.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -40,22 +40,20 @@ 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.10)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
     mimemagic (0.4.3)
       nokogiri (~> 1)
       rake
-    mini_portile2 (2.6.1)
-    minitest (5.14.4)
+    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)
@@ -81,8 +79,10 @@ GEM
     tzinfo (1.2.9)
       thread_safe (~> 0.1)
     unicode-display_width (1.8.0)
-    yard (0.9.26)
-    zeitwerk (2.5.1)
+    webrick (1.7.0)
+    yard (0.9.27)
+      webrick (~> 1.7.0)
+    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/app.rb

@@ -68,6 +68,8 @@ module Arql
     end
 
     def config
+      @config ||= YAML.load(IO.read(File.expand_path(@options.config_file)), aliases: true).with_indifferent_access
+    rescue ArgumentError
       @config ||= YAML.load(IO.read(File.expand_path(@options.config_file))).with_indifferent_access
     end
 

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

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

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

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.3.1"
+  VERSION = "0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.5
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-10-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,6 +242,7 @@ 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/concerns.rb
@@ -281,7 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Rails ActiveRecord + Pry is the best SQL query editor