querly 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59c90b4b800268fd5d50b49faf97dc27e5f4f49c
-  data.tar.gz: a9431bc1cab5e5fe25d2cbe6b43da73fad6d5bf6
+  metadata.gz: d2f7b1ba2cfc19fc71ac84ab1f2b65e6f50fab63
+  data.tar.gz: 270c4fbe0609fae2af52c9f5bc0d1b70f00304e5
 SHA512:
-  metadata.gz: deb1374c2e661f5efd72f91e37bc506fe2f923299769191a84eb66c00952820f70dae04d61ee1252fc81c1775f1d33aa3f6756992cc2478b220380a6e360cfde
-  data.tar.gz: 2cd66a62b2bd1682f882c4c13bd0540b95e2ef4d27303bae6bd1029c4c526aa96d20a580598c4028feb84142246096cb32328d811c2e180b31eed1bf439b1cac
+  metadata.gz: 4808003cfd6d836c4a627bce6b31bb88115f301a0d41347c7e56f352b22fec95d4469a1d94eed904335f842f21517ce1fa09234add15e79a42423146035e8925
+  data.tar.gz: 624cf0658f0f4badf70aa4297d1f2e0fef84c576bad0f43e6aae9350536fe4003a530fb47bb84b24aab45532927823d706cee9e31d30c0f3268887922ec1ddc0

data/.gitignore

@@ -11,3 +11,4 @@
 /lib/querly/pattern/parser.rb
 parser.output
 /Gemfile.lock
+.querly_history

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## master
 
+## 0.13.0 (2018-08-27)
+
+* Make history file location configurable through `QUERLY_HOME` (defaults to `~/.querly`)
+* Save `console` history (@gfx) #47
+
 ## 0.12.0 (2018-08-03)
 
 * Declare MIT license #44

data/lib/querly/cli.rb

@@ -1,6 +1,10 @@
 require "thor"
 require "json"
 
+if ENV["NO_COLOR"]
+  Rainbow.enabled = false
+end
+
 module Querly
   class CLI < Thor
     desc "check [paths]", "Check paths based on configuration"
@@ -65,7 +69,18 @@ Specify configuration file by --config option.
     desc "console [paths]", "Start console for given paths"
     def console(*paths)
       require 'querly/cli/console'
-      Console.new(paths: paths.empty? ? [Pathname.pwd] : paths.map {|path| Pathname(path) }).start
+      home_path = if (path = ENV["QUERLY_HOME"])
+                       Pathname(path)
+                     else
+                       Pathname(Dir.home) + ".querly"
+                     end
+      home_path.mkdir unless home_path.exist?
+
+      Console.new(
+        paths: paths.empty? ? [Pathname.pwd] : paths.map {|path| Pathname(path) },
+        history_path: home_path + "history",
+        history_size: ENV["QUERLY_HISTORY_SIZE"]&.to_i || 1_000_000
+      ).start
     end
 
     desc "test", "Check configuration"

data/lib/querly/cli/console.rb

@@ -6,9 +6,15 @@ module Querly
       include Concerns::BacktraceFormatter
 
       attr_reader :paths
+      attr_reader :history_path
+      attr_reader :history_size
+      attr_reader :history
 
-      def initialize(paths:)
+      def initialize(paths:, history_path:, history_size:)
         @paths = paths
+        @history_path = history_path
+        @history_size = history_size
+        @history = []
       end
 
       def start
@@ -24,7 +30,8 @@ Querly #{VERSION}, interactive console
         reload!
         STDOUT.puts " ready!"
 
-        loop
+        load_history
+        start_loop
       end
 
       def reload!
@@ -50,7 +57,7 @@ Querly #{VERSION}, interactive console
         @analyzer
       end
 
-      def loop
+      def start_loop
         while line = Readline.readline("> ", true)
           case line
           when "quit"
@@ -68,22 +75,24 @@ Querly #{VERSION}, interactive console
 
               analyzer.find(pattern) do |script, pair|
                 path = script.path.to_s
-                line = pair.node.loc.first_line
+                line_no = pair.node.loc.first_line
                 range = pair.node.loc.expression
                 start_col = range.column
                 end_col = range.last_column
 
-                src = range.source_buffer.source_lines[line-1]
+                src = range.source_buffer.source_lines[line_no-1]
                 src = Rainbow(src[0...start_col]).blue +
                   Rainbow(src[start_col...end_col]).bright.blue.bold +
                   Rainbow(src[end_col..-1]).blue
 
-                puts "  #{path}:#{line}:#{start_col}\t#{src}"
+                puts "  #{path}:#{line_no}:#{start_col}\t#{src}"
 
                 count += 1
               end
 
               puts "#{count} results"
+
+              save_history line
             rescue => exn
               STDOUT.puts Rainbow("Error: #{exn}").red
               STDOUT.puts "Backtrace:"
@@ -95,6 +104,24 @@ Querly #{VERSION}, interactive console
         end
       end
 
+      def load_history
+        history_path.readlines.each do |line|
+          line.chomp!
+          Readline::HISTORY.push(line)
+          history.push line
+        end
+      rescue Errno::ENOENT
+        # in the first time
+      end
+
+      def save_history(line)
+        history.push line
+        if history.size > history_size
+          @history = history.drop(history.size - history_size)
+        end
+        history_path.write(history.join("\n") + "\n")
+      end
+
       def puts_commands
         puts <<-Message
 Commands:

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler