rego 3.1.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 738b5c494fd8dd07635d1e6602d898cd79877e4c0f9681d58a7063e15bb2fb06
-  data.tar.gz: f7c8175cee2dfdca458668d645fef5cbedec4e98d95c8a05313448211c3f6261
+  metadata.gz: 425e9aeff5786a7815c4647b7e3370d392b6d298a2b0ed210366b80bff7b5a8f
+  data.tar.gz: 3b43f2b8b22ad22dd1ae9df75992af8104cfde581e3ccae148f164eb50f62bd5
 SHA512:
-  metadata.gz: 8fba73063ba506990915c357a9c14a8b67ca267fa113da53f013301207ffce16a5b39dafc5d72ff2fe802556181361291905bde7707ee5a16fb151f47121999b
-  data.tar.gz: 61465a39a564df08a505fa9c35984b35edd7360f46e757dfea5c8a70fd27517d34950f31b4f11c7cbc8a162e6f406a7369b235e890961c5e4d31620c85cc8101
+  metadata.gz: 1bc5fdb63f78606d066b65644564b02dd760c9bfba83a79e21d272b656bdacc78e53fa306c75b577d0d21c229afaa8a96a737b407b32b233fc02a2d118f5ef70
+  data.tar.gz: fadcef5875b4a2ca0fae127458f4df2090ab029afad31d06e32cc73d039b4cf1e32931dc71fd0a2df2606c2d1e4c405c252fe19e2565f5d8c1ecf342b1b1acf2

data/Rakefile

@@ -1,13 +1,13 @@
-This.author = "Ara T. Howard"
-This.email = "ara.t.howard@gmail.com"
-This.homepage = "https://github.com/ahoward/#{ This.lib }"
+This.author = 'Ara T. Howard'
+This.email = 'ara.t.howard@gmail.com'
+This.homepage = "https://github.com/ahoward/#{This.lib}"
 
 task :license do
-  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
+  open('LICENSE', 'w') { |fd| fd.puts 'Ruby' }
 end
 
 task :default do
-  puts((Rake::Task.tasks.map{|task| task.name.gsub(/::/,':')} - ['default']).sort)
+  puts((Rake::Task.tasks.map { |task| task.name.gsub(/::/, ':') } - ['default']).sort)
 end
 
 task :test do
@@ -15,90 +15,92 @@ task :test do
 end
 
 namespace :test do
-  task(:unit){ run_tests!(:unit) }
-  task(:functional){ run_tests!(:functional) }
-  task(:integration){ run_tests!(:integration) }
+  task(:unit) { run_tests!(:unit) }
+  task(:functional) { run_tests!(:functional) }
+  task(:integration) { run_tests!(:integration) }
 end
 
 def run_tests!(which = nil)
   which ||= '**'
-  test_dir = File.join(This.dir, "test")
-  test_glob ||= File.join(test_dir, "#{ which }/**_test.rb")
+  test_dir = File.join(This.dir, 'test')
+  test_glob ||= File.join(test_dir, "#{which}/**_test.rb")
   test_rbs = Dir.glob(test_glob).sort
-        
+
   div = ('=' * 119)
   line = ('-' * 119)
 
   test_rbs.each_with_index do |test_rb, index|
     testno = index + 1
-    command = "#{ This.ruby } -w -I ./lib -I ./test/lib #{ test_rb }"
+    command = "#{This.ruby} -w -I ./lib -I ./test/lib #{test_rb}"
 
     puts
-    say(div, :color => :cyan, :bold => true)
-    say("@#{ testno } => ", :bold => true, :method => :print)
-    say(command, :color => :cyan, :bold => true)
-    say(line, :color => :cyan, :bold => true)
+    say(div, color: :cyan, bold: true)
+    say("@#{testno} => ", bold: true, method: :print)
+    say(command, color: :cyan, bold: true)
+    say(line, color: :cyan, bold: true)
 
     system(command)
 
