jugyo-filetter 0.2.1 → 0.2.2

data/lib/filetter.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-$:.unshift(File.dirname(__FILE__) + '/modes')
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/modes'))
 
 require 'optparse'
 require 'rubygems'
@@ -18,21 +18,31 @@ module Filetter
       pattern = './**/*'
       interval = 1
       debug = false
-      config_file = '.filetter'
       mode = nil
-      load_file = nil
+      load_path = nil
+      load_file = '.filetter'
+      work_dir = nil
 
       OptionParser.new do |opt|
         opt.version = VERSION
         opt.program_name = self.to_s
-        opt.on('-m', '--mode=mode', 'Run mode'                        ) {|v| mode = v         }
-        opt.on('-f', '--load=file', 'File to load'                    ) {|v| load_file = v    }
-        opt.on('-p', '--pattern=pattern', 'Pattern of target files'   ) {|v| pattern = v      }
-        opt.on('-i', '--interval=interval', 'Interval of check files' ) {|v| interval = v     }
-        opt.on('-d', '--debug', 'Enable debug mode'                   ) {|v| debug = true     }
+        opt.on('-m', '--mode=mode', 'Run mode'                                  ) {|v| mode = v       }
+        opt.on('-l', '--loadpath=path', 'Library load path'                     ) {|v| load_path = v  }
+        opt.on('-f', '--loadfile=file', 'File to load'                          ) {|v| load_file = v  }
+        opt.on('-c', '--cd=directory', 'cd to directory'                        ) {|v| work_dir = v   }
+        opt.on('-p', '--pattern=pattern', 'Pattern of target files'             ) {|v| pattern = v    }
+        opt.on('-i', '--interval=interval', 'Interval of check files', Integer  ) {|v| interval = v   }
+        opt.on('-d', '--debug', 'Enable debug mode'                             ) {|v| debug = true   }
         opt.parse!(ARGV)
       end
 
+      $:.unshift(File.expand_path(load_path)) if load_path
+
+      if work_dir
+        Dir.chdir(work_dir)
+        puts "=> cd to #{work_dir}"
+      end
+
       begin
         unless mode || load_file
           puts '=> Run as "sample" mode'
@@ -42,13 +52,18 @@ module Filetter
             puts "=> Run as \"#{mode}\" mode"
             require mode
           end
-          if load_file
+          if load_file && File.exist?(load_file)
             puts "=> load \"#{load_file}\""
             load load_file
           end
         end
       rescue LoadError => e
         puts e
+        raise if debug
+        exit!
+      rescue => e
+        puts e
+        raise if debug
         exit!
       end
 

data/lib/filetter/observer.rb

@@ -14,13 +14,10 @@ module Filetter
     end
 
     def self.run(options = {})
-      options.each do |k, v|
-        instance.__send__("#{k.to_s}=".to_sym, v) if instance.respond_to?(k)
-      end
-      instance.run
+      instance.run(options)
     end
 
-    attr_accessor :pattern, :interval, :debug
+    attr_accessor :pattern, :interval, :debug, :prompt
 
     def initialize
       @pattern = './**/*'
@@ -28,29 +25,23 @@ module Filetter
       @work = true
       @file_infos = {}
       @hooks = {}
+      @prompt = '> '
     end
 
-    def run
-      collect_files
-
-      @observe_thread = Thread.new do
-        while @work
-          begin
-            check_files
-          rescue => e
-            handle_error(e)
-          ensure
-            sleep @interval
-          end
-        end
+    def run(options = {})
+      options.each do |k, v|
+        self.__send__("#{k.to_s}=".to_sym, v) if self.respond_to?(k)
       end
 
+      puts "=> initializing. please wait..."
+      collect_files(true)
+
       @input_thread = Thread.new do
         Readline.completion_proc = lambda {|input|
           self.methods.map{|i|i.to_s}.grep(/^#{Regexp.quote(input)}/)
         }
         puts '=> Enter "exit" to exit.'
-        while @work && line = Readline.readline('> ', true)
+        while @work && line = Readline.readline(@prompt, true)
           begin
             eval(line) unless line.empty?
           rescue => e
@@ -59,6 +50,20 @@ module Filetter
         end
       end
 
+      sleep interval
+
+      @observe_thread = Thread.new do
+        while @work
+          begin
+            check_files
+          rescue => e
+            handle_error(e)
+          ensure
+            sleep @interval
+          end
+        end
+      end
+
       @observe_thread.join
       @input_thread.join
     end
@@ -82,8 +87,21 @@ module Filetter
 
     private
 
-    def collect_files
-      real_files = Pathname.glob(@pattern).map{|i|i.realpath}
+    def collect_files(init = false)
+      real_files = Pathname.glob(@pattern).map do |i|
+        if init || debug
+          print "\e[1K\e[0G#{i.basename.to_s}"
+          $stdout.flush
+        end
+        i.realpath
+      end
+
+      if init || debug
+        print "\e[1K\e[0G"
+        print @prompt unless init
+        $stdout.flush
+      end
+
       current_files = @file_infos.keys
       created_files = real_files - current_files
       deleted_files = current_files - real_files

data/lib/filetter/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module Filetter
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jugyo-filetter
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - jugyo