noam_lemma 0.2.1.2 → 0.2.1.3

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 3bbf10fe6a3bf7744dc6a6f82fc654591f905c79
-  data.tar.gz: ac505598a7cb384d97e0baa10b8fb99a24cf14aa
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2QwNDk0YTRlNTFkYTBkMWUwYTgwZThkZGFmNjFjYTE1ZWQ0YjAwYw==
+  data.tar.gz: !binary |-
+    ODZiODFiMDkyMDFhZjQxOWRmOGY5ODVmMjM3OGU4ZTE1YmY0NWExZA==
 SHA512:
-  metadata.gz: 6f364b904d08a0d7cf26ea98aa90f2c56ca409d14a3dda1d9a995722f43ff23b11b3b756dea0842ad6825bc6c0b8f3324f18301aab642a6fb6bd4f0528f80954
-  data.tar.gz: 6ba94ba53aacc4194915bc7d113060e3ba1e8c532eeb02ab007244eb67ff2ede969eefab39cd42c287cc41ae4e749f82e8d59f009852aa069bcd2e4ffc8484c2
+  metadata.gz: !binary |-
+    OWNmNTYyOWNiMjM0ZmFkYWY2M2QzMmQ5NTk2MWQ1ZDUwZDk3YzI2MjU2ZjEy
+    N2E3MzFmZWU4NzVhOTVkOWZjYjkyYjE2MTllOTkxNTgwMTkxNDJmYmY0ZGY2
+    YTNkZjI4OTdiYTI0MWFkZDk3NTkwNWE0MTMxMjZhMWM4NWM2NTc=
+  data.tar.gz: !binary |-
+    ODE2ZDJkMTRmZmVhNDVhNTI3ZDY1MTY5Y2U5MzBiZjZiNWI2OGU4OTc3ZGZh
+    NTFkYmRkYmNjOGNmZThjNzdmODM5MThiYmMwZjU5ODAxMWRlNjJiN2JmMzBi
+    YWZmYzI3ODJiMDVhNDk0OTZiYjU5NWQ1YzRiNTA4MDYyZDJmZjI=

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 John Van Enk
+Copyright (c) 2014 IDEO
 
 MIT License
 

data/examples/free_guest_publisher.rb

@@ -2,17 +2,15 @@ require 'noam_lemma'
 
 # This is an example of a Ruby Lemma that publishes message and *also* uses the
 # "Guest" model of connection. This Lemma will advertise that it's available on
-# the local network and only begin speaking messages once a server requests a
-# connection from the Lemma.
+# the local network, without a specified room, and will only begin speaking
+# messages once a server requests a connection from the Lemma.
 
 publisher = Noam::Lemma.new('example-guest-publisher', [], ["e3"])
 
-# Using the `advertise` method asks the Lemma to announce it's presence and
+# Using the `discover` method asks the Lemma to announce it's presence and
 # wait for a message from a server that may want to connect to it.
-#
-# The "local-test" parameter is the room name. Servers with a room name that's
-# the same as the Lemma's advertised room name will connect automatically.
-publisher.advertise("")
+
+publisher.discover
 
 seq = 0
 e = "e3"
@@ -20,12 +18,15 @@ loop do
   # Construct a value to send with the event.
   v = {"seq" => seq, "time" => Time.now.to_s}
 
-  # If `speak` returns false, we're unable to speak the message likely because
+  # If `speak` raises a Noam::Disconnected error, we're unable to speak the message likely because
   # the socket has closed. The connection would have to be restarted.
-  unless publisher.speak(e, v)
-    puts "Done"
+  begin
+    publisher.speak(e, v)
+  rescue Noam::Disconnected
+    puts "Disconnectd"
     break
   end
+
   puts "Wrote: #{e} -> #{v.inspect}"
 
   seq += 1

data/examples/free_guest_subscriber.rb

@@ -2,30 +2,32 @@ require 'noam_lemma'
 
 # This is an example of a Ruby Lemma that publishes message and *also* uses the
 # "Guest" model of connection. This Lemma will advertise that it's available on
-# the local network and only begin subscribing to messages once a server
-# requests a connection from the Lemma.
+# the local network, without a specified room, and will only begin subscribing
+# to messages once a server requests a connection from the Lemma.
 
 subscriber = Noam::Lemma.new('example-guest-subscriber', ["e3"], [])
 
-# Using the `advertise` method asks the Lemma to announce it's presence and
+# The `hear` method sets a a block of code to be called when an event is heard
+# from a specific event.
+subscriber.hear('e3') do |message|
+  puts "Heard message"
+  puts "Event: #{message.event}"
+  puts "Value: #{message.value.inspect}"
+end
+
+# Using the `discover` method asks the Lemma to announce it's presence and
 # wait for a message from a server that may want to connect to it.
-#
-# The "local-test" parameter is the room name. Servers with a room name that's
-# the same as the Lemma's advertised room name will connect automatically.
-subscriber.advertise("")
+
+subscriber.discover
 
 loop do
-  # The `listen` method will return an Event object once one is received by the
+  # The `listen` method will return an Message::Heard object once one is received by the
   # Lemma. Until an event is heard, the `listen` method blocks.
-  m = subscriber.listen
-
-  # There's one special value that's returned from `listen`: the `:cancelled`
-  # symbol. If this shows up, it means some one else has called the `stop`
-  # method on the Lemma.
-  if :cancelled == m
-    puts "Done"
-    break
-  else
+  begin
+    m = subscriber.listen
     puts "Read: #{m.event} -> #{m.value.inspect}"
+  rescue Noam::Disconnected
+    puts "Disconnected"
+    break
   end
 end

data/examples/lemma_verification.rb

@@ -88,3 +88,5 @@ class Noam::LemmaVerification
     end
   end
 end
+
+Noam::LemmaVerification.run

data/examples/publisher.rb

@@ -6,17 +6,15 @@ require 'noam_lemma'
 # command should work:
 #
 #   ruby -Ilib example/publisher.rb
-#
-# This example _will not_ work on the same machine running the Noam server as
-# both programs need to bind to UDP port 1030.
 
 publisher = Noam::Lemma.new('example-publisher', [], ["e1", "e2"])
 
-# Using the `discover` method asks the Lemma to proactively try and discover a
-# server to connect to on the local network. Once the server is discovered, it
-# will connect and send a Noam 'register' message. When `discover` returns, the
-# Lemma is ready to send events.
-publisher.discover
+# Using the `advertise` method asks the Lemma to announce it's presence and
+# wait for a message from a server that may want to connect to it.
+#
+# The "local-test" parameter is the room name. Servers with a room name that's
+# the same as the Lemma's advertised room name will connect automatically.
+publisher.advertise("local-test")
 
 seq = 0
 loop do
@@ -33,12 +31,17 @@ loop do
 
   # Attempt to speak the chosen event with the value. Note, the event is either
   # "e1" or "e2" based on how rand() returned.
-  unless publisher.speak(e, v)
-    # If `speak` returns false, we're unable to speak the message likely because
-    # the socket has closed. The connection would have to be restarted.
-    puts "Done"
+  begin
+    publisher.speak(e, v)
+
+    # If `speak` returns a Noam::Disconnected error, we're unable to speak the
+    # message likely because the socket has closed. The connection
+    # would have to be restarted.
+  rescue Noam::Disconnected
+    puts "Disconnected"
     break
   end
+
   puts "Wrote: #{e} -> #{v.inspect}"
 
   seq += 1

data/examples/subscriber.rb

@@ -12,24 +12,29 @@ require 'noam_lemma'
 
 subscriber = Noam::Lemma.new('example-subscriber', ["e1", "e2"], [])
 
-# Using the `discover` method asks the Lemma to proactively try and discover a
+# The `hear` method sets a a block of code to be called when an event is heard
+# from a specific event.
+subscriber.hear('e1') do |message|
+  puts "Heard message"
+  puts "Event: #{message.event}"
+  puts "Value: #{message.value.inspect}"
+end
+
+# Using the `advertise` method asks the Lemma to proactively try and discover a
 # server to connect to on the local network. Once the server is discovered, it
 # will connect and send a Noam 'register' message. When `discover` returns, the
 # Lemma is ready to receive events.
-subscriber.discover
+subscriber.advertise("local-test")
 
 loop do
-  # The `listen` method will return an Event object once one is received by the
-  # Lemma. Until an event is heard, the `listen` method blocks.
-  m = subscriber.listen
-
-  # There's one special value that's returned from `listen`: the `:cancelled`
-  # symbol. If this shows up, it means some one else has called the `stop`
-  # method on the Lemma.
-  if :cancelled == m
-    puts "Done"
-    break
-  else
+  # The `listen` method will return a Message::Heard object once one is received by the
+  # Lemma, after calling any blocks associated with the event through the `hear`
+  # method. Until an event is heard, the `listen` method blocks.
+  begin
+    m = subscriber.listen
     puts "Read: #{m.event} -> #{m.value.inspect}"
