artoo 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3eeb439427b0af42baf98ca4785ae0c017a09e
-  data.tar.gz: 8cdfdc43fca9a234b1d8b1c518b539ad8870265a
+  metadata.gz: 6059ccad349f757c75b1bba40c3258056bc690cb
+  data.tar.gz: ee353f9752cef6a52bd28129568e33bcebe318b1
 SHA512:
-  metadata.gz: 046a09825eebba8e83d289f26c0a5efb8a3946685914dd97a4bf4149eaf77124cf2892150f2cb149d06ee0f69fe5c1ad056793274b889762a444711112157e19
-  data.tar.gz: 72cac3523ba133f5d5fd72717bd7a61bf63efadf1fe4b26ad5b27653ce5ee5c2e752eee2c79bdc35851e75aa98873d0ffefcf668965a1ae7cd96cf359e06d2e4
+  metadata.gz: 59dff9b9afe24d635cdcb911a8a3422c0e08a2c5dcf470ae36d9a989dcbd0ed2e89dc4c0e9606ea7d24dcb5708a813da60fa6842d313dc638944c871f9882cc7
+  data.tar.gz: 6450d8ebc3ebe3c150ec1e0789c622395cd60a2ea34622fb21d23e4f042542686f34a1aa3e26b5a804741b8796c85858842fa53ca71b58ceda225f6123b9a91a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    artoo (1.1.0)
+    artoo (1.1.1)
       celluloid (~> 0.15.0)
       celluloid-io (~> 0.15.0)
       multi_json (~> 1.6)

data/bin/robi

@@ -12,26 +12,26 @@ command_set = Pry::CommandSet.new do
       output.puts "Starting robots..."
     end
 
-    Celluloid::Actor[:master].start_work
+    Artoo::Master.start_work
   end
 
   block_command "pause", "Pause all robots" do
     output.puts "Pausing robots..."
-    Celluloid::Actor[:master].pause_work
+    Artoo::Master.pause_work
   end
 
   block_command "continue", "Continue all robots" do
     output.puts "Continuing robots..."
-    Celluloid::Actor[:master].continue_work
+    Artoo::Master.continue_work
   end
 
   block_command "stop", "Stop all robots" do
     output.puts "Stopping robots..."
-    Celluloid::Actor[:master].stop_work
+    Artoo::Master.stop_work
   end
 
   block_command "list", "List all robots" do
-    output.puts Celluloid::Actor[:master].robots
+    output.puts Artoo::Master.robots
   end
 end
 

data/examples/hello_messages.rb

@@ -0,0 +1,30 @@
+require 'artoo/robot'
+
+class GreeterRobot < Artoo::Robot
+  work do
+    every(5.seconds) do
+      say 'Hola'
+    end
+  end
+
+  def say(greeting)
+    friend_name = "Number #{rand(5)}"
+    puts "Saying '#{greeting}' to #{friend_name}"
+    Artoo::Master.robot(friend_name).hello(greeting, current_instance)
+  end
+end
+
+class MessageRobot < Artoo::Robot
+  def hello(greeting, sender)
+    puts "'#{sender.name}' said '#{greeting}' to #{name}"
+  end
+end
+
+robots = []
+5.times do |i|
+  robots << MessageRobot.new(:name => "Number #{i}")
+end
+
+robots << GreeterRobot.new(:name => "Greeter")
+
+Artoo::Robot.work!(robots)

data/lib/artoo/drivers/device_info.rb

@@ -0,0 +1,10 @@
+require 'artoo/drivers/driver'
+
+module Artoo
+  module Drivers
+    # DeviceInfo driver behaviors
+    class DeviceInfo < Driver
+      COMMANDS = [:firmware_name, :version, :connect].freeze
+    end
+  end
+end

data/lib/artoo/exceptions.rb

@@ -0,0 +1,3 @@
+module Artoo
+  class RobotNotFound < StandardError; end # unable to find a robot by name in master
+end

data/lib/artoo/master.rb

@@ -5,16 +5,60 @@ module Artoo
     include Celluloid
     attr_reader :robots
 
+    class << self
+      def current
+        Celluloid::Actor[:master] ||= self.new
+      end
+
+      def assign(bots=[])
+        current.assign(bots)
+      end
+
+      def robots
+        current.robots
+      end
+
+      def robot(name)
+        current.robot(name)
+      end
+
+      def start_work
+        current.start_work
+      end
+
+      def stop_work
+        current.stop_work
+      end
+
+      def pause_work
+        current.pause_work
+      end
+
+      def continue_work
+        current.continue_work
+      end
+    end
+
     # Create new master
     # @param [Collection] robots
-    def initialize(bots)
-      @robots = bots
+    def initialize(bots=[])
+      @robots = []
+      assign(bots)
+    end
+
+    # Assign robots to Master controller
+    # @param [Collection] robots
+    def assign(bots=[])
+      robots.concat(bots)
+      bots.each {|r| r.async.work} if Artoo::Robot.is_running?
     end
 
     # @param  [String] name
     # @return [Robot]  robot
     def robot(name)
-      robots.find {|r| r.name == name}
+      r = robots.find {|r| r.name == name}
+      raise RobotNotFound if r.nil?
+      r
     end
 
     # @param  [String]     name

data/lib/artoo/robot.rb

@@ -1,9 +1,8 @@
 require 'celluloid/autostart'
 require 'celluloid/io'
 require 'multi_json'
-require 'artoo/ext/timers'
-require 'artoo/ext/actor'
 
+require 'artoo/ext/actor'
 require 'artoo/robot_class_methods'
 require 'artoo/basic'
 require 'artoo/connection'
@@ -11,6 +10,7 @@ require 'artoo/adaptors/adaptor'
 require 'artoo/device'
 require 'artoo/drivers/driver'
 require 'artoo/events'
+require 'artoo/exceptions'
 require 'artoo/api/api'
 require 'artoo/master'
 require 'artoo/port'
@@ -89,7 +89,7 @@ module Artoo
 
     # @return [Collection] connection types
     def connection_types
-      current_class.connection_types
+      current_class.connection_types ||= [{:name => :passthru}]
     end
 
     # @return [Collection] device types

data/lib/artoo/robot_class_methods.rb

@@ -58,17 +58,17 @@ module Artoo
       #  or, a new instance can be created
       # @param [Robot] robot
       def work!(robot=nil)
+        prepare_work(robot)
         return if is_running?
-        prepare_robots(robot)
 
         unless cli?
           begin
             start_api
-            master.start_work
+            Artoo::Master.start_work
             begin_working
           rescue Interrupt
             Celluloid::Logger.info 'Shutting down...'
-            master.stop_work if master
+            Artoo::Master.stop_work
             # Explicitly exit so busy Processor threads can't block
             # process shutdown... taken from Sidekiq, thanks!
             exit(0)
@@ -77,7 +77,7 @@ module Artoo
       end
 
       # Prepare master robots for work
-      def prepare_robots(robot=nil)
+      def prepare_work(robot=nil)
         if robot.respond_to?(:work)
           robots = [robot]
         elsif robot.kind_of?(Array)
@@ -86,7 +86,7 @@ module Artoo
           robots = [self.new]
         end
 
-        Celluloid::Actor[:master] = Master.new(robots)
+        Artoo::Master.assign(robots)
       end
 
       def begin_working
@@ -112,11 +112,6 @@ module Artoo
         Celluloid::Actor[:api] = Api::Server.new(self.api_host, self.api_port) if self.use_api
       end
       
-      # Master actor
-      def master
-        Celluloid::Actor[:master]
-      end
-
       # @return [Boolean] True if test env
       def test?
         ENV["ARTOO_TEST"] == 'true'

data/lib/artoo/version.rb

@@ -1,5 +1,5 @@
 module Artoo
   unless const_defined?('VERSION')
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

data/test/master_test.rb

@@ -35,6 +35,10 @@ describe Artoo::Master do
     @master.robot("robot2").must_equal @robot2
   end
 
+  it 'Artoo::Master#robot with invalid robot name' do
+    proc {@master.robot("robotno")}.must_raise(Artoo::RobotNotFound)
+  end
+
   it 'Artoo::Master#robot_devices' do
     @master.robot_devices("robot2").first.must_equal "robot2-device1"
   end

data/test/robot_test.rb

@@ -69,19 +69,22 @@ describe Artoo::Robot do
       TestRobot.stubs(:begin_working)
       @master = mock('master')
       @master.expects(:start_work)
-      TestRobot.stubs(:master).returns(@master)
+      Artoo::Master.stubs(:current).returns(@master)
     end
 
     it 'Artoo::Robot.work! with single object' do
+      @master.expects(:assign).with([@robot])
       TestRobot.work!(@robot)
     end
 
     it 'Artoo::Robot.work! with array of objects' do
       @robot2 = TestRobot.new(:name => "too", :connections => {:test_connection => {:port => '1234'}})
+      @master.expects(:assign).with([@robot, @robot2])
       TestRobot.work!([@robot, @robot2])
     end
 
     it 'Artoo::Robot.work! without object' do
+      @master.expects(:assign)
       TestRobot.work!
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: artoo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ron Evans
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -181,6 +181,7 @@ files:
 - examples/hello.rb
 - examples/hello_api.rb
 - examples/hello_api_multiple.rb
+- examples/hello_messages.rb
 - examples/hello_modular.rb
 - examples/hello_multiple.rb
 - examples/notifications.rb
@@ -212,14 +213,15 @@ files:
 - lib/artoo/delegator.rb
 - lib/artoo/device.rb
 - lib/artoo/drivers/counter.rb
+- lib/artoo/drivers/device_info.rb
 - lib/artoo/drivers/driver.rb
 - lib/artoo/drivers/passthru.rb
 - lib/artoo/drivers/pinger.rb
 - lib/artoo/drivers/random.rb
 - lib/artoo/drivers/test.rb
 - lib/artoo/events.rb
+- lib/artoo/exceptions.rb
 - lib/artoo/ext/actor.rb
-- lib/artoo/ext/timers.rb
 - lib/artoo/generators/adaptor.rb
 - lib/artoo/generators/adaptor/Gemfile.tt
 - lib/artoo/generators/adaptor/LICENSE

data/lib/artoo/ext/timers.rb

@@ -1,41 +0,0 @@
-# Monkeypatches for Timers & Timer classes used by Celluloid
-class Timers
-  def initialize
-    @timers = SortedSet.new
-    @paused_timers = SortedSet.new
-  end
-
-  def pause(timer = nil)
-    return pause_all if timer.nil?
-    raise TypeError, "not a Timers::Timer" unless timer.is_a? Timers::Timer
-    @timers.delete timer
-    @paused_timers.add timer
-  end
-
-  def pause_all
-    @timers.each {|timer| timer.pause}
-  end
-
-  def continue(timer = nil)
-    return continue_all if timer.nil?
-    raise TypeError, "not a Timers::Timer" unless timer.is_a? Timers::Timer
-    @paused_timers.delete timer
-    @timers.add timer
-  end
-
-  def continue_all
-    @paused_timers.each {|timer| timer.continue}
-  end
-
-  class Timer
-    # Pause this timer
-    def pause
-      @timers.pause self
-    end
-
-    # Continue this timer
-    def continue
-      @timers.continue self
-    end
-  end
-end