alki-loader 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35748f34edecf67d26bc0a7e3cf369c37a1316a6
-  data.tar.gz: c76640c73518c34797723b12cf3dc2fc0918fde5
+  metadata.gz: 0d95a7f58e0d36040bbbdaba1c6cd4f141ae94b1
+  data.tar.gz: 4020be8a5dabf74746f7bcece2524c08c6cb8941
 SHA512:
-  metadata.gz: 6d83c0157460cb42a860563d557a478476b3c6d3fa41001917cc9d8c7acdd529d6ea021affbacf0fdb4ea02ccd734e974016b697879f4eb3a827a4626f80b849
-  data.tar.gz: a813aea0fa6d21cc84dfc8cdeb6cc4cab609a8cd59f59d57adbf269b060879d06731334344993c24d8f51cac02a80fd1dffe1e99f711e229757863908b3ba6b8
+  metadata.gz: b7b04006b3eb1a8c350ca91f07e4ae53b0e9d8a1d77b842da8f50837d20e07827e76b4542ecd2a9491b3adb2307b46963ac1f12366d58c5e18be44d135388fe8
+  data.tar.gz: 69a63aac6a6047381fa7d8c3b8720accd8051d2eacd99d8060d3b6b8197402f693a8906d74a9576901fe5ea183c8c57fe79d36c4453ea403acb05b26c36bba91

data/lib/alki/loader/registry.rb

@@ -1,16 +1,19 @@
+require 'thread'
+
 module Alki
   module Loader
     class Registry
       def initialize
+        @lock = Monitor.new
         clear
       end
 
       def clear
-        @paths = []
-        @paths_sorted = true
-        @names = []
-        @names_sorted = true
-        @configs_loaded = false
+        @lock.synchronize do
+          @paths = []
+          @names = []
+          @configs_loaded = false
+        end
       end
 
       def paths
@@ -19,20 +22,20 @@ module Alki
       end
 
       def add(entry)
-        @paths.delete_if{|e| e.path == entry.path }
-        @paths << entry
-        if entry.name
-          @names.delete_if{|e| e.path == entry.path }
-          @names << entry
+        @lock.synchronize do
+          @paths.delete_if{|e| e.path == entry.path }
+          @paths << entry
+          @names.sort!{|a,b| b.path <=> a.path}
+          if entry.name
+            @names.delete_if{|e| e.path == entry.path }
+            @names << entry
+            @names.sort!{|a,b| b.name <=> a.name}
+          end
         end
       end
 
       def lookup_name(name)
         load_configs!
-        unless @names_sorted
-          @names.sort! {|a,b| b.name <=> a.name }
-          @names_sorted = true
-        end
         @names.find do |e|
           name.start_with?(e.name) &&
             (name.size == e.name.size || name[e.name.size] == '/')
@@ -41,10 +44,6 @@ module Alki
 
       def lookup_path(path)
         load_configs!
-        unless @paths_sorted
-          @paths.sort! {|a,b| b.path <=> a.path }
-          @paths_sorted = true
-        end
         @paths.find do |e|
           path.start_with?(e.path) &&
             (path.size == e.path.size || path[e.path.size] == '/')
@@ -52,11 +51,13 @@ module Alki
       end
 
       def load_configs!
-        path_hash = $LOAD_PATH.hash
-        return if @configs_loaded == path_hash
-        @configs_loaded = path_hash
-        Gem.find_files_from_load_path('alki_loader.rb').each do |config_path|
-           require config_path
+        @lock.synchronize do
+          path_hash = $LOAD_PATH.hash
+          return if @configs_loaded == path_hash
+          @configs_loaded = path_hash
+          Gem.find_files_from_load_path('alki_loader.rb').each do |config_path|
+            require config_path
+          end
         end
       end
     end

data/lib/alki/loader/version.rb

@@ -1,5 +1,5 @@
 module Alki
   module Loader
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alki-loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Matt Edlefsen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-29 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler