rego 1.0.0 → 1.2.0

data/README

@@ -23,21 +23,21 @@ EXAMPLES
   
       # say hai whenever the file foo.txt changes
       #
-        ~> rego echo hai -- foo.txt
+        ~> rego foo.txt -- echo hai
   
       # say hai whenever any file (recursively) in bar changes 
       #
-        ~> rego echo hai -- ./bar/ 
+        ~> rego ./bar/ -- echo hai
   
       # echo *the file that changed* when any file (recursively) in bar changes 
       #
-        ~> rego echo "@ was changed" -- ./bar/ 
+        ~> rego ./bar/ -- echo "@ was changed"
   
       # run a specific test whenever anything in lib, test, app, or config changes
       #
-        ~> rego ruby -Itest ./test/units/foo_test.rb --name teh_test -- {lib,test,app,config}
+        ~> rego {lib,test,app,config} -- ruby -Itest ./test/units/foo_test.rb --name teh_test
   
       # run a specific test whenever it, or your app, has changed
       #
-        ~> rego ruby -Itest @ -- ./test
+        ~> rego ./test -- ruby -Itest @
 

data/bin/rego

@@ -18,26 +18,26 @@ Main {
 
     ### gem install rego
 
-
+    
     # say hai whenever the file foo.txt changes
     #
-      ~> rego echo hai -- foo.txt
+      ~> rego foo.txt -- echo hai
 
-    # say hai whenever any file (recursively) in bar changes 
+    # say hai whenever any file (recursively) in bar changes
     #
-      ~> rego echo hai -- ./bar/ 
+      ~> rego ./bar/ -- echo hai
 
-    # echo *the file that changed* when any file (recursively) in bar changes 
+    # echo *the file that changed* when any file (recursively) in bar changes
     #
-      ~> rego echo "@ was changed" -- ./bar/ 
+      ~> rego ./bar/ -- echo "@ was changed"
 
     # run a specific test whenever anything in lib, test, app, or config changes
     #
-      ~> rego ruby -Itest ./test/units/foo_test.rb --name teh_test -- {lib,test,app,config}
+      ~> rego {lib,test,app,config} -- ruby -Itest ./test/units/foo_test.rb --name teh_test
 
     # run a specific test whenever it, or your app, has changed
     #
-      ~> rego ruby -Itest @ -- ./test
+      ~> rego ./test -- ruby -Itest @
   __
 
   def run
@@ -47,34 +47,39 @@ Main {
   end
 
   def parse_the_command_line
-    pos = ARGV.index('--')
+    pos = argv.index('--')
 
 =begin
     if pos
-      @command = ARGV[0...pos].join(' ')
-      @paths = ARGV[pos + 1 .. -1]
+      @command = argv[0...pos].join(' ')
+      @paths = argv[pos + 1 .. -1]
     else
-      @command = ARGV[0..-1].join(' ')
+      @command = argv[0..-1].join(' ')
       @paths = []
     end
 =end
     if pos
-      @paths = ARGV[0 ... pos]
-      @command = ARGV[pos + 1 .. -1].join(' ')
+      @paths = argv[0 ... pos]
+      @command = argv[pos + 1 .. -1].join(' ')
     else
       @paths = []
-      @command = ARGV[0..-1].join(' ')
+      @command = argv[0..-1].join(' ')
     end
     @command = 'echo @' if @paths.empty?
-    @paths = %w[.] if @paths.empty?
+    @paths = %w[ app lib test config a.rb Rakefile ] if @paths.empty?
 
     @paths.map!{|path| test(?d, path) ? [path, Dir.glob(File.join(path, '**/**'))] : path}
     @paths.flatten!
     @paths.compact!
     @paths.uniq!
     @paths.map! do |path|
-      Pathname.new(path).realpath.to_s
+      begin
+        Pathname.new(path).realpath.to_s
+      rescue Object
+        nil
+      end
     end
+    @paths.compact!
   end
 
   def print_a_summary_of_watched_files
@@ -85,22 +90,24 @@ Main {
   end
 
   def loop_watching_files_and_running_commands
-    directories = []
-    files = []
+    @directories = []
+    @files = []
+
     @paths.each do |path|
       if test(?d, path)
-        directories.push(path)
+        @directories.push(path)
       else
-        files.push(path)
-        directories.push(File.dirname(path))
+        @files.push(path)
+        @directories.push(File.dirname(path))
       end
     end
-    directories.uniq!
-    files.uniq!
+
+    @directories.uniq!
+    @files.uniq!
 
     stats = {} 
 
-    files.each do |file|
+    @files.each do |file|
       begin
         stats[file] = File.stat(file)
       rescue
@@ -108,28 +115,54 @@ Main {
       end
     end
 
-    fsevent = FSEvent.new
-
     n = '0'
     line = '#' * 42
     $running = false
 
-    rego = proc do |*args|
-      entry = args.shift
-      cmd = entry ? @command.gsub(/@/, entry) : @command
-      puts line
-      puts "# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ cmd }"
-      puts
-      system(cmd)
-      puts
-      puts "# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ $?.exitstatus }"
-      puts
-      n.succ!
-    end
+    rego =
+      proc do |*args|
+        path = args.shift
+        cmd = path ? @command.gsub(/@/, path) : @command
+
+        puts line
+
+        say("# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ cmd }", :color => :magenta)
+        puts
+
+        system(cmd)
+        puts
+
+        say("# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ $?.exitstatus }", :color => :yellow)
+        puts
+
+        n.succ!
+      end
 
     rego[ false ]
 
-    fsevent.watch(directories) do |*args|
+    begin
+      Listen.to!(*@directories, :latency => 0.1) do |modified, added, removed|
+        [modified, added, removed].flatten.compact.uniq.each do |path|
+          rego[path]
+        end
+      end
+    rescue SignalException
+      STDERR.reopen('/dev/null', 'w+')
+      exit(42)
+    end
+
+
+=begin
+    fsevent = FSEvent.new
+
+    fsevent.watch(
+      @directories,
+        :latency => 0.00042,
+        :no_defer => true,
+        :file_events => true,
+        :watch_root => true,
+        :since_when => 0
+    ) do |*args|
       unless $running
         $running = true
 
@@ -160,11 +193,98 @@ Main {
     end
 
     fsevent.run
+=end
   end
 }
 
 
 BEGIN {
+# setup a child process to catch signals and brutally shut down the parent as
+# a monkey-patch to listen/rb-fsevent's busted ctrl-c handling...
+#
+  unless((pid = fork))
+    ppid = Process.ppid
+
+    begin
+      trap('SIGINT'){
+        %w(
+          SIGTERM SIGINT SIGQUIT SIGKILL
+        ).each do |signal|
+
+          begin
+            Process.kill("-#{ signal }", ppid)
+          rescue Object
+            nil
+          end
+
+          sleep(rand)
+        end
+      }
+
+      loop do
+        Process.kill(0, ppid)
+        sleep(1)
+      end
+    rescue Object => e
+      exit!(0)
+    end
+  end
+
+  ANSI = {
+    :clear      => "\e[0m",
+    :reset      => "\e[0m",
+    :erase_line => "\e[K",
+    :erase_char => "\e[P",
+    :bold       => "\e[1m",
+    :dark       => "\e[2m",
+    :underline  => "\e[4m",
+    :underscore => "\e[4m",
+    :blink      => "\e[5m",
+    :reverse    => "\e[7m",
+    :concealed  => "\e[8m",
+    :black      => "\e[30m",
+    :red        => "\e[31m",
+    :green      => "\e[32m",
+    :yellow     => "\e[33m",
+    :blue       => "\e[34m",
+    :magenta    => "\e[35m",
+    :cyan       => "\e[36m",
+    :white      => "\e[37m",
+    :on_black   => "\e[40m",
+    :on_red     => "\e[41m",
+    :on_green   => "\e[42m",
+    :on_yellow  => "\e[43m",
+    :on_blue    => "\e[44m",
+    :on_magenta => "\e[45m",
+    :on_cyan    => "\e[46m",
+    :on_white   => "\e[47m"
+  }
+
+  module Kernel
+  private
+    def say(phrase, *args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      options[:color] = args.shift.to_s.to_sym unless args.empty?
+      keys = options.keys
+      keys.each{|key| options[key.to_s.to_sym] = options.delete(key)}
+
+      color = options[:color]
+      bold = options.has_key?(:bold)
+
+      parts = [phrase]
+
+      if STDOUT.tty?
+        parts.unshift(ANSI[color]) if color
+        parts.unshift(ANSI[:bold]) if bold
+        parts.push(ANSI[:clear]) if parts.size > 1
+      end
+
+      method = options[:method] || :puts
+
+      send(method, parts.join)
+    end
+  end
+
   require 'pathname'
   this = Pathname.new(__FILE__).realpath.to_s
   bindir = File.dirname(this)

data/lib/rego.rb

@@ -3,7 +3,7 @@ require 'pathname'
 require 'yaml'
 
 module Rego
-  Version = '1.0.0' unless defined?(Version)
+  Version = '1.2.0' unless defined?(Version)
 
   def version
     Rego::Version
@@ -12,7 +12,8 @@ module Rego
   def dependencies
     {
       'main'       => [ 'main'       , ' >= 4.8.1'   ] , 
-      'rb-fsevent' => [ 'rb-fsevent' , ' >= 0.4.3.1' ]
+      #'rb-fsevent' => [ 'rb-fsevent' , ' >= 0.4.3.1' ] , 
+      'listen'     => [ 'listen'     , ' >= 1.0.2'   ] ,
     }
   end
 

data/rego.gemspec

@@ -3,13 +3,20 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rego"
-  spec.version = "1.0.0"
+  spec.version = "1.2.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rego"
   spec.description = "description: rego kicks the ass"
 
   spec.files =
-["README", "Rakefile", "bin", "bin/rego", "lib", "lib/rego.rb", "rego.gemspec"]
+["README",
+ "Rakefile",
+ "bin",
+ "bin/rego",
+ "lib",
+ "lib/rego.rb",
+ "rego.gemspec",
+ "~"]
 
   spec.executables = ["rego"]
   
@@ -20,7 +27,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["main", " >= 4.8.1"])
   
-    spec.add_dependency(*["rb-fsevent", " >= 0.4.3.1"])
+    spec.add_dependency(*["listen", " >= 1.0.2"])
   
 
   spec.extensions.push(*[])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rego
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-26 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
-  requirement: &70118988773040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,18 +21,28 @@ dependencies:
         version: 4.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70118988773040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.8.1
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70118988769120 !ruby/object:Gem::Requirement
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.3.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70118988769120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 description: ! 'description: rego kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
@@ -65,8 +75,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: codeforpeople
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: rego
 test_files: []
+has_rdoc: