librr 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c1431a1d77217312122796724510c4e77fb34d0
-  data.tar.gz: 594faa85c5251131bc9f0679f1284daa321c7725
+  metadata.gz: 155602bd5086e0f8111e9a7e2d4d2cf9ab48c7b0
+  data.tar.gz: 70b707affb6b7c5871f9d02f0913eb35e9806838
 SHA512:
-  metadata.gz: 0a300c702916d50729106e6f08c72fb9fd1984f182eabf22fa72c68a783c32814073209cbd6cdc5bcf150224c766ae37ec1708bad6c2b29764d57c7a757b3456
-  data.tar.gz: a527e49131d00e7ab3a5542d55273db8fc0c9834eec178a6d6054052bec53060b772c76d70e1ed94132e688075c74bc15b4524c487be6f259bdb186703d61943
+  metadata.gz: 64bd8d2c2ad5fa9456b3f2f19887485f76baef67e12626df9bc037da5f2b2c0c8df19d2f6e51d78aa794192069a0f76084bfb337afa4ff4a1a67a50e42c325fa
+  data.tar.gz: b6fff23648956acbd98166c2377c8ad5f680d11dabd1c2dc223d69936becfcf9277b14a4b995ce8ee9a2306fc96fa6c5ccbc6129cd76d36fbd230a18f8648572

data/README.md

@@ -26,13 +26,12 @@ gem install librr
 Start and stop background monitor process:
 
 ```sh
-librr start
-librr stop
+librr daemon start
+librr daemon stop
 ```
 
 It will start up automatically after first call to `librr search`,
 You don't need to start it manually.
-The background process name is: `librrd` and also start solr process.
 
 
 Config search directories:
@@ -50,10 +49,16 @@ Using search:
 librr search emacs
 ~/Dropbox/sync/docs/emacs.org:26: xxx emacs
 ~/Dropbox/sync/docs/gtd.org:230: bbb emacs
+
 # or using sortcut:
 librr s emacs
+
 # set return result rows(default 30):
 librr search emacs --rows 100
+
+# under directory:
+librr search emacs --location ./gtd
+librr search emacs -l ./gtd
 ```
 
 Schecdule reindex:
@@ -61,3 +66,14 @@ Schecdule reindex:
 ```sh
 librr reindex [dir]
 ```
+
+## development
+
+You can add `--debug` or `-d` argument to see what was happened under the hood: `librr add -d`.
+
+And for debugging, you can run daemon sync with a terminal, and check the debug information on the stdout:
+
+```
+librr daemon start --sync -d
+```
+

data/lib/librr/cmd_client.rb

@@ -6,6 +6,7 @@ require 'librr/server_starter'
 
 
 class Librr::CmdClient
+  include Librr::Logger::ClassLogger
 
   def initialize host, port
     @host = host
@@ -29,7 +30,7 @@ class Librr::CmdClient
     rescue Errno::ECONNREFUSED => e
     end
 
-    puts "server not start, starting.."
+    puts "daemon not start, starting.."
     ServerStarter.start_server(false)
     ServerStarter.wait_for_server_started do
       self.run_cmd cmd, **params
@@ -39,7 +40,7 @@ class Librr::CmdClient
   def run_cmd cmd, params={}
     params[:cmd] = cmd
     url = '/cmd'
-    $logger.debug(:CmdClient){ "sending: #{params}" }
+    self.debug("sending: #{params}")
     result = Net::HTTP.post_form(URI.parse("http://#{@host}:#{@port}#{url}"), params)
     JSON.load(result.body)
   end

data/lib/librr/cmd_parser.rb

@@ -1,52 +1,76 @@
 require 'thor'
 require 'librr/cmd_client'
 require 'librr/settings'
+require 'librr/my_thor'
 
 
-class Librr::CmdParser < Thor
+class Librr::CmdParser < MyThor
 
-  option :sync, type: :boolean
-  desc 'start [--sync]', 'start background process'
-  def start
-    if @@client.check_start(options[:sync])
-      puts 'server already started..'
-    end
+  class << self
+    attr_accessor :client
   end
 
-  desc 'stop', 'stop background process'
-  def stop
-    puts 'stopping..'
-    @@client.cmd(:stop) rescue nil
+  class Daemon < MyThor
+    option :sync, type: :boolean, aliases: "-s"
+    desc 'start [--sync]', 'start background daemon process'
+    def start
+      if Librr::CmdParser.client.check_start(options[:sync])
+        puts 'daemon already started..'
+      end
+    end
+
+    desc 'stop', 'stop background daemon process'
+    def stop
+      puts 'stopping daemon..'
+      Librr::CmdParser.client.cmd(:stop) rescue nil
+    end
+
+    # desc 'restart', 'restart background daemon process'
+    # def restart
+    #   puts 'daemon restarting..'
+    #   Librr::CmdParser.client.cmd(:restart) rescue nil
+    # end
   end
 
+  desc "daemon SUBCOMMAND ...ARGS", "manage background daemon process"
+  subcommand "daemon", Daemon
+
+
   desc 'add DIR', 'add directory for indexing'
   def add(dir)
     puts "indexing: #{dir}"
-    @@client.cmd(:add, dir: File.expand_path(dir))
+    self.class.client.cmd(:add, dir: File.expand_path(dir))
   end
 
   desc 'remove DIR', 'remove directory from indexing'
   def remove(dir)
     puts "removing: #{dir}"
-    @@client.cmd(:remove, dir: File.expand_path(dir))
+    self.class.client.cmd(:remove, dir: File.expand_path(dir))
   end
 
   desc 'list', 'list all indexed directories'
   def list
-    puts @@client.cmd(:list)
+    puts self.class.client.cmd(:list)
   end
 
   desc "reindex", "reindex files"
   def reindex
-    @@client.cmd(:reindex)
+    self.class.client.cmd(:reindex)
   end
 
   option :rows, type: :numeric, default: 20
   option :all, type: :boolean
-  desc 'search STRING', 'search string'
+  option :location, type: :string, aliases: "-l"
+  desc 'search STRING [--location DIR]', 'search string'
   def search(text)
+    location = (File.expand_path(options[:location]) if options[:location])
     puts "searching: #{text}"
-    results = @@client.cmd(:search, text: text, all: options[:all], rows: options[:rows])
+    results = self.class.client.cmd(:search,
+                          text: text,
+                          all: options[:all],
+                          rows: options[:rows],
+                          location: location,
+                          )
     if results.empty?
       puts "find no result"
     else
@@ -55,7 +79,7 @@ class Librr::CmdParser < Thor
   end
 
   def self.run!
-    @@client = Librr::CmdClient.new('localhost', Settings.runner_port)
+    self.client = Librr::CmdClient.new('localhost', Settings.runner_port)
     self.start(ARGV)
   end
 

data/lib/librr/cmd_server.rb

@@ -39,17 +39,24 @@ class Librr::CmdServer
     end
 
     def handle_cmd(params)
-      self.info "on receive: #{params.to_s}"
+      self.debug "on receive: #{params.to_s}"
       case params['cmd']
       when 'ping'
         'pong'
 
       when 'stop'
-        puts "server stopping.."
+        self.info "daemon stopping.."
         EM.next_tick{
           EM.stop
         }
 
+      when 'restart'
+        self.info "daemon restarting.."
+        EM.next_tick{
+          EM.stop
+          # todo
+        }
+
       when 'add'
         EM.next_tick{
           @@server.monitor.add_directory(params['dir'])
@@ -69,7 +76,12 @@ class Librr::CmdServer
         }
 
       when 'search'
-        @@server.indexer.search(params['text'], rows: params['rows'], all: params['all'])
+        @@server.indexer.search(
+                         params['text'],
+                         rows: params['rows'],
+                         all: params['all'],
+                         location: params['location'],
+                         )
 
       else
         raise Exception, "cmd unknown: #{params['cmd']}"

data/lib/librr/dir_monitor.rb

@@ -17,11 +17,11 @@ class Librr::DirMonitor
     @indexer = opts[:indexer]
 
     self.dirs = Configer.load_dir_config
-    self.info "init dirs: #{self.dirs.to_a.to_s}"
+    self.debug "init dirs: #{self.dirs.to_a.to_s}"
   end
 
   def reindex
-    self.info "reindex"
+    self.debug "reindex"
     @indexer.cleanup
     self.dirs.each do |dir|
       @indexer.index_directory(dir)
@@ -29,16 +29,16 @@ class Librr::DirMonitor
   end
 
   def add_directory(dir)
-    self.info "add dir: #{dir}"
+    self.debug "add dir: #{dir}"
     @indexer.index_directory(dir)
     self.dirs.add(dir)
     Configer.save_dir_config(self.dirs)
-    self.info "save dir: #{self.dirs.to_a.to_s}"
+    self.debug "save dir: #{self.dirs.to_a.to_s}"
     self.start
   end
 
   def remove_directory(dir)
-    self.info "remove dir: #{dir}"
+    self.debug "remove dir: #{dir}"
     @indexer.remove_index_directory(dir)
     self.dirs.delete(dir)
     Configer.save_dir_config(self.dirs)
@@ -58,7 +58,7 @@ class Librr::DirMonitor
     @after_block = after_block
 
     if self.dirs.empty?
-      self.info "DIR empty, not start process."
+      self.debug "DIR empty, not start process."
       self.post_init
       return
     end
@@ -79,7 +79,7 @@ class Librr::DirMonitor
     kill_process_by_file(self.class.pid_file)
 
     cmd = [FSEvent.watcher_path] + ["--file-events"] + self.dirs.to_a
-    self.info "start process: #{cmd}"
+    self.debug "start process: #{cmd}"
     @pipe = EM.popen(cmd, DirWatcher, self)
     # TODO: write pid file
   end
@@ -97,7 +97,7 @@ class Librr::DirMonitor
     end
 
     def receive_data data
-      self.info "on receive data: #{data}"
+      self.debug "on receive data: #{data}"
       changes = data.strip.split(':').map(&:strip).reject{|s| s == ''}
       changes.each do |file|
         @monitor.indexer.index_file(file)
@@ -105,7 +105,7 @@ class Librr::DirMonitor
     end
 
     def unbind
-      self.info "dir monitor process stopped."
+      self.debug "dir monitor process stopped."
       @monitor.after_process_stop
       File.delete Librr::DirMonitor.pid_file rescue nil
     end

data/lib/librr/indexer.rb

@@ -38,15 +38,15 @@ class Librr::Indexer
     include Librr::Logger::ClassLogger
 
     def post_init
-      self.info "start solr"
+      self.debug "start solr"
     end
 
     def receive_data data
-      self.info "receiving solr: #{data}"
+      self.debug "receiving solr: #{data}"
     end
 
     def unbind
-      self.info "stop solr"
+      self.debug "stop solr"
       File.delete Librr::Indexer.pid_file rescue nil
     end
 
@@ -71,7 +71,7 @@ class Librr::Indexer
 
   def after_start
     @solr_started = true
-    self.info 'after solr start'
+    self.debug 'after solr start'
 
     @solr = RSolr.connect(
                   url: "http://localhost:#{Settings.solr_port}/solr",
@@ -90,7 +90,7 @@ class Librr::Indexer
   end
 
   def cleanup
-    self.info 'cleanup'
+    self.debug 'cleanup'
     self.run_solr {
       @solr.delete_by_query '*:*'
       @solr.commit
@@ -98,7 +98,7 @@ class Librr::Indexer
   end
 
   def index_directory(dir)
-    self.info "index dir: #{dir}"
+    self.debug "index dir: #{dir}"
     files = Dir.glob(File.join(dir, "**/*"))
     EM::Iterator.new(files)
       .each(
@@ -109,12 +109,12 @@ class Librr::Indexer
                 iter.next
               end
             },
-       proc { self.info "index dir finished: #{dir}" }
+       proc { self.debug "index dir finished: #{dir}" }
        )
   end
 
   def remove_index_directory(dir)
-    self.info "remove dir: #{dir}"
+    self.debug "remove dir: #{dir}"
     self.run_solr {
       @solr.delete_by_query "filename:#{dir}*"
       @solr.commit
@@ -130,20 +130,19 @@ class Librr::Indexer
     }
 
     unless File.exists?(file)
-      self.info "remove index file: #{file}"
+      self.debug "remove index file: #{file}"
       block.call if block
       return
     end
 
-    self.info "index file: #{file}"
+    self.debug "index file: #{file}"
     f = File.open(file)
     enum = f.each.each_slice(SLICE_NUM).each_with_index
-    self.info "file indexing...."
     DelayIterator.new(enum)
       .each(
        proc { |lines, i|
               data = lines.each_with_index.map do |line, j|
-                num = SLICE_NUM * i + j
+                num = SLICE_NUM * i + j + 1
                 line = fix_encoding(line).rstrip
                 {id: SecureRandom.uuid, filename: file, linenum: num, line: line}
               end
@@ -153,7 +152,7 @@ class Librr::Indexer
                 @solr.commit
               }
 
-              self.info "working on lines: #{i*SLICE_NUM}"
+              self.debug "working on lines: #{i*SLICE_NUM}"
             },
        proc {
               f.close
@@ -163,13 +162,15 @@ class Librr::Indexer
   end
 
   def search(str, opts={})
-    self.info "search: #{str}"
+    self.debug "search: #{str}"
 
     rows = opts[:rows] || 30
     rows = (2 ** 31 - 1) if opts[:all]
+    query = "line:#{str}"
+    query += " filename:#{opts[:location]}*" if opts[:location]
 
     result = self.run_solr {
-      @solr.get 'select', params: {q: "line:#{str}", rows: rows}
+      @solr.get 'select', params: {q: query, rows: rows}
     }
 
     result['response']['docs'].map do |row|

data/lib/librr/lib.rb

@@ -19,6 +19,16 @@ def redirect_std
   [wi, ro, re]
 end
 
+def redirect_std_to_file(filename)
+  f = File.open(filename, 'a+')
+  f.sync = true
+
+  $stdout.reopen f
+  $stderr.reopen f
+
+  yield
+end
+
 
 def fix_encoding text
   # solution copy from:

data/lib/librr/logger.rb

@@ -1,21 +1,36 @@
 require 'logger'
+require 'singleton'
+
 
 class Librr::Logger
+  include Singleton
 
   module ClassLogger
+    def logger
+      Librr::Logger.instance.logger
+    end
+
     def info(text)
-      $logger.info(self.class.name){ text }
+      self.logger.info(self.class.name){ text }
+    end
+
+    def debug(text)
+      self.logger.debug(self.class.name){ text }
     end
   end
 
-  def self.create_logger
+  def logger
+    @logger ||= self.create_logger
+  end
+
+  def logger=(logger)
+    @logger = logger
+  end
+
+  def create_logger
     logger = Logger.new(STDOUT)
-    # logger.level = Logger::WARN
-    logger.level = Logger::DEBUG
+    logger.level = Logger::WARN
     logger
   end
 
 end
-
-$logger ||= Librr::Logger.create_logger
-

data/lib/librr/my_thor.rb

@@ -0,0 +1,36 @@
+require 'thor'
+
+class MyThor < Thor
+  class_option :debug, type: :boolean, aliases: "-d"
+
+  class << self
+
+    protected
+
+    def method_added(meth)
+      meth = meth.to_s
+      @my_defined_methods ||= {}
+      return if @my_defined_methods[meth] or meth =~ /_old_/
+      @my_defined_methods[meth] = true
+      my_wrap_methods(meth)
+
+      super(meth)
+    end
+
+    def my_wrap_methods(meth)
+      old_meth = "_old_#{meth}"
+      alias_method old_meth, meth
+
+      define_method meth do |*args|
+        # set logger
+        if options[:debug]
+          Librr::Logger.instance.logger.level = Logger::DEBUG
+        end
+
+        self.send(old_meth, *args)
+      end
+    end
+
+  end
+
+end

data/lib/librr/runner.rb

@@ -10,6 +10,8 @@ EventMachine.kqueue = true if EventMachine.kqueue?
 
 
 class Librr::Runner
+  include Librr::Logger::ClassLogger
+
   def run!
     self.clear_pid
     @stoping = false
@@ -20,7 +22,7 @@ class Librr::Runner
         @stoping = true
 
         EM.stop
-        puts "eventmachine graceful stops."
+        self.info "eventmachine stopping.."
         # todo commandline still show ^C?
         self.clear_pid
       end
@@ -35,13 +37,15 @@ class Librr::Runner
       indexer.start do
         monitor.start do
           server.start do
-            puts "server started"
+            self.info "daemon started"
             self.write_pid
           end
         end
       end
 
     end
+
+    self.info "eventmachine stopped."
   end
 
   def write_pid

data/lib/librr/server_starter.rb

@@ -1,8 +1,12 @@
 # copy from gem daemons file: daemonize.rb
 # todo: may has secruity risk
 require 'librr/lib'
+require 'librr/logger'
+require 'librr/settings'
 
 module ServerStarter
+  include Librr::Logger::ClassLogger
+
   extend self
 
   def run
@@ -13,14 +17,21 @@ module ServerStarter
   end
 
   def start_server(sync)
-    puts 'server starting..'
-    return self.run if sync
+    puts 'daemon starting..'
+    if sync
+      Librr::Logger.instance.logger.level = Logger::DEBUG
+      return self.run
+    end
 
     Process.fork do
       sess_id = Process.setsid
       Process.fork do
         redirect_std do
-          $logger.info "daemon started."
+          # for daemon, logger all information to log file
+          logger = Logger.new(Settings.in_dir('daemon.log'), 10, 1024000)
+          logger.level = Logger::DEBUG
+          Librr::Logger.instance.logger = logger
+          self.debug "daemon started."
           self.run
         end
         exit
@@ -32,13 +43,13 @@ module ServerStarter
   def wait_for_server_started &block
     5.times.each do
       sleep(2)
-      puts 'waiting for server starting..'
+      puts 'waiting for daemon starting..'
 
       if File.exists?(Settings::PID_FILE)
         return block.call if block
       end
     end
-    puts "server not starting, something is wrong."
+    puts "daemon not starting, something is wrong."
     exit
   end
 end

data/lib/librr/version.rb

@@ -1,3 +1,3 @@
 module Librr
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librr
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - linjunhalida
@@ -162,6 +162,7 @@ files:
 - lib/librr/indexer.rb
 - lib/librr/lib.rb
 - lib/librr/logger.rb
+- lib/librr/my_thor.rb
 - lib/librr/runner.rb
 - lib/librr/server_starter.rb
 - lib/librr/settings.rb