-    say(line, :color => :cyan, :bold => true)
+    say(line, color: :cyan, bold: true)
 
     status = $?.exitstatus
 
-    if status.zero? 
-      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
-      say("SUCCESS", :color => :green, :bold => true)
+    if status.zero?
+      say("@#{testno} <= ", bold: true, color: :white, method: :print)
+      say('SUCCESS', color: :green, bold: true)
     else
-      say("@#{ testno } <= ", :bold => true, :color => :white, :method => :print)
-      say("FAILURE", :color => :red, :bold => true)
+      say("@#{testno} <= ", bold: true, color: :white, method: :print)
+      say('FAILURE', color: :red, bold: true)
     end
-    say(line, :color => :cyan, :bold => true)
+    say(line, color: :cyan, bold: true)
 
     exit(status) unless status.zero?
   end
 end
 
-
 task :gemspec do
   ignore_extensions = ['git', 'svn', 'tmp', /sw./, 'bak', 'gem']
   ignore_directories = ['pkg']
   ignore_files = ['test/log']
 
-  shiteless = 
+  shiteless =
     lambda do |list|
       list.delete_if do |entry|
-        next unless test(?e, entry)
-        extension = File.basename(entry).split(%r/[.]/).last
-        ignore_extensions.any?{|ext| ext === extension}
+        next unless test('e', entry)
+
+        extension = File.basename(entry).split(/[.]/).last
+        ignore_extensions.any? { |ext| ext === extension }
       end
       list.delete_if do |entry|
-        next unless test(?d, entry)
+        next unless test('d', entry)
+
         dirname = File.expand_path(entry)
-        ignore_directories.any?{|dir| File.expand_path(dir) == dirname}
+        ignore_directories.any? { |dir| File.expand_path(dir) == dirname }
       end
       list.delete_if do |entry|
-        next unless test(?f, entry)
+        next unless test('f', entry)
+
         filename = File.expand_path(entry)
-        ignore_files.any?{|file| File.expand_path(file) == filename}
+        ignore_files.any? { |file| File.expand_path(file) == filename }
       end
     end
 
   lib         = This.lib
   object      = This.object
   version     = This.version
-  files       = shiteless[Dir::glob("**/**")]
-  executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
-  #has_rdoc    = true #File.exist?('doc')
-  test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
-  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
-  description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
-  license     = object.respond_to?(:license) ? object.license : "Ruby"
+  files       = shiteless[Dir.glob('**/**')]
+  executables = shiteless[Dir.glob('bin/*')].map { |exe| File.basename(exe) }
+  # has_rdoc    = true #File.exist?('doc')
+  test_files  = "test/#{lib}.rb" if File.file?("test/#{lib}.rb")
+  summary     = object.respond_to?(:summary) ? object.summary : "summary: #{lib} kicks the ass"
+  description = object.respond_to?(:description) ? object.description : "description: #{lib} kicks the ass"
+  license     = object.respond_to?(:license) ? object.license : 'Ruby'
 
   if This.extensions.nil?
     This.extensions = []
     extensions = This.extensions
-    %w( Makefile configure extconf.rb ).each do |ext|
-      extensions << ext if File.exists?(ext)
+    %w[Makefile configure extconf.rb].each do |ext|
+      extensions << ext if File.exist?(ext)
     end
   end
   extensions = [extensions].flatten.compact
@@ -107,18 +109,18 @@ task :gemspec do
     dependencies = []
   else
     case This.dependencies
-      when Hash
-        dependencies = This.dependencies.values
-      when Array
-        dependencies = This.dependencies
+    when Hash
+      dependencies = This.dependencies.values
+    when Array
+      dependencies = This.dependencies
     end
   end
 
-  template = 
-    if test(?e, 'gemspec.erb')
-      Template{ IO.read('gemspec.erb') }
+  template =
+    if test('e', 'gemspec.erb')
+      Template { IO.read('gemspec.erb') }
     else
-      Template {
+      Template do
         <<-__
           ## <%= lib %>.gemspec
           #
@@ -131,9 +133,9 @@ task :gemspec do
             spec.description = <%= description.inspect %>
             spec.license = <%= license.inspect %>
 
-            spec.files =\n<%= files.sort.pretty_inspect %>
+            spec.files =\n<%= files.sort.inspect %>
             spec.executables = <%= executables.inspect %>
-            
+          #{'  '}
             spec.require_path = "lib"
 
             spec.test_files = <%= test_files.inspect %>
@@ -149,20 +151,20 @@ task :gemspec do
             spec.homepage = <%= This.homepage.inspect %>
           end
         __
-      }
+      end
     end
 
   Fu.mkdir_p(This.pkgdir)
-  gemspec = "#{ lib }.gemspec"
-  open(gemspec, "w"){|fd| fd.puts(template)}
+  gemspec = "#{lib}.gemspec"
+  open(gemspec, 'w') { |fd| fd.puts(template) }
   This.gemspec = gemspec
 end
 
-task :gem => [:clean, :gemspec] do
+task gem: %i[clean gemspec] do
   Fu.mkdir_p(This.pkgdir)
   before = Dir['*.gem']
-  cmd = "gem build #{ This.gemspec }"
-  `#{ cmd }`
+  cmd = "gem build #{This.gemspec}"
+  `#{cmd}`
   after = Dir['*.gem']
   gem = ((after - before).first || after.first) or abort('no gem!')
   Fu.mv(gem, This.pkgdir)
@@ -176,81 +178,74 @@ task :readme do
   version = This.version
 
   Dir['sample*/*'].sort.each do |sample|
-    samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
+    samples << "\n" << "  <========< #{sample} >========>" << "\n\n"
 
-    cmd = "cat #{ sample }"
+    cmd = "cat #{sample}"
     samples << Util.indent(prompt + cmd, 2) << "\n\n"
-    samples << Util.indent(`#{ cmd }`, 4) << "\n"
+    samples << Util.indent(`#{cmd}`, 4) << "\n"
 
-    cmd = "ruby #{ sample }"
+    cmd = "ruby #{sample}"
     samples << Util.indent(prompt + cmd, 2) << "\n\n"
 
-    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{ sample })'"
-    samples << Util.indent(`#{ cmd } 2>&1`, 4) << "\n"
+    cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -I ./lib #{sample})'"
+    samples << Util.indent(`#{cmd} 2>&1`, 4) << "\n"
   end
 
-  template = 
-    if test(?e, 'README.erb')
-      Template{ IO.read('README.erb') }
+  template =
+    if test('e', 'README.erb')
+      Template { IO.read('README.erb') }
     else
-      Template {
+      Template do
         <<-__
           NAME
-            #{ lib }
+            #{lib}
 
           DESCRIPTION
 
           INSTALL
-            gem install #{ lib }
+            gem install #{lib}
 
           SAMPLES
-            #{ samples }
+            #{samples}
         __
-      }
+      end
     end
 
-  open("README", "w"){|fd| fd.puts template}
+  open('README', 'w') { |fd| fd.puts template }
 end
 
-
 task :clean do
-  Dir[File.join(This.pkgdir, '**/**')].each{|entry| Fu.rm_rf(entry)}
+  Dir[File.join(This.pkgdir, '**/**')].each { |entry| Fu.rm_rf(entry) }
 end
 
-
-task :release => [:clean, :gemspec, :gem] do
+task release: %i[clean gemspec gem] do
   gems = Dir[File.join(This.pkgdir, '*.gem')].flatten
-  raise "which one? : #{ gems.inspect }" if gems.size > 1
-  raise "no gems?" if gems.size < 1
+  raise "which one? : #{gems.inspect}" if gems.size > 1
+  raise 'no gems?' if gems.size < 1
 
-  cmd = "gem push #{ This.gem }"
+  cmd = "gem push #{This.gem}"
   puts cmd
   puts
   system(cmd)
-  abort("cmd(#{ cmd }) failed with (#{ $?.inspect })") unless $?.exitstatus.zero?
+  abort("cmd(#{cmd}) failed with (#{$?.inspect})") unless $?.exitstatus.zero?
 end
 
-
-
-
-
 BEGIN {
-# support for this rakefile
-#
+  # support for this rakefile
+  #
   $VERBOSE = nil
 
   require 'ostruct'
   require 'erb'
   require 'fileutils'
   require 'rbconfig'
-  require 'pp'
 
-# fu shortcut
-#
+  # fu shortcut
+  #
   Fu = FileUtils
 
-# cache a bunch of stuff about this rakefile/environment
-#
+  # cache a bunch of stuff about this rakefile/environment
+  #
   This = OpenStruct.new
 
   This.file   = File.expand_path(__FILE__)
@@ -258,115 +253,116 @@ BEGIN {
   This.pkgdir = File.join(This.dir, 'pkg')
 
   This.lib    = File.basename(Dir.pwd)
-  This._lib    = "#{ This.dir }/lib/#{ This.lib }/_lib.rb" 
+  This._lib = "#{This.dir}/lib/#{This.lib}/_lib.rb"
 
-# load meta lib info
-#
+  # load meta lib info
+  #
   a = Object.constants.dup
   require This._lib
   b = Object.constants.dup
   added = b - a
   const = added.first
 
-  if added.size > 1
-    STDERR.puts "WARNING: defined multiple constants #{ added.inspect } in #{ _lib }, using #{ const } !!!"
-  end
+  warn "WARNING: defined multiple constants #{added.inspect} in #{_lib}, using #{const} !!!" if added.size > 1
 
   This.const   = const
   This.object  = Object.const_get(This.const)
   This.name    = This.object.name
   This.version = This.object.send(:version)
 
-# see if dependencies are export by the module
-#
-  if This.object.respond_to?(:dependencies)
-    This.dependencies = This.object.dependencies
-  end
+  # see if dependencies are export by the module
+  #
+  This.dependencies = This.object.dependencies if This.object.respond_to?(:dependencies)
 
-# we need to know the name of the lib an it's version
-#
+  # we need to know the name of the lib an it's version
+  #
   abort('no lib') unless This.lib
   abort('no version') unless This.version
 
-# discover full path to this ruby executable
-#
+  # discover full path to this ruby executable
+  #
   c                 = RbConfig::CONFIG
-  bindir            = c["bindir"] || c['BINDIR']
+  bindir            = c['bindir'] || c['BINDIR']
   ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
   ruby_ext          = c['EXEEXT'] || ''
   ruby              = File.join(bindir, (ruby_install_name + ruby_ext))
   This.ruby         = ruby
 
-# some utils
-#
+  # some utils
+  #
   module Util
     def indent(s, n = 2)
       s = unindent(s)
       ws = ' ' * n
-      s.gsub(%r/^/, ws)
+      s.gsub(/^/, ws)
     end
 
     def unindent(s)
       indent = nil
       s.each_line do |line|
-      next if line =~ %r/^\s*$/
-      indent = line[%r/^\s*/] and break
+        next if line =~ /^\s*$/
+
+        indent = line[/^\s*/] and break
+      end
+      indent ? s.gsub(/^#{indent}/, '') : s
     end
-    indent ? s.gsub(%r/^#{ indent }/, "") : s
-  end
     extend self
   end
 
-# template support
-#
+  # template support
+  #
   class Template
     def initialize(&block)
       @block = block
       @template = block.call.to_s
     end
-    def expand(b=nil)
-      ERB.new(Util.unindent(@template)).result((b||@block).binding)
+
+    def expand(b = nil)
+      ERB.new(Util.unindent(@template)).result((b || @block).binding)
     end
     alias_method 'to_s', 'expand'
   end
-  def Template(*args, &block) Template.new(*args, &block) end
 
-# colored console output support
-#
+  def Template(*args, &block)
+    Template.new(*args, &block)
+  end
+
+  # colored console output support
+  #
   This.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"
+    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"
   }
   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)}
+    keys.each { |key| options[key.to_s.to_sym] = options.delete(key) }
 
     color = options[:color]
     bold = options.has_key?(:bold)
@@ -381,7 +377,7 @@ BEGIN {
     Kernel.send(method, parts.join)
   end
 
-# always run out of the project dir
-#
+  # always run out of the project dir
+  #
   Dir.chdir(This.dir)
 }

data/bin/rego

@@ -1,24 +1,15 @@
 #! /usr/bin/env ruby
 
-Main {
+Main do
+  name 'rego'
 
-  name <<-__
-
-    rego
-
-  __
+  version Rego.version
 
   description <<-__
-
     run arbitrary commands easily when files change
-
   __
 
   examples <<-__
-
-    ### gem install rego
-
-    
     # say hai whenever the file foo.txt changes
     #
       ~> rego foo.txt -- echo hai
@@ -40,344 +31,134 @@ Main {
       ~> rego ./test -- ruby -Itest @
   __
 
-  option('--replacement=replacement', '-r'){
-    default '@'
-  }
-
-  option('--no-replacement', '-n'){
-  }
+  option('--path=path', '-p')
+  option('--paths=paths')
+  option('--command=command', '-c')
+  option('--version', '-v')
 
   def run
-    parse_the_command_line
-    print_a_summary_of_watched_files
-    loop_watching_files_and_running_commands
-  end
-
-  def parse_the_command_line
-  # FIXME - this works around main.rb dropping '--' on the floor in @argv so
-  # we restore it and re-parse params to restore valid state.  should be
-  # forward compatible if main fixes this though...
-  #
-    argv, command = ARGV.join(' ').split(/\s+--\s+/).map{|value| value.to_s.strip}
-    @argv = argv.scan(/[^\s]+/)
-    parse_parameters()
-
-    @replacement = params[:replacement].value
-
-    if params['no-replacement'].given?
-      @replacement = false
+    if params[:version].given?
+      puts version
+      exit
     end
 
-    @paths, @command = @argv, command
-
-    @paths = @paths.join(' ').strip.scan(/[^\s]+/)
-    @command = @command.to_s.strip
-
-    if @paths.empty?
-      @paths.push('.')
-    end
-
-    if @command.empty?
-      @command = false
-    end
+    parse_the_command_line!
+    print_a_summary_of_watched_files!
+    loop_watching_files_and_running_commands!
+  end
 
-    @paths.map! do |path|
-      if test(?d, path)
-        globbed = 
-          Dir.glob(
-            File.join(path, '**/**'),
-            File::FNM_DOTMATCH
-          ).delete_if{|path| %w[ .. ].include?(File.basename(path))}
+  def parse_the_command_line!
+    @paths = @params[:paths].values + @params[:path].values
+    @command = @params[:command].values
 
-        [path, globbed]
-      else
-        path
-      end
-    end
+    state = :paths
 
-    @paths.flatten!
-    @paths.compact!
-    @paths.uniq!
-    @paths.map! do |path|
-      begin
-        Rego.realpath(path)
-      rescue Object
-        nil
+    @argv.each do |arg|
+      if arg.strip == '--'
+        state = :commands
+        next
       end
-    end
-    @paths.compact!
-  end
-
-  def print_a_summary_of_watched_files
-    puts "## #{ @command }"
-    puts "#"
-    puts @paths.join("\n")
-    puts
-  end
-
-  def loop_watching_files_and_running_commands
-    @initial_directories = []
-    @directories = []
-    @files = []
 
-    @paths.each do |path|
-      if test(?d, path)
-        @directories.push(Rego.realpath(path))
-        @initial_directories.push(Rego.realpath(path))
+      if state == :paths
+        @paths << arg
       else
-        @files.push(Rego.realpath(path))
-        @directories.push(Rego.realpath(File.dirname(path)))
+        @command << arg
       end
     end
 
-    @directories.uniq!
-    @files.uniq!
+    @paths.push(Dir.pwd) if @paths.empty?
+    @command.push('ls') if @command.empty?
 
-    stats = {} 
-
-    (@directories + @files).each do |file|
-      begin
-        stats[file] = File.stat(file)
-      rescue
-        nil
-      end
-    end
+    @pretty = {
+      command: @command.map { |token| Shellwords.escape(token) }.join(' '),
+      paths: @paths.map { |path| Rego.relative_path(path, from: Dir.pwd) }.join(', ')
+    }
 
-  #
-    n        = '0'
-    line     = '#' * 42
-    $running = false
+    return unless @paths.empty?
 
-  #
-    rego =
-      proc do |*args|
-        path = args.flatten.compact.shift.to_s
+    abort "no paths to watch found in `#{$0} #{@argv.join(' ')}`"
+  end
 
-        cmd =
-          if @command
-            @replacement ? @command.gsub(@replacement, path) : @command
-          else
-            "echo #{ path.inspect }"
-          end
+  def print_a_summary_of_watched_files!
+    Rego.say("#=> rego.command: #{@pretty[:command]}", color: :cyan)
+    Rego.say("#=> rego.paths: #{@pretty[:paths]}", color: :cyan)
+    puts
+  end
 
-        puts line
+  def loop_watching_files_and_running_commands!
+    cmdno = '0'
 
-        Rego.say("# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ cmd }", :color => :magenta)
+    rego =
+      proc do
         puts
+        Rego.say("#=> rego.#{cmdno} @ #{Time.now.strftime('%H:%M:%S')} -> #{@pretty[:command]}", color: :yellow)
 
-        system(cmd)
+        success = system(*@command)
         puts
 
-        Rego.say("# rego.#{ n } @ #{ Time.now.strftime('%H:%M:%S') } - #{ $?.exitstatus }", :color => :yellow)
+        Rego.say("#=> rego.#{cmdno} @ #{Time.now.strftime('%H:%M:%S')} -> #{$?.exitstatus}",
+                 color: (success ? :green : :red))
         puts
 
-        n.succ!
-      end
-
-  #
-    q = Queue.new
-
-    Thread.new do
-      loop do
-        args = q.pop
-
-        begin
-          rego.call(*args)
-        rescue Object
-        end
-      end
-    end
-
-    rego.call(:__START__)
-
-  #
-    fsevent = FSEvent.new
-
-    options = {
-      :latency     => 0.01,
-      :no_defer    => true,
-      :file_events => true,
-      :since_when  => 0
-    }
-
-    watchlist = (@files + @directories).uniq
-
-    watching = watchlist.inject(Hash.new){|hash, path| hash.update(path => true)}
-
-    fsevent.watch(watchlist, options) do |directories, meta|
-      meta   = Map.for(meta)
-      events = meta.events
-      paths  = []
-
-      meta.events.each do |event|
-        paths << event.path
-      end
-
-      paths.flatten.compact.sort.uniq.each do |path|
-        path =
-          begin
-            Rego.realpath(path)
-          rescue Object
-            next
-          end
-
-        ignore = false # TODO
-
-        unless ignore
-          @initial_directories.each do |directory|
-            if path =~ /^#{ Regexp.escape(directory) }\b/
-              watching[path] = true
-            end
-          end
-
-          if watching[path]
-            before = stats[path]
-            after = File.stat(path)
-
-            if before.nil? or after.mtime > before.mtime
-              stats[path] = after
-              @started_at ||= Time.now.to_f
-              q.push(path)
-            end
-          end
-        end
-      end
-
-=begin
-      unless $running
-        $running = true
-
-        args.flatten.each do |dir|
-          glob = File.join(dir, '**/**')
-          entries = Dir.glob(glob)
-
-          entries.each do |entry|
-            entry = File.expand_path(entry)
-            next unless stats.has_key?(entry)
-
-            begin
-              stats[entry] ||= File.stat(entry)
-              before = stats[entry]
-              after = File.stat(entry)
-            rescue
-              next
-            end
-
-            unless before.mtime == after.mtime
-              stats[entry] = after
-              rego[ entry ]
-            end
-          end
-        end
+        cmdno.succ!
       end
-      $running = false
-=end
-    end
 
-    begin
-      fsevent.run
-    rescue SignalException
-      exit(0)
-    end
-  end
-=begin
-    fsevent = FSEvent.new
-
-    fsevent.watch(
-
-      @directories,
-        :latency     => 0.42,
-        :no_defer    => true,
-        :file_events => true,
-        :watch_root  => true,
-        :since_when  => 0
-
-    ) do |*args|
-      unless $running
-        $running = true
-
-        args.flatten.each do |dir|
-          glob = File.join(dir, '**/**')
-          entries = Dir.glob(glob)
-
-          entries.each do |entry|
-            entry = File.expand_path(entry)
-            next unless stats.has_key?(entry)
-
-            begin
-              stats[entry] ||= File.stat(entry)
-              before = stats[entry]
-              after = File.stat(entry)
-            rescue
-              next
-            end
-
-            unless before.mtime == after.mtime
-              stats[entry] = after
-              rego[ entry ]
-            end
-          end
-        end
-      end
-      $running = false
+    listener = Listen.to(*@paths) do |_modified, _added, _removed|
+      rego.call
     end
 
     begin
-      fsevent.run
+      rego.call
+      listener.start
+      sleep
     rescue SignalException
       exit(0)
     end
   end
-=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...
 #
-if false
-  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)
+unless (pid = fork)
+  ppid = Process.ppid
+
+  begin
+    trap('SIGINT') do
+      %w[
+        SIGTERM SIGINT SIGQUIT SIGKILL
+      ].each do |signal|
+        begin
+          Process.kill("-#{signal}", ppid)
+        rescue Object
+          nil
         end
-      }
 
-      loop do
-        Process.kill(0, ppid)
-        sleep(1)
+        sleep(rand)
       end
-    rescue Object => e
-      exit!(0)
     end
+
+    loop do
+      Process.kill(0, ppid)
+      sleep(1)
+    end
+  rescue Object => e
+    exit!(0)
   end
 end
 
-  require 'pathname'
-  require 'thread'
+require 'pathname'
 
-  this = Pathname.new(__FILE__).realpath.to_s
-  bindir = File.dirname(this)
-  rootdir = File.dirname(bindir)
-  libdir = File.join(rootdir, 'lib')
-  rego = File.join(libdir, 'rego.rb')
+this = Pathname.new(__FILE__).realpath.to_s
+bindir = File.dirname(this)
+rootdir = File.dirname(bindir)
+libdir = File.join(rootdir, 'lib')
+lib = File.join(libdir, 'rego.rb')
 
-  require(rego)
+require(lib)
 
-  STDOUT.sync = true
-  STDERR.sync = true
-  STDIN.sync = true
+STDOUT.sync = true
+STDERR.sync = true
+STDIN.sync = true
 }

data/lib/rego/_lib.rb

@@ -1,34 +1,34 @@
 module Rego
-  Version = '3.1.0' unless defined?(Version)
+  Version = '3.2.1' unless defined?(Version)
 
-  def Rego.version
+  def self.version
     Rego::Version
   end
 
-  def Rego.dependencies
+  def self.dependencies
     {
-      'main'       =>  [ 'main'       , ' ~> 6.3.0'    ]  , 
-      'map'        =>  [ 'map'        , ' ~> 6.6.0'  ]  , 
-      'rb-fsevent' =>  [ 'rb-fsevent' , ' ~> 0.11.2' ]  , 
+      'main' => ['main', ' ~> 6.3.0'],
+      'map' => ['map', ' ~> 6.6.0'],
+      'listen' => ['listen', ' ~> 3.8.0']
     }
   end
 
-  def Rego.libdir(*args, &block)
-    @libdir ||= File.basename(File.expand_path(__FILE__).sub(/\.rb$/,''))
+  def self.libdir(*args, &block)
+    @libdir ||= File.basename(File.expand_path(__FILE__).sub(/\.rb$/, ''))
     args.empty? ? @libdir : File.join(@libdir, *args)
   ensure
     if block
       begin
         $LOAD_PATH.unshift(@libdir)
-        block.call()
+        block.call
       ensure
-        $LOAD_PATH.shift()
+        $LOAD_PATH.shift
       end
     end
   end
 
-  def Rego.load(*libs)
+  def self.load(*libs)
     libs = libs.join(' ').scan(/[^\s+]+/)
-    Rego.libdir{ libs.each{|lib| Kernel.load(lib) } }
+    Rego.libdir { libs.each { |lib| Kernel.load(lib) } }
   end
 end

data/lib/rego/utils.rb

@@ -1,10 +1,17 @@
 module Rego
-  def Rego.realpath(path)
+  def self.realpath(path)
     Pathname.new(path).realpath.to_s
   end
 
-  def Rego.tmpdir(&block)
-    tmpdir = File.join(Dir.tmpdir, ['rego', Process.ppid.to_s, Process.pid.to_s, Thread.current.object_id.to_s].join('-') + '.d')
+  def self.relative_path(path, options = {})
+    path = File.expand_path(String(path))
+    relative = File.expand_path(String(options[:from]))
+    Pathname.new(path).relative_path_from(Pathname.new(relative)).to_s
+  end
+
+  def self.tmpdir(&block)
+    tmpdir = File.join(Dir.tmpdir,
+                       ['rego', Process.ppid.to_s, Process.pid.to_s, Thread.current.object_id.to_s].join('-') + '.d')
 
     FileUtils.mkdir_p(tmpdir)
 
