arql 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acf04b3eab704e69a043994e5f3529315e1e8aa57cf9167867a30213120a3fe5
-  data.tar.gz: 782757a05d29076e1761dfbaebed91b244e01e89a0de4f69b6e239c48dc0c424
+  metadata.gz: f4f6b01a4cae5f453322b2adf85b21ca4442d83dc07c504b73048b2640322af5
+  data.tar.gz: 78b66856a6bb72ae2247b3f1f6ea82434696fd5f5f345fda904f6017fcd4c009
 SHA512:
-  metadata.gz: d204ef54833e2dae7acf18ed13632da41baab1dcf149514abe7064cfac51ea9ea2a6556640c2ad0df1a84993827c7ee3afbb800773ec07620dac86b6b81d109f
-  data.tar.gz: a8706a7ae9acf7f06a52a733f871e35c57706d247ea44edd8462f453fb7f1471f28fd5e44f5e942c2fcae184721b5e53ef6242a026d38ae106d7aa5793f6fc06
+  metadata.gz: d01f9fe3b5a3264476e76eb8446054daec67648edefe1d67c7b1c97ed96f8695d924b48b4a5c7b3f60ac535ccfdb9919d2106f6517b7f898289c8970a0574642
+  data.tar.gz: c6be97e00d33908f45866c267b054c913e615b4f594b6baccf72d374a8e92b30136b7cd4e122cacdd7ffbf80dd1a8925b2e7e2a676edf4a2aec0f56a9058e054

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    arql (0.1.0)
+    arql (0.1.1)
       activerecord (~> 6.0.0)
       activesupport (~> 6.0.0)
       mysql2 (~> 0.5.3)

data/arql.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Liu Xiang"]
   spec.email         = ["liuxiang921@gmail.com"]
 
-  spec.summary       = %{Rails ActiveRecord is the best SQL query editor.}
-  spec.description   = %{Rails ActiveRecord is the best SQL query editor.}
+  spec.summary       = %{Rails ActiveRecord + Pry is the best SQL query editor}
+  spec.description   = %{Use ActiveRecord and Pry as your favorite SQL query editor.}
   spec.homepage      = "https://github.com/lululau/arql"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")

data/lib/arql/app.rb

@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash'
-
 module Arql
   class App
     def initialize(options)
@@ -21,7 +19,7 @@ module Arql
           port: @options.db_port
         }
       else
-        config[:db][@options.env]
+        db_config
       end
     end
 
@@ -29,7 +27,14 @@ module Arql
       @config ||= YAML.load(IO.read(@options.config_file)).with_indifferent_access
     end
 
+    def db_config
+      config[:db][@options.env]
+    end
+
     def run!
+      show_sql if should_show_sql?
+      write_sql if should_write_sql?
+      append_sql if should_append_sql?
       if @options.code.present?
         eval(@options.code)
       elsif @options.args.present?
@@ -46,5 +51,37 @@ module Arql
     def use_db_cmd_options?
       @options.db_host.present?
     end
+
+    def should_show_sql?
+      @options.show_sql || db_config[:show_sql]
+    end
+
+    def should_write_sql?
+      @options.write_sql || db_config[:write_sql]
+    end
+
+    def should_append_sql?
+      @options.append_sql || db_config[:append_sql]
+    end
+
+    def show_sql
+      @log_io ||= MultiIO.new
+      ActiveRecord::Base.logger = Logger.new(@log_io)
+      @log_io << STDOUT
+    end
+
+    def write_sql
+      write_sql_file = @options.write_sql || db_config[:write_sql]
+      @log_io ||= MultiIO.new
+      ActiveRecord::Base.logger = Logger.new(@log_io)
+      @log_io << File.new(write_sql_file, 'w')
+    end
+
+    def append_sql
+      write_sql_file = @options.append_sql || db_config[:append_sql]
+      @log_io ||= MultiIO.new
+      ActiveRecord::Base.logger = Logger.new(@log_io)
+      @log_io << File.new(write_sql_file, 'a')
+    end
   end
 end

data/lib/arql/cli.rb

@@ -78,6 +78,18 @@ module Arql
             @options.code = code
           end
 
+          opts.on('-s', '--show-sql', 'Show SQL on STDOUT') do
+            @options.show_sql = true
+          end
+
+          opts.on('-wOUTOUT', '--write-sql=OUTPUT', 'Write SQL to OUTPUT file') do |file|
+            @options.write_sql = file
+          end
+
+          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
             puts opts
             exit

data/lib/arql/connection.rb

@@ -1,5 +1,3 @@
-require 'active_record'
-
 module Arql
   class Connection
     class << self

data/lib/arql/multi_io.rb

@@ -0,0 +1,20 @@
+module Arql
+  class MultiIO
+    def initialize(*targets)
+      @targets = targets
+    end
+
+    def write(*args)
+      @targets.each {|t| t.write(*args)}
+    end
+
+    def close
+      @targets.each(&:close)
+    end
+
+    def <<(target)
+      @targets ||= []
+      @targets << target
+    end
+  end
+end

data/lib/arql/version.rb

@@ -1,3 +1,3 @@
 module Arql
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/arql.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arql
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Liu Xiang
@@ -80,7 +80,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.0
-description: Rails ActiveRecord is the best SQL query editor.
+description: Use ActiveRecord and Pry as your favorite SQL query editor.
 email:
 - liuxiang921@gmail.com
 executables:
@@ -104,6 +104,7 @@ files:
 - lib/arql/cli.rb
 - lib/arql/connection.rb
 - lib/arql/definition.rb
+- lib/arql/multi_io.rb
 - lib/arql/repl.rb
 - lib/arql/version.rb
 homepage: https://github.com/lululau/arql
@@ -128,5 +129,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Rails ActiveRecord is the best SQL query editor.
+summary: Rails ActiveRecord + Pry is the best SQL query editor
 test_files: []