+  rescue Noam::Disconnected
+    puts "Disconnected"
+    break
   end
 end

data/lib/noam_lemma.rb

@@ -7,9 +7,9 @@ module Noam
   DEVICE_TYPE = 'ruby-script'
 
   class NoamThreadCancelled < Exception; end
+  class Disconnected < StandardError; end
 end
 
-require 'noam_lemma/beacon'
 require 'noam_lemma/lemma'
 require 'noam_lemma/listener'
 require 'noam_lemma/message'

data/lib/noam_lemma/lemma.rb

@@ -13,32 +13,35 @@ module Noam
       initialize_message_filter(hears)
     end
 
-    def discover(beacon = nil)
-      beacon ||= Beacon.discover
-      start(beacon.host, beacon.port)
-    end
-
     def advertise(room_name)
       marco = Noam::Message::Marco.new(room_name, @name)
       polo = marco.start
       start(polo.host, polo.port)
     end
 
+    def discover
+      advertise('')
+    end
+
     def hear(event_name, &block)
       @message_filter.hear(event_name, &block)
     end
 
     def speak(event, value)
-      if @player
+      if @player.connected?
         @player.put(Noam::Message::Playable.new(@name, event, value))
         true
       else
-        false
+        raise Noam::Disconnected.new("Player disconnected")
       end
     end
 
     def listen
-      @message_filter.receive(@listener.take)
+      if @listener.connected?
+        @message_filter.receive(@listener.take)
+      else
+        raise Noam::Disconnected.new("Listener disconnected")
+      end
     end
 
     def stop

data/lib/noam_lemma/listener.rb

@@ -1,4 +1,4 @@
-require 'thread' 
+require 'thread'
 
 module Noam
   class Listener
@@ -21,6 +21,10 @@ module Noam
       @thread.join
     end
 
+    def connected?
+      !@disconnected
+    end
+
     private
 
     def manage_queue_on_thread
@@ -40,16 +44,13 @@ module Noam
           client.close
         end
 
-        if exiting?
-          @queue.push(:cancelled)
-          break
-        end
+        break if exiting?
       end
     end
 
     def listen_for_connection
       timeout_sec = 0.1
-      available_ios = select([@server], nil, nil, timeout_sec)
+      available_ios = IO.select([@server], nil, nil, timeout_sec)
       @server.accept if available_ios
     end
 
@@ -63,6 +64,8 @@ module Noam
         end
       rescue IO::WaitReadable
         retry unless exiting?
+      rescue EOFError
+        @disconnected = true
       end
     end
 

data/lib/noam_lemma/message/marco.rb

@@ -13,23 +13,17 @@ module Noam
 
       def start
         bcast_socket = UDPSocket.new
-        reply_socket = UDPSocket.new
-        reply_socket.bind("0.0.0.0", 0)
 
-        begin
-          bcast_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
+        bcast_socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
 
-          loop do
-            bcast_socket.send(noam_encode, 0, "255.255.255.255", Noam::BEACON_PORT)
-            if message_received?(bcast_socket)
-              break
-            end
+        loop do
+          bcast_socket.send(noam_encode, 0, "255.255.255.255", Noam::BEACON_PORT)
+          if message_received?(bcast_socket)
+            break
           end
-
-          get_polo_response(bcast_socket)
-        ensure
-          reply_socket.close
         end
+
+        get_polo_response(bcast_socket)
       end
 
       def noam_encode

data/lib/noam_lemma/player.rb

@@ -1,4 +1,4 @@
-require 'thread' 
+require 'thread'
 
 module Noam
   class NoamPlayerException < Exception; end
@@ -20,13 +20,16 @@ module Noam
     end
 
     def stop
-      put(:soft_exit)
+      put(:exit)
       @thread.join
     end
 
     def stop!
-      put(:hard_exit)
-      @thread.join
+      @thread.exit
+    end
+
+    def connected?
+      !@disconnected
     end
 
     private
@@ -37,42 +40,23 @@ module Noam
           loop do
             message = @queue.pop
             break if exit?(message)
-            process(message)
+            print_message(message)
           end
