rego 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81b3c327cbc803c238d9aa4fecd8a178a5b89d71
-  data.tar.gz: 991daf0148a99d859d3d010b7d30c78ade144ee1
+SHA256:
+  metadata.gz: bb49b3d2016108b3dec5ada89bc0e68ab2a5910845a629926929f10510a62f2c
+  data.tar.gz: 27aac62ef93b549bb813978e17b1202c8b5af1ce06c4324fed147bcebbdc4bc2
 SHA512:
-  metadata.gz: 395205b2b86a2449ed4ff58ab9343bbea8da055b6574477f18da28d4c3be8df0677568be085c851d69faf149f472deaa85daa61920cbcd7003ad6efe19db44c8
-  data.tar.gz: ea33a297d3a489fe31c49cb1f90e8b99eaa91008c35da8761d2901ece6dfe5434d5ccedc07f9b5ce55b3ae0d27ce55924d9efaa6439dc2daf24f185cc50828c9
+  metadata.gz: 9e4ae3bf5f6947650575517dc3d679983e119e724f50f9edf5e6474d850067439766633b2022a0c706d226ff4f4aeb89b85f18d8979d76eaaacb1a27f25f6dee
+  data.tar.gz: a9e310138224b88f4f4b3a9858a3a3dd3517f97c7525884a4a521d50e27425d72c0a7ecdda004aab34fd98b1a68ae90226384764d87ccf995c0c93d71eff7052

data/bin/rego

@@ -68,44 +68,19 @@ Main {
       @replacement = false
     end
 
-    @paths, @command = @argv, command
+    _args, _command = @argv, command
+    _paths = _args.join(' ').strip.scan(/[^\s]+/)
 
-    @paths = @paths.join(' ').strip.scan(/[^\s]+/)
-    @command = @command.to_s.strip
-
-    if @paths.empty?
-      @paths.push('.')
+    if _paths.empty?
+      _paths.push '.'
     end
 
+    @paths = _args.join(' ').strip.scan(/[^\s]+/).sort.uniq
+    @command = _command.to_s.strip
+
     if @command.empty?
       @command = false
     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))}
-
-        [path, globbed]
-      else
-        path
-      end
-    end
-
-    @paths.flatten!
-    @paths.compact!
-    @paths.uniq!
-    @paths.map! do |path|
-      begin
-        Rego.realpath(path)
-      rescue Object
-        nil
-      end
-    end
-    @paths.compact!
   end
 
   def print_a_summary_of_watched_files
@@ -191,144 +166,36 @@ Main {
     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)}
+    watchlist =
+      [].tap do |list|
+        @directories.each do |directory|
+          list.push directory
+        end
 
-    fsevent.watch(watchlist, options) do |directories, meta|
-      meta   = Map.for(meta)
-      events = meta.events
-      paths  = []
+        @files.each do |file|
+          list.push File.dirname(file)
+        end
 
-      meta.events.each do |event|
-        paths << event.path
+        list.flatten!
+        list.sort!
+        list.uniq!
       end
+    
+    watching = watchlist.inject(Hash.new){|hash, path| hash.update(path => true)}
 
-      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)
+    listener = Listen.to(*watchlist) do |modified, added, removed|
+      paths = [modified, added, removed].flatten.compact.sort.uniq
 
-            if before.nil? or after.mtime > before.mtime
-              stats[path] = after
-              @started_at ||= Time.now.to_f
-              q.push(path)
-            end
-          end
-        end
+      paths.each do |path|
+        q.push(path)
       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
-      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
-    end
+    listener.start
 
-    begin
-      fsevent.run
-    rescue SignalException
-      exit(0)
-    end
+    sleep
   end
-=end
 }
 
 
@@ -368,6 +235,7 @@ end
 
   require 'pathname'
   require 'thread'
+  require 'set'
 
   this = Pathname.new(__FILE__).realpath.to_s
   bindir = File.dirname(this)

data/lib/rego/_lib.rb

@@ -1,5 +1,5 @@
 module Rego
-  Version = '2.1.0' unless defined?(Version)
+  Version = '3.0.0' unless defined?(Version)
 
   def Rego.version
     Rego::Version
@@ -7,14 +7,14 @@ module Rego
 
   def Rego.dependencies
     {
-      'main'       =>  [ 'main'       , ' ~> 6.0'    ]  , 
-      'map'        =>  [ 'map'        , ' ~> 6.6'  ]  , 
-      'rb-fsevent' =>  [ 'rb-fsevent' , ' ~> 0.10' ]  , 
+      'main'   => [ 'main'   , ' ~> 6.0'    ] , 
+      'map'    => [ 'map'    , ' ~> 6.6'  ]   , 
+      'listen' => [ 'listen' , '~> 3.0' ]     , 
     }
   end
 
   def Rego.libdir(*args, &block)
-    @libdir ||= File.expand_path(__FILE__).sub(/\.rb$/,'')
+    @libdir ||= File.basename(File.expand_path(__FILE__).sub(/\.rb$/,''))
     args.empty? ? @libdir : File.join(@libdir, *args)
   ensure
     if block

data/rego.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "rego"
-  spec.version = "2.1.0"
+  spec.version = "3.0.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "rego"
   spec.description = "description: rego kicks the ass"
@@ -32,7 +32,7 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["map", " ~> 6.6"])
   
-    spec.add_dependency(*["rb-fsevent", " ~> 0.10"])
+    spec.add_dependency(*["listen", "~> 3.0"])
   
 
   spec.extensions.push(*[])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rego
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -39,19 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '6.6'
 - !ruby/object:Gem::Dependency
-  name: rb-fsevent
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '3.0'
 description: 'description: rego kicks the ass'
 email: ara.t.howard@gmail.com
 executables:
@@ -85,10 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: codeforpeople
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: rego
 test_files: []
-has_rdoc: