condenser 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d330a97b14eba56db0e2404b7b5c8bc95880c5a17ef8886bc0fed653311dcb0f
-  data.tar.gz: 8b67113289b161903a55be74073ad979580710fd557f5ad97c6c1e65ef903200
+  metadata.gz: 31107c23d48e2044816158df8cc737fdea156e2227763f4ad1409dcc36406388
+  data.tar.gz: 3936450c32a7340a50345cc389351c2894b3263ca7e1c8f54563336a0977a445
 SHA512:
-  metadata.gz: df64dbbbb0ec741c7d4af17d71d4dd0e855fc82f13220775353c361ae4da0254cd233fbeb143bca2536c8331b425c67b3247151fc59214fef5a34b8c1a13880d
-  data.tar.gz: 563064dd6255fb14cbd7bed0ae7bbc6bd64a1c019e7ed3f2837c449c05041333b5c4aca91391e918fbf8b99d4aa7e0725b120cb30819467f193ddd48347cb607
+  metadata.gz: 0cf137d71f65b067b88e480756b74814e9e88df0342574fc7f466b87aa64515433a9c1dbf827c49aa1d816d20c0c640be6a97d55dba814aeeceade3ed200e37b
+  data.tar.gz: cf154ab552d503a93ce487f1c7f9561faa07391c7e29d7190a66ca7e3bd9c6a842dd574193720484a84bcfba6430be58665f141519c5a4b024621169c4c89fe7

data/lib/condenser/build_cache.rb

@@ -1,71 +1,78 @@
-require 'listen'
-
 class Condenser
   class BuildCache
     
-    attr_reader :semaphore
+    attr_reader :semaphore, :listening
     
-    def initialize(path)
+    def initialize(path, listen: {})
       @path = path
-      @semaphore = Mutex.new
-      @polling   = Listen::Adapter.select == Listen::Adapter::Polling
       @map_cache = {}
       @lookup_cache = {}
       @process_dependencies = {}
       @export_dependencies = {}
-
-      @listener = Listen.to(*path) do |modified, added, removed|
-        @semaphore.synchronize do
-          added = added.reduce([]) do |rt, added_file|
-            rt << added_file.match(/([^\.]+)(\.|$)/).to_a[1]
-            if path_match = @path.find { |p| added_file.start_with?(p) }
-              a = added_file.delete_prefix(path_match).match(/([^\.]+)(\.|$)/).to_a[1]
-              b = (File.dirname(a) + "/*")
+      @listening = if listen
+        require 'listen'
+        Listen::Adapter.select != Listen::Adapter::Polling
+      else
+        false
+      end
+      
+      if !@listening
+        @polling = false
+      else
+        @semaphore = Mutex.new
+        @listener = Listen.to(*path) do |modified, added, removed|
+          @semaphore.synchronize do
+            added = added.reduce([]) do |rt, added_file|
+              rt << added_file.match(/([^\.]+)(\.|$)/).to_a[1]
+              if path_match = @path.find { |p| added_file.start_with?(p) }
+                a = added_file.delete_prefix(path_match).match(/([^\.]+)(\.|$)/).to_a[1]
+                b = (File.dirname(a) + "/*")
               
-              rt << a << a.delete_prefix('/')
-              rt << a << b.delete_prefix('/')
+                rt << a << a.delete_prefix('/')
+                rt << a << b.delete_prefix('/')
+              end
             end
-          end
           
-          removed.each do |file|
-            @map_cache&.delete_if do |k,v|
-              v.source_file == file
-            end
+            removed.each do |file|
+              @map_cache&.delete_if do |k,v|
+                v.source_file == file
+              end
             
-            @process_dependencies[file]&.delete_if do |asset|
-              asset.source_file == file
-            end
+              @process_dependencies[file]&.delete_if do |asset|
+                asset.source_file == file
+              end
             
-            @export_dependencies[file]&.delete_if do |asset|
-              asset.source_file == file
+              @export_dependencies[file]&.delete_if do |asset|
+                asset.source_file == file
+              end
             end
-          end
 
-          @lookup_cache.delete_if do |key, value|
-            if added.any?{ |a| key.starts_with?(a) }
-              value.each do |asset|
-                modified << asset.source_file
+            @lookup_cache.delete_if do |key, value|
+              if added.any?{ |a| key.starts_with?(a) }
+                value.each do |asset|
+                  modified << asset.source_file
+                end
+                true
               end
-              true
             end
-          end
-          @map_cache&.delete_if do |k,v|
-            added.any?{ |a| k.starts_with?(a) }
-          end
-          
-          modified.each do |file|
-            @process_dependencies[file]&.each do |asset|
-              asset.needs_reprocessing!
+            @map_cache&.delete_if do |k,v|
+              added.any?{ |a| k.starts_with?(a) }
             end
+          
+            modified.each do |file|
+              @process_dependencies[file]&.each do |asset|
+                asset.needs_reprocessing!
+              end
             
-            @export_dependencies[file]&.each do |asset|
-              asset.needs_reexporting!
+              @export_dependencies[file]&.each do |asset|
+                asset.needs_reexporting!
+              end
             end
-          end
           
+          end
         end
+        @listener.start
       end
-      @listener.start
     end
     
     def map(key)

data/lib/condenser/resolve.rb

@@ -1,8 +1,9 @@
 class Condenser
   module Resolve
     
-    def initialize(*args)
+    def initialize(*args, **kws, &block)
       @reverse_mapping = nil
+      @build_cache_options = kws[:listen]
       super
     end
     
@@ -134,22 +135,13 @@ class Condenser
     def build
       @build_cc += 1
       if @build_cc == 1
-        # if @file_watcher_active
-          # sleep 0.25 #if !@build_cache_polling # Let the Listen gem flush
-          build_cache.semaphore.lock
-        # else
-        #   @build_cache = {}
-        # end
+        build_cache.semaphore.lock if build_cache.listening
       end
       yield
     ensure
       @build_cc -= 1
       if @build_cc == 0
-        # if @file_watcher_active
-          build_cache.semaphore.unlock
-        # else
-        #   @build_cache = nil
-        # end
+        build_cache.semaphore.unlock if build_cache.listening
       end
     end
     

data/lib/condenser/version.rb

@@ -1,3 +1,3 @@
 class Condenser
-  VERSION = '0.0.11'
+  VERSION = '0.0.12'
 end

data/test/manifest_test.rb

@@ -262,9 +262,8 @@ class ManifestTest < ActiveSupport::TestCase
     assert_equal digest_path, data['application.js']['path']
 
     File.write(File.join(@path, 'application.js'), "console.log(2);")
+    sleep 0.25 if @env.build_cache.listening
 
-    # mtime = Time.now + 1
-    # File.utime(mtime, mtime, filename)
     new_digest_path = @env['application.js'].path
     assert_not_equal new_digest_path, digest_path
 

data/test/test_helper.rb

@@ -60,6 +60,7 @@ class ActiveSupport::TestCase
   end
   
   def assert_file(path, mime_types, source=nil)
+    sleep 0.25 if @env.build_cache.listening
     asset = @env.find(path)
     assert asset, "Couldn't find asset \"#{path}\""
     asset.process
@@ -69,6 +70,7 @@ class ActiveSupport::TestCase
   end
   
   def assert_exported_file(path, mime_types, source=nil)
+    sleep 0.25 if @env.build_cache.listening
     asset = @env.find(path)
     assert asset, "Couldn't find asset \"#{path}\""
     asset = asset.export

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: condenser
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Jon Bracy