+        rescue Errno::EPIPE
+          @disconnected = true
         ensure
           @socket.close
         end
       end
     end
 
-    def process(message)
-      case message
-      when :soft_exit
-        finish_queue
-      when :hard_exit
-      else
-        @socket.print(message.noam_encode)
-        @socket.flush
-      end
+    def print_message(message)
+      @socket.print(message.noam_encode)
+      @socket.flush
     end
 
     def exit?(message)
-      message == :hard_exit || message == :soft_exit
-    end
-
-    def finish_queue
-      queue_to_array.each do |message|
-        @socket.print(message.noam_encode)
-        @socket.flush
-      end
-    end
-
-    def queue_to_array
-      result = []
-      while(@queue.size > 0) do
-        result << @queue.pop
-      end
-      result
+      message == :exit
     end
   end
 end

data/lib/noam_lemma/version.rb

@@ -1,3 +1,3 @@
 module NoamLemma
-  VERSION = "0.2.1.2"
+  VERSION = "0.2.1.3"
 end

data/noam_lemma.gemspec

@@ -21,6 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "require_all"
   spec.add_development_dependency "bundler", "~>  1.3"
   spec.add_development_dependency "rake",    "~> 10.3"
-  spec.add_development_dependency "rspec",   "~>  2.14"
+  spec.add_development_dependency "rspec",   "~>  3.1.0"
   spec.add_development_dependency "mocha",   "~>  1.1"
 end

data/spec/noam_lemma/lemma_spec.rb

@@ -49,10 +49,14 @@ describe Noam::Lemma do
 
   context "with server communication" do
     let(:server)  { FakeManager.server }
+    let(:lemma) { Noam::Lemma.new("Example Lemma") }
 
     before(:each) do
+      Noam::Message::Marco.any_instance.stubs(:start).returns(
+        Noam::Message::Polo.new('0.0.0.0', NoamTest::FakeServer::PORT)
+      )
       FakeManager.start
-      lemma.discover
+      lemma.advertise('fake_beacon')
       sleep(SERVER_DELAY)
     end
 
@@ -61,9 +65,7 @@ describe Noam::Lemma do
       FakeManager.stop
     end
 
-    describe "#discover" do
-      let(:lemma) { Noam::Lemma.new("Example Lemma") }
-
+    describe "#advertise" do
       it "sends a registration message" do
         server.clients.length.should == 1
         server.clients.first.port.should be_an(Integer)
@@ -77,11 +79,9 @@ describe Noam::Lemma do
     end
 
     describe "#hear" do
-      let(:lemma) { Noam::Lemma.new("Example Lemma") }
-
       it "registers messages with blocks" do
         message = nil
-        lemma.hear("example_event") {|event| message = event}
+        lemma.hear("example_event") { |event| message = event }
         send_message_from_server("example_event")
         lemma.listen
         message.event.should == "example_event"
@@ -89,12 +89,15 @@ describe Noam::Lemma do
     end
 
     describe "#speak" do
-      let(:lemma) { Noam::Lemma.new("Example Lemma") }
-
       it "sends a message to the server" do
         lemma.speak("an event", "some value")
         sleep(SERVER_DELAY)
-        server.messages.map {|m| m[2]}.include?("an event").should be_true
+        server.messages.map { |m| m[2] }.include?("an event").should be_truthy
+      end
+
+      it "raise a disconnected error if the player is not connected" do
+        lemma.player.stubs(:connected?).returns(false)
+        expect { lemma.speak('event', 'value') }.to raise_error(Noam::Disconnected)
       end
     end
 
@@ -108,6 +111,11 @@ describe Noam::Lemma do
         message.event.should  == "example_event"
         message.value.should  == "noam event"
       end
+
+      it "raises a disconnected error if the listener is not connected" do
+        lemma.listener.stubs(:connected?).returns(false)
+        expect { lemma.listen }.to raise_error(Noam::Disconnected)
+      end
     end
 
     def send_message_from_server(source = "test-server", value = "noam event", message)

data/spec/noam_lemma/listener_spec.rb

@@ -0,0 +1,51 @@
+describe Noam::Listener do
+  def make_message(message)
+    ['test', 'source', 'event', message].to_json
+  end
+
+  class MockTcpSocket
+    def queue
+      @queue ||= Queue.new
+    end
+
+    def read_nonblock(size)
+      if size == ::Noam::Message::MESSAGE_LENGTH_STRING_SIZE
+        1
+      else
+        queue.pop
+      end
+    end
+
+    def close; end
+  end
+
+  let!(:listener) { described_class.new }
+  let(:mock_socket) { MockTcpSocket.new }
+
+  before do
+    TCPServer.any_instance.stubs(:accept).returns(mock_socket)
+    IO.stubs(:select).returns(true)
+  end
+
+  describe '#connected?' do
+    it 'returns true if the connection is open' do
+      mock_socket.queue << make_message('message')
+      listener.stop
+      expect(listener.connected?).to be_truthy
+    end
+
+    it 'returns false if a read has failed' do
+      mock_socket.stubs(:read_nonblock).raises(EOFError.new)
+      listener.stop
+      expect(listener.connected?).to be_falsey
+    end
+  end
+
+  describe '#take' do
+    it 'returns the next message from the queue' do
+      mock_socket.queue << make_message('message')
+      listener.stop
+      expect(listener.take.value).to eq('message')
+    end
+  end
+end

data/spec/noam_lemma/message/marco_spec.rb

@@ -0,0 +1,31 @@
+describe Noam::Message::Marco do
+  let(:marco)    { described_class.new('test_room', 'Test Lemma') }
+  let(:message)  { ['message', 'room', 1234].to_json }
+  let(:sockaddr) { [1, 2, 3, 4] }
+
+  before do
+    described_class.any_instance.stubs(:message_received?).returns(true)
+    UDPSocket.any_instance.stubs(:send)
+    UDPSocket.any_instance.stubs(:recvfrom).returns([message, sockaddr])
+  end
+
+  it "sends a marco message to the server" do
+    UDPSocket.any_instance.expects(:send).with(
+      ["marco", 'Test Lemma', 'test_room', Noam::DEVICE_TYPE, Noam::VERSION].to_json,
+      0,
+      '255.255.255.255',
+      Noam::BEACON_PORT
+    )
+    marco.start
+  end
+
+  it "returns a polo with the server's host" do
+    polo = marco.start
+    expect(polo.host).to eq(3)
+  end
+
+  it "returns a polo with the server's port" do
+    polo = marco.start
+    expect(polo.port).to eq(1234)
+  end
+end

data/spec/noam_lemma/message_filter_spec.rb

@@ -40,8 +40,8 @@ describe Noam::MessageFilter do
       filter.hear("example_event") {|message| example_received = true}
       filter.hear("sample_event") {|message| sample_received = true}
       filter.receive(stub_message("example_event"))
-      example_received.should be_true
-      sample_received.should be_false
+      example_received.should be_truthy
+      sample_received.should be_falsy
     end
 
     it "returns the given message" do

data/spec/noam_lemma/player_spec.rb

@@ -0,0 +1,60 @@
+describe Noam::Player do
+  def make_message(message)
+    Noam::Message::Playable.new('host', 'event', message)
+  end
+
+  class MockTcpSocket
+    def published_messages
+      @published_messages ||= []
+    end
+
+    def print(message)
+      published_messages << message
+    end
+
+    def close; end
+
+    def flush; end
+  end
+
+  let(:player) { described_class.new('0.0.0.0', 1234) }
+  let(:mock_socket) { MockTcpSocket.new }
+
+  before do
+    TCPSocket.stubs(:new).returns(mock_socket)
+  end
+
+  describe "connected?" do
+    it "returns true if the socket is open" do
+      player.stop
+      expect(player.connected?).to be_truthy
+    end
+
+    it "returns false if a write to the socket has failed" do
+      mock_socket.stubs(:print).raises(Errno::EPIPE.new)
+      player.put(make_message("message"))
+      player.stop
+      expect(player.connected?).to be_falsey
+    end
+  end
+
+  describe "stop" do
+    it "publishes the remaning messages in the queue" do
+      100.times do
+        player.put(make_message("message"))
+      end
+      player.stop
+      expect(mock_socket.published_messages.size).to eq(100)
+    end
+  end
+
+  describe "stop!" do
+    it "does not finish the queue" do
+      100.times do
+        player.put(make_message("message"))
+      end
+      player.stop!
+      expect(mock_socket.published_messages.size).to be < 100
+    end
+  end
+end

data/spec/support/fake_server.rb

@@ -20,9 +20,6 @@ module NoamTest
       @thread = Thread.new do |t|
         begin
           loop do
