alki-reload 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b05597e13de69db0fcbc34fd150c89fde3647a24
-  data.tar.gz: 6e7161d23ae9d232b7e7c0e5309ca6e3b49871a6
+  metadata.gz: be36a892fb4393ecba3d020801a03c8b985a6310
+  data.tar.gz: 2de7375d65893da50750ad67b2e24d3ff7619cb0
 SHA512:
-  metadata.gz: 672a296eadf628c9cbb3a5a3f53766d1c67d48b22e30ff53d865b89f151897197219643bb336c2f892333aed1671a230948763bd1dc34eed0a13e83067ef19c0
-  data.tar.gz: 751e2cc7bcb01466edb10ddb95d15017b2e3f53732d99f75f4e6eaab333a7de28c8ec629955bc8fe625c9cbc9f9438250ed2728d624af3ec03c9dd9e2e522ed5
+  metadata.gz: 22a60b747ee36f7ac4fdbe5ce3eaedcd7b00af3e90b8fc84e6132d22d695f6e14f0b7c84b4363340d8158bae5b755f5833b9f40bdb7f1a10e5586f35716a86d8
+  data.tar.gz: eb07452afb7353eb4e2a44343a3a03ff83233015886f4d83382daa9d1a5fadac9d6b83fc58e7638fed37db5ea94d000e03ec054988d99b66230200b53397665f

data/alki-reload.gemspec

@@ -23,5 +23,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "listen", "~> 3.0"
-  spec.add_dependency "alki", "~> 0.10"
+  spec.add_dependency "alki", "~> 0.12"
+  spec.add_dependency "alki-testing", "~> 0.1"
 end

data/config/assembly.rb

@@ -71,22 +71,25 @@ Alki do
     Alki::Reload::Unloader.new handlers, whitelist
   end
 
+  tag :stop_on_reload
   service :watcher do
-    require 'alki/reload/listen_watcher'
-    Alki::Reload::ListenWatcher.new assembly, watch_dirs
+    if watch
+      require 'alki/reload/listen_watcher'
+      Alki::Reload::ListenWatcher.new assembly, watch_dirs
+    else
+      require 'alki/reload/null_watcher'
+      Alki::Reload::NullWatcher.new
+    end
   end
 
-  overlay :watcher, :on_reload, :stop!
+  overlay '%stop_on_reload', :on_reload, :stop
 
   overlay 'root.assembly_instance', :assembly_delegator
 
   factory :assembly_delegator do
     require 'alki/reload/assembly_delegator'
-    if watch
-      self.watcher.start!
-    end
     -> obj {
-      Alki::Reload::AssemblyDelegator.new obj, reloader
+      Alki::Reload::AssemblyDelegator.new obj, watcher, reloader
     }
   end
 

data/lib/alki/reload/assembly_delegator.rb

@@ -3,20 +3,22 @@ require 'delegate'
 module Alki
   module Reload
     class AssemblyDelegator < Delegator
-      def initialize(obj,reloader)
+      def initialize(obj,watcher,reloader)
         @obj = obj
+        @loaded = false
+        @watcher = watcher
         @reloader = reloader
       end
 
-      def __reload__
-        if @obj.respond_to? :__reload__
-          return false unless @obj.__reload__
-        end
-
+      def __unload__
         @reloader.reload
       end
 
       def __getobj__
+        unless @loaded
+          @loaded = true
+          @watcher.start
+        end
         @obj
       end
     end

data/lib/alki/reload/listen_watcher.rb

@@ -1,71 +1,53 @@
 require 'listen'
-require 'weakref'
+require 'concurrent'
 
 module Alki
   module Reload
     class ListenWatcher
       @listeners = {}
 
-      def initialize(reloader,dirs)
-        @reloader = reloader
-        @dirs = dirs
+      def self.listener(dirs,reloader)
+        @listeners[dirs] ||= Listener.new(dirs,reloader)
       end
 
-      def start!
-        start_thread unless @thread
+      def initialize(reloader,dirs)
+        @listener = self.class.listener dirs, reloader
+        @started = false
       end
 
-      def stop!
-        if @thread && @thread != Thread.current
-          @queue.clear
-          @queue << :done
-          @thread.join
+      def start
+        unless @started
+          @listener.start
+          @started = true
         end
       end
 
-      private
-
-      def self.listener(dir,queue)
-        dir = File.join(dir,'')
-        unless @listeners[dir]
-          qs = []
-          @listeners[dir] = [qs,Listen.to(dir) do
-            qs.delete_if do |q|
-              begin
-                q << :reload
-                false
-              rescue WeakRef::RefError
-                true
-              end
-            end
-          end.tap{|l| l.start }]
+      def stop
+        if @started
+          @listener.stop
+          @started = false
         end
-        @listeners[dir][0] << WeakRef.new(queue)
       end
 
-      def start_thread
-        @queue = Queue.new
-        @thread = Thread.new do
-          @dirs.each{|dir| self.class.listener(dir,@queue) }
-          done = false
-          until done
-            begin
-              cmd = @queue.pop
-              if cmd == :done
-                done = true
-              elsif cmd == :reload
-                if @reloader.reload
-                  done = true
-                end
-              end
-            rescue => e
-              $stderr.puts e
-              $stderr.puts e.backtrace.join("\n")
+      class Listener
+        def initialize(dirs,reloader)
+          @count = 0
+          @listen = Listen.to(*dirs) do |modified, _added, _removed|
+            if @count > 0 && modified
+              reloader.reload
             end
           end
-          @queue.clear
-          @queue = nil
-          @thread = nil
+        end
+
+        def start
+          if @count == 0
+            @listen.start
+          end
+          @count += 1
+        end
+
+        def stop
+          @count -= 1
         end
       end
     end

data/lib/alki/reload/null_watcher.rb

@@ -0,0 +1,11 @@
+module Alki
+  module Reload
+    class NullWatcher
+      def start
+      end
+
+      def stop
+      end
+    end
+  end
+end

data/lib/alki/reload/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Reload
-    VERSION = "0.2.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-reload
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
+- !ruby/object:Gem::Dependency
+  name: alki-testing
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: 
 email:
 - matt.edlefsen@gmail.com
@@ -86,6 +100,7 @@ files:
 - lib/alki/reload/listen_watcher.rb
 - lib/alki/reload/load_path_handler.rb
 - lib/alki/reload/loader_handler.rb
+- lib/alki/reload/null_watcher.rb
 - lib/alki/reload/reloadable_delegator.rb
 - lib/alki/reload/reloader.rb
 - lib/alki/reload/unloader.rb