@@ -13,18 +20,18 @@ module Rego
         Dir.chdir(tmpdir, &block)
       ensure
         FileUtils.rm_rf(tmpdir)
-        at_exit{ `rm -rf #{ tmpdir }` }
+        at_exit { `rm -rf #{tmpdir}` }
       end
     else
       tmpdir
     end
   end
 
-  def Rego.say(phrase, *args)
+  def self.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)}
+    keys.each { |key| options[key.to_s.to_sym] = options.delete(key) }
 
     color = options[:color]
     bold = options.has_key?(:bold)
@@ -43,32 +50,32 @@ module Rego
   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"
+    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"
   }
 end

data/lib/rego.rb

@@ -2,10 +2,11 @@ require 'time'
 require 'pathname'
 require 'yaml'
 require 'tmpdir'
+require 'shellwords'
 
 module Rego
-  require_relative 'rego/_lib.rb'
-  require_relative 'rego/utils.rb'
+  require_relative 'rego/_lib'
+  require_relative 'rego/utils'
 end
 
 # gems

data/rego.gemspec

@@ -3,24 +3,14 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rego"
-  spec.version = "3.1.0"
+  spec.version = "3.2.1"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rego"
   spec.description = "description: rego kicks the ass"
   spec.license = "Ruby"
 
   spec.files =
-["README.md",
- "Rakefile",
- "bin",
- "bin/rego",
- "lib",
- "lib/rego",
- "lib/rego.rb",
- "lib/rego/_lib.rb",
- "lib/rego/utils.rb",
- "rego.gemspec"]
-
+["README.md", "Rakefile", "bin", "bin/rego", "lib", "lib/rego", "lib/rego.rb", "lib/rego/_lib.rb", "lib/rego/utils.rb", "rego.gemspec"]
   spec.executables = ["rego"]
   
   spec.require_path = "lib"
@@ -32,7 +22,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["map", " ~> 6.6.0"])
   
-    spec.add_dependency(*["rb-fsevent", " ~> 0.11.2"])
+    spec.add_dependency(*["listen", " ~> 3.8.0"])
   
 
   spec.extensions.push(*[])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rego
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 6.6.0
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 3.8.0
 description: 'description: rego kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: rego