-            msg = ["beacon", "fake_beacon", NoamTest::FakeServer::PORT].to_json
-            @socket.send(msg, 0, "255.255.255.255", Noam::BEACON_PORT)
-
             # This is normally at 5.0 seconds, but we run faster in order to
             # make tests faster.
             sleep(LOOP_DELAY)
@@ -105,7 +102,7 @@ module NoamTest
       @client_host = @sock.peeraddr[2]
       @queue = Queue.new
     end
-    
+
     def start
       @thread = Thread.new do |t|
         begin

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: noam_lemma
 version: !ruby/object:Gem::Version
-  version: 0.2.1.2
+  version: 0.2.1.3
 platform: ruby
 authors:
 - John Van Enk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,6 @@ files:
 - examples/publisher.rb
 - examples/subscriber.rb
 - lib/noam_lemma.rb
-- lib/noam_lemma/beacon.rb
 - lib/noam_lemma/lemma.rb
 - lib/noam_lemma/listener.rb
 - lib/noam_lemma/message.rb
@@ -113,13 +112,15 @@ files:
 - lib/noam_lemma/player.rb
 - lib/noam_lemma/version.rb
 - noam_lemma.gemspec
-- spec/noam_lemma/beacon_spec.rb
 - spec/noam_lemma/lemma_spec.rb
+- spec/noam_lemma/listener_spec.rb
 - spec/noam_lemma/message/heard_spec.rb
+- spec/noam_lemma/message/marco_spec.rb
 - spec/noam_lemma/message/playable_spec.rb
 - spec/noam_lemma/message/register_spec.rb
 - spec/noam_lemma/message_filter_spec.rb
 - spec/noam_lemma/message_spec.rb
+- spec/noam_lemma/player_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_server.rb
 homepage: https://github.com/noam-io/lemma-ruby
@@ -132,12 +133,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -147,12 +148,14 @@ signing_key:
 specification_version: 4
 summary: A lemma factory for the Noam pub-sub system.
 test_files:
-- spec/noam_lemma/beacon_spec.rb
 - spec/noam_lemma/lemma_spec.rb
+- spec/noam_lemma/listener_spec.rb
 - spec/noam_lemma/message/heard_spec.rb
+- spec/noam_lemma/message/marco_spec.rb
 - spec/noam_lemma/message/playable_spec.rb
 - spec/noam_lemma/message/register_spec.rb
 - spec/noam_lemma/message_filter_spec.rb
 - spec/noam_lemma/message_spec.rb
+- spec/noam_lemma/player_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_server.rb

data/lib/noam_lemma/beacon.rb

@@ -1,36 +0,0 @@
-module Noam
-  class Beacon
-    attr_reader :name, :host, :port
-
-    def initialize(name, host, port)
-      @name = name
-      @host = host
-      @port = port
-    end
-
-    def self.discover(net = "0.0.0.0")
-      socket = UDPSocket.new
-      begin
-        socket.setsockopt(Socket::SOL_SOCKET, Socket::SO_BROADCAST, true)
-        socket.bind(net, Noam::BEACON_PORT)
-
-        raise "Didn't see beacon after #{WAIT_TIME} seconds." unless message_received?(socket)
-
-        data, addr = socket.recvfrom(MAX_RESPONSE_LENGTH)
-        parsed_data = JSON.parse(data)
-        Beacon.new(parsed_data[1], addr[2], parsed_data[2])
-      ensure
-        socket.close
-      end
-    end
-
-    private
-
-    MAX_RESPONSE_LENGTH = 1600
-    WAIT_TIME = 10.0
-
-    def self.message_received?(socket)
-      IO.select([socket], [], [], WAIT_TIME) != nil
-    end
-  end
-end

data/spec/noam_lemma/beacon_spec.rb

@@ -1,26 +0,0 @@
-describe Noam::Beacon do
-  describe "#new" do
-    it "creates a new beacon" do
-      beacon = Noam::Beacon.new(:name, :host, :noam)
-      beacon.name.should == :name
-      beacon.host.should == :host
-      beacon.port.should == :noam
-    end
-  end
-
-  describe "::discover" do
-    before do
-      FakeManager.start
-    end
-
-    after do
-      FakeManager.stop
-    end
-
-    it "creates a Beacon based on server beacons" do
-      beacon = Noam::Beacon.discover
-      beacon.should be_a(Noam::Beacon)
-      beacon.port.should == NoamTest::FakeServer::PORT
-    end
-  end
-end