wires 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe29f3e409b25c86e97fbf9a3fee96713d1cb5a6
-  data.tar.gz: 579b5558cfd68bc598d58d59ce6244d62f5cdafe
+  metadata.gz: 8d9d25b472a5b695894bd0ac5f39d95f637c49f2
+  data.tar.gz: 14409acc61b2b8dcfd68a5a69453c96eec78960b
 SHA512:
-  metadata.gz: ec044b26ff4fd30985d140c6024aa2065dad8afdd0c600cba2aa9cc2d15c239247b1f2e580f90c34fd549afaf99615b645791a19304f2949b794f85f5686b5e2
-  data.tar.gz: cbdbf46e3a314b075b404c2536cc9a78866b14f9b4020d5954d07395b271561619117de6949bb77ed751614b159235320e9745f20aae068d82b0cfd9423e8fd1
+  metadata.gz: 6b0f002d2346c8c0fe1e91fbedcb4ef4aa3faaef06a479154a893930614f5b7474629bc852b7bd0471ddf427b85889cf7de804a48c891a4254fa03f1304063bd
+  data.tar.gz: 8163af3fc07e3d2da2136adbefff6b2523729aeb97ecfec8556a19b88db011fca4d39be4ae65d9ea78abe1ecc47aaabf03cee285c3e8878cd519bf9eb9df2129

data/lib/wires/base.rb

@@ -2,13 +2,54 @@
 require 'thread'
 require 'threadlock'
 
-require_relative 'base/util/hooks'
-require_relative 'base/util/build_alt'
-
-require_relative 'base/event'
-require_relative 'base/hub'
-require_relative 'base/router'
-require_relative 'base/channel'
-require_relative 'base/time_scheduler_item'
-require_relative 'base/time_scheduler'
-require_relative 'base/convenience'
+
+module Wires
+  def self.network(id=:main)
+    @networks ||= {main:Wires}
+    
+    @networks[id] = Module.new \
+      unless @networks.has_key? id
+    @networks[id].const_set :Namespace, @networks[id] \
+      unless @networks[id].const_defined? :Namespace
+    
+    return @networks[id]
+  end
+  
+  def self.set_current_network(*args)
+    @current_network = network(*args)
+  end
+  
+  def self.current_network_name
+    @networks.each_pair.select{ |k,v| v==@current_network }.first.first
+  end
+  
+  def self.current_network
+    @current_network ||= network
+  end
+  
+  def self.replicate
+    save_name = Wires.current_network_name
+    other = Wires.set_current_network Object.new
+    
+    load __FILE__
+    
+    Wires.set_current_network save_name
+    return other
+  end
+end
+
+
+loader = Proc.new do |path|
+  load File.expand_path(path+'.rb', File.dirname(__FILE__))
+end
+
+loader.call 'base/util/hooks'
+loader.call 'base/util/build_alt'
+
+loader.call 'base/event'
+loader.call 'base/hub'
+loader.call 'base/router'
+loader.call 'base/channel'
+loader.call 'base/time_scheduler_item'
+loader.call 'base/time_scheduler'
+loader.call 'base/convenience'

data/lib/wires/base/channel.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   
   #  
   #

data/lib/wires/base/convenience.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
 
   module Convenience
     

data/lib/wires/base/event.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   
   class Event
     attr_accessor :type

data/lib/wires/base/hub.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   # An Event Hub. Event/proc associations come in, and the procs 
   # get called in new threads in the order received
   class Hub

data/lib/wires/base/router.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   module Router
     
     class Default

data/lib/wires/base/time_scheduler.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   
   # A singleton class to schedule future firing of events
   class TimeScheduler

data/lib/wires/base/time_scheduler_item.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   
   class TimeSchedulerItem
     
@@ -84,6 +84,7 @@ module Wires
     
     # Lock some of the methods to try to make them atomic
     # Must exclude methods that get called from within the TimeScheduler lock
+    include Threadlock
     threadlock :fire,
                :count=,
                :count_inc,

data/lib/wires/base/util/build_alt.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   module Util
     
     # Build an alternate version of the Wires module that doesn't 
@@ -8,16 +8,10 @@ module Wires
     # >> module MyModule; end
     # >> Wires::Util.build_alt "::MyModule::MyWires"
     def self.build_alt(module_path)
-      main_file = File.expand_path("../../base.rb", File.dirname(__FILE__))
-      
-      File.read(main_file)
-        .scan(/require_relative[\s\(]+(["'])(.*)\1/)
-        .map(&:last)
-        .map  { |file| File.expand_path("#{file}.rb", File.dirname(main_file)) }
-        .map  { |file| File.read file }
-        .each { |code| eval code.gsub("Wires", "#{module_path}") }
-      
-      eval "#{module_path}"
+      warn "DEPRECATED: Wires::Util.build_alt('::MyModule::MyWires')"\
+           " is deprecated, and will be removed in version 0.6."\
+           "  Please use ::MyModule::MyWires=Wires.replicate"
+      eval "#{module_path} = Wires.replicate"
     end
     
   end

data/lib/wires/base/util/hooks.rb

@@ -1,5 +1,5 @@
 
-module Wires
+module Wires.current_network::Namespace
   module Util
     module Hooks
       

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wires
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Joe McIlvain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-09 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: threadlock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rb-readline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="