rtsp 0.2.1 → 0.2.2

data/ChangeLog.rdoc

@@ -1,3 +1,9 @@
+=== 0.2.2 / 2011-11-02
+
+* Added a queue for listening and building the RTP file from the received data.
+* Fixed bugs:
+  * gh-6: .gemspec was missing +parslet+ dependency. Thanks [tindron[http://github.com/tindron]].
+  
 === 0.2.1 / 2011-09-20
 
 * `gem test rtsp` is failing; added rtsp.gemspec to list of files in the spec.

data/Rakefile

@@ -1,34 +1,23 @@
-require 'rake'
-
-begin
-  require 'bundler'
-rescue LoadError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `gem install bundler` to install Bundler."
-  exit e.status_code
-end
-
-begin
-  Bundler.setup(:development)
-rescue Bundler::BundlerError => e
-  STDERR.puts e.message
-  STDERR.puts "Run `bundle install` to install missing gems."
-  exit e.status_code
-end
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
+require 'yard'
+
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.ruby_opts = "-w"
   t.rspec_opts = ['--format', 'documentation', '--color']
 end
+
+namespace :spec do
+  RSpec::Core::RakeTask.new(:warnings) do |t|
+    t.ruby_opts = "-w"
+    t.rspec_opts = ['--format', 'documentation', '--color']
+  end
+end
 task :default => :spec
 task :test => :spec       # for `gem test`
 
-require 'yard'
 YARD::Rake::YardocTask.new do |t|
   t.options = ['--verbose']
 end
 
 # Load all extra rake tasks
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].each { |ext| load ext }
-

data/lib/rtsp/capturer.rb

@@ -12,9 +12,9 @@ module RTSP
   # In this version, objects of this type don't do much other than just capture
   # the data to a file; in later versions, objects of this type will be able
   # to provide a "sink" and allow for ensuring that the received  RTP packets
-  # will  be reassembled in the correct order, as they're written to file
-  # (objects of this type don't don't currently check RTP sequence numbers
-  # on the data that's been received).
+  # will be reassembled in the correct order, as they're written to file
+  # (objects of this type don't don't currently allow for checking RTP sequence
+  # numbers on the data that's been received).
   class Capturer
 
     # Name of the file the data will be captured to unless #rtp_file is set.
@@ -50,7 +50,9 @@ module RTSP
       @transport_protocol = transport_protocol
       @rtp_port = rtp_port
       @rtp_file = rtp_capture_file || Tempfile.new(DEFAULT_CAPFILE_NAME)
-      @run = false
+      @listener = nil
+      @file_builder = nil
+      @queue = Queue.new
     end
 
     # Initializes a server of the correct socket type.
@@ -70,38 +72,91 @@ module RTSP
       server
     end
 
-    # Starts capturing data on +@rtp_port+ and writes it to +@rtp_file+.
-    # @todo Allow to yield received data.
+    # Simply calls #start_file_builder and #start_listener.
     def run
-      @server = init_server(@transport_protocol, @rtp_port)
-      @run = true
       log "Starting #{self.class} on port #{@rtp_port}..."
 
-      while @run
-        data = @server.recvfrom(MAX_BYTES_TO_RECEIVE).first
-        log "received data with size: #{data.size}"
-        @rtp_file.write data
+      start_file_builder
+      start_listener
+    end
+
+    # Starts the +@file_builder+ thread that pops data off of the Queue that
+    # #start_listener pushed data on to.  It then takes that data and writes it
+    # to +@rtp_file+.
+    #
+    # @return [Thread] The file_builder thread (+@file_builder+)
+    def start_file_builder
+      return @file_builder if @file_builder and @file_builder.alive?
+
+      @file_builder = Thread.start(@rtp_file) do |rtp_file|
+        loop do
+          rtp_file.write @queue.pop until @queue.empty?
+        end
+      end
+
+      @file_builder.abort_on_exception = true
+    end
+
+    # Starts the +@listener+ thread that starts up the server, then takes the
+    # data received from the server and pushes it on to the +@queue+ so
+    # the +@file_builder+ thread can deal with it.
+    #
+    # @return [Thread] The listener thread (+@listener+).
+    def start_listener
+      return @listener if @listener and @listener.alive?
+
+      @listener = Thread.start do
+        server = init_server(@transport_protocol, @rtp_port)
+
+        loop do
+          data = server.recvfrom(MAX_BYTES_TO_RECEIVE).first
+          log "received data with size: #{data.size}"
+          @queue << data
+        end
       end
 
-    ensure
-      @server.close unless @server.nil?
+      @listener.abort_on_exception = true
     end
 
-    # Returns if the run loop is in action.
+    # @return [Boolean] true if the +@listener+ thread is running; false if not.
+    def listening?
+      if @listener then @listener.alive? else false end
+    end
+
+    # @return [Boolean] true if the +@file_builder+ thread is running; false if
+    #   not.
+    def file_building?
+      if @file_builder then @file_builder.alive? else false end
+    end
+
+    # Returns if the #run loop is in action.
     #
     # @return [Boolean] true if the run loop is running.
     def running?
-      @server.nil? ? @run : (@run || @server.closed?)
+      listening? || file_building?
     end
 
     # Breaks out of the run loop.
     def stop
       log "Stopping #{self.class} on port #{@rtp_port}..."
-      @run = false
+      stop_listener
+      log "listening? #{listening?}"
+      stop_file_builder
+      log "file building? #{file_building?}"
+      log "running? #{running?}"
+      @queue = Queue.new
+    end
 
-      until !running?
-        sleep 0.01
-      end
+    # Kills the +@listener+ thread and sets the variable to nil.
+    def stop_listener
+      @listener.kill if @listener
+      @listener = nil
+    end
+
+    # Kills the +@file_builder+ thread and sets the variable to nil.
+    def stop_file_builder
+      @file_builder.kill if @file_builder
+      @file_builder = nil
     end
 
     # Sets up to receive data on a UDP socket, using +@rtp_port+.
@@ -132,7 +187,7 @@ module RTSP
     # Sets up to receive data on a TCP socket, using +@rtp_port+.
     #
     # @param [Fixnum] port Port number to listen for RTP data on.
-    # @return [TCPSocket]
+    # @return [TCPServer]
     def init_tcp_server(port)
       port_retries = 0
 

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/rtsp.gemspec

@@ -33,6 +33,7 @@ For more information see: http://www.ietf.org/rfc/rfc2326.txt}
   s.summary = %q{Library to allow RTSP streaming from RTSP-enabled devices.}
   s.test_files = Dir.glob("{spec,features}/**/*")
 
+  s.add_runtime_dependency(%q<parslet>, ["~> 1.1.0"])
   s.add_runtime_dependency(%q<sdp>, ["~> 0.2.2"])
 
   s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])

data/spec/rtsp/capturer_spec.rb

@@ -28,18 +28,16 @@ describe RTSP::Capturer do
 
   describe "#initialize" do
     context "with default parameters" do
-      before { @capturer = RTSP::Capturer.new }
-
       it "uses UDP" do
-        @capturer.instance_variable_get(:@transport_protocol).should == :UDP
+        subject.instance_variable_get(:@transport_protocol).should == :UDP
       end
 
       it "uses port 9000" do
-        @capturer.instance_variable_get(:@rtp_port).should == 9000
+        subject.instance_variable_get(:@rtp_port).should == 9000
       end
 
       it "creates a new Tempfile" do
-        @capturer.instance_variable_get(:@rtp_file).should be_a Tempfile
+        subject.instance_variable_get(:@rtp_file).should be_a Tempfile
       end
     end
 
@@ -68,165 +66,193 @@ describe RTSP::Capturer do
   end
 
   describe "#init_server" do
-    before { @capturer = RTSP::Capturer.new }
+    context "UDP" do
+      it "calls #init_udp_server with port 9000" do
+        subject.should_receive(:init_udp_server).with(9000)
+        subject.init_server(:UDP)
+      end
 
-    after :each do
-      @capturer.stop
+      it "returns a UDPSocket" do
+        subject.init_server(:UDP).should be_a(UDPSocket)
+      end
     end
 
-    it "creates a UDPSocket when initialized with :UDP" do
-      @capturer.init_server(:UDP).should be_a UDPSocket
-    end
+    context "TCP" do
+      it "calls #init_tcp_server with port 9000" do
+        subject.should_receive(:init_tcp_server).with(9000)
+        subject.init_server(:TCP)
+      end
 
-    it "creates a TCPSocket when initialized with :TCP" do
-      TCPServer.new('0.0.0.0', 9000)
-      @capturer.init_server(:TCP).should be_a TCPSocket
+      it "returns a TCPServer" do
+        subject.init_server(:TCP).should be_a(TCPServer)
+      end
     end
 
     it "raises an RTSP::Error when some other protocol is given" do
-      expect { @capturer.init_server(:BOBO) }.to raise_error RTSP::Error
+      expect { subject.init_server(:BOBO) }.to raise_error RTSP::Error
     end
   end
 
-  describe "#run" do
-    context "default capturer settings" do
-      before do
-        @capturer = RTSP::Capturer.new
-        @receiver_thread = Thread.start(@capturer) { |capturer| capturer.run }
-
-        @client = UDPSocket.open
-        @sender_thread = Thread.start(@client) do |client|
-          loop do
-            client.send "x", 0, 'localhost', @capturer.rtp_port
-          end
-        end
-
-        sleep 0.1
+  describe "#init_udp_server" do
+    after :each do
+      unless @sockets.nil?
+        @sockets.each { |s| s.close }
       end
+    end
 
-      after do
-        @sender_thread.exit
-        @receiver_thread.exit
-      end
+    it "returns a UDPSocket" do
+      server = subject.init_udp_server(subject.rtp_port)
+      server.should be_a UDPSocket
+    end
 
-      it "gets access to a UDPSocket via @server" do
-        @capturer.instance_variable_get(:@server).should be_a UDPSocket
-      end
+    it "retries MAX_PORT_NUMBER_RETRIES to get a port" do
+      @sockets = use_udp_ports 9000...(9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES)
+      subject.init_udp_server(subject.rtp_port)
+
+      subject.rtp_port.should == 9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES
+    end
 
-      it "sets @run to true" do
-        @capturer.instance_variable_get(:@run).should be_true
+    context "when no available ports, it retries MAX_PORT_NUMBER_RETRIES times, then" do
+      before do
+        @sockets = use_udp_ports 9000..(9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES)
       end
 
-      it "receives data and writes to @rtp_file" do
-        @capturer.rtp_file.size.should > 0
+      it "retries MAX_PORT_NUMBER_RETRIES times then raises" do
+        expect { subject.init_udp_server(subject.rtp_port) }.to raise_error Errno::EADDRINUSE
       end
 
-      it "closes the @server after issuing a #stop" do
-        @capturer.instance_variable_get(:@server).should_not be_closed
-        @capturer.stop
-        sleep 0.1
-        @capturer.instance_variable_get(:@server).should be_closed
+      it "sets @rtp_port back to 9000 after trying all" do
+        expect { subject.init_udp_server(subject.rtp_port) }.to raise_error Errno::EADDRINUSE
+        subject.rtp_port.should == 9000
       end
     end
   end
 
+  describe "#init_tcp_server" do
+    it "returns a TCPSocket" do
+      subject.init_tcp_server(3456).should be_a TCPSocket
+    end
+
+    it "uses port a port between 9000 and 9000 + MAX_PORT_NUMBER_RETRIES" do
+      subject.init_tcp_server(9000)
+      subject.rtp_port.should >= 9000
+      subject.rtp_port.should <= 9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES
+    end
+  end
+
+  describe "#run" do
+    after(:each) { subject.stop }
+
+    it "calls #start_file_builder and #start_listener" do
+      subject.should_receive(:start_listener)
+      subject.should_receive(:start_file_builder)
+      subject.run
+    end
+  end
+
   describe "#running?" do
-    before { @capturer = RTSP::Capturer.new }
+    after(:each) { subject.stop }
 
     it "returns false before issuing #run" do
-      @capturer.running?.should be_false
+      subject.running?.should be_false
     end
 
     it "returns true after running" do
-      cap_thread = Thread.new(@capturer) { |capturer| capturer.run }
-      sleep 0.1
-      @capturer.running?.should be_true
-      cap_thread.exit
+      subject.run
+      subject.running?.should be_true
     end
 
-    it "returns false after running, then stopping" do
-      cap_thread = Thread.new(@capturer) { |capturer| capturer.run }
-      sleep 0.1
-      @capturer.running?.should be_true
-      @capturer.stop
-      @capturer.running?.should be_false
-      cap_thread.exit
+    it "returns false after running then stopping" do
+      subject.run
+      subject.running?.should be_true
+      subject.stop
+      subject.running?.should be_false
     end
   end
 
   describe "#stop" do
-    before { @capturer = RTSP::Capturer.new }
+    it "calls #stop_listener" do
+      subject.should_receive(:stop_listener)
+      subject.stop
+    end
 
-    context "not running yet" do
-      it "sets @run to false" do
-        @capturer.stop
-        @capturer.instance_variable_get(:@run).should == false
-      end
+    it "calls #stop_file_builder" do
+      subject.should_receive(:stop_file_builder)
+      subject.stop
     end
 
-    context "running" do
-      it "sets @run to false" do
-        Thread.new(@capturer) { |c| c.run }
-        sleep 0.1
-        @capturer.stop
-        @capturer.instance_variable_get(:@run).should == false
-      end
+    it "sets @queue back to a new Queue" do
+      queue = subject.instance_variable_get(:@queue)
+      subject.stop
+      subject.instance_variable_get(:@queue).should_not equal queue
+      subject.instance_variable_get(:@queue).should_not be_nil
     end
   end
 
-  describe "#init_udp_server" do
-    after :each do
-      unless @sockets.nil?
-        @sockets.each { |s| s.close }
+  [
+    {
+      start_method: "start_file_builder",
+      stop_method: "stop_file_builder",
+      ivar: "@file_builder"
+    },
+      {
+        start_method: "start_listener",
+        stop_method: "stop_listener",
+        ivar: "@listener"
+      }
+  ].each do |method_set|
+    describe "##{method_set[:start_method]}" do
+      before(:each) do
+        rtp_file = double "rtp_file"
+        rtp_file.stub(:write)
+        subject.rtp_file = rtp_file
+
+        server = double "A Server"
+        server.stub_chain(:recvfrom, :first).and_return("not nil")
+        subject.stub(:init_server).and_return(server)
       end
-    end
-
-    it "returns a UDPSocket" do
-      capturer = RTSP::Capturer.new
-      server = capturer.init_udp_server(capturer.rtp_port)
-      server.should be_a UDPSocket
-    end
-
-    it "retries MAX_PORT_NUMBER_RETRIES to get a port" do
-      @sockets = use_udp_ports 9000...(9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES)
-      #@sockets.each { |s| puts "meow: #{s.addr[1]}" }
-
-      capturer = RTSP::Capturer.new
-      capturer.init_udp_server(capturer.rtp_port)
-      capturer.rtp_port.should == 9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES
-    end
 
-    context "when no available ports, it retries MAX_PORT_NUMBER_RETRIES times, then" do
-      before do
-        @sockets = use_udp_ports 9000..(9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES)
+      after(:each) { subject.send(method_set[:stop_method].to_sym) }
 
-        @capturer = RTSP::Capturer.new
+      it "starts the #{method_set[:ivar]} thread" do
+        subject.send(method_set[:start_method])
+        subject.instance_variable_get(method_set[:ivar].to_sym).should be_a Thread
       end
 
-      it "retries MAX_PORT_NUMBER_RETRIES times then raises" do
-        expect { @capturer.init_udp_server(@capturer.rtp_port) }.to raise_error Errno::EADDRINUSE
+      it "returns the same #{method_set[:ivar]} if already started" do
+        subject.send(method_set[:start_method])
+        original_ivar = subject.instance_variable_get(method_set[:ivar].to_sym)
+        new_ivar = subject.send method_set[:start_method].to_sym
+        original_ivar.should equal new_ivar
       end
 
-      it "sets @rtp_port back to 9000 after trying all" do
-        expect { @capturer.init_udp_server(@capturer.rtp_port) }.to raise_error Errno::EADDRINUSE
-        @capturer.rtp_port.should == 9000
+      if method_set[:start_method] == "start_listener"
+        it "pushes data on to the @queue" do
+          subject.start_listener
+          subject.instance_variable_get(:@queue).pop.should == "not nil"
+        end
       end
     end
-  end
 
-  describe "#init_tcp_server" do
-    before do
-      @capturer = RTSP::Capturer.new(:TCP)
-      @server = @capturer.init_tcp_server(@capturer.rtp_port)
-    end
+    describe "##{method_set[:stop_method]}" do
+      context "#{method_set[:ivar]} thread is running" do
+        before { subject.send(method_set[:start_method]) }
 
-    it "returns a TCPSocket" do
-      @server.should be_a TCPSocket
-    end
+        it "kills the thread" do
+          original_ivar = subject.instance_variable_get(method_set[:ivar].to_sym)
+          original_ivar.should_receive(:kill)
+          subject.send(method_set[:stop_method])
+        end
+      end
 
-    it "uses port a port between 9000 and 9000 + MAX_PORT_NUMBER_RETRIES" do
-      @capturer.rtp_port.should >= 9000
-      @capturer.rtp_port.should <= 9000 + RTSP::Capturer::MAX_PORT_NUMBER_RETRIES
+      context "#{method_set[:ivar]} thread isn't running" do
+        it "doesn't try to kill the thread" do
+          allow_message_expectations_on_nil
+          original_ivar = subject.instance_variable_get(method_set[:ivar].to_sym)
+          original_ivar.should_not_receive(:kill)
+          subject.send(method_set[:stop_method])
+        end
+      end
     end
   end
 end

data/spec/rtsp/message_spec.rb

@@ -36,21 +36,21 @@ describe "RTSP::Message" do
   context "builds a DESCRIBE string" do
     it "with default sequence and accept values" do
       message = RTSP::Message.describe(@stream)
-      message.to_s.should match /^DESCRIBE rtsp:/
+      message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Accept: application/sdp\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default sequence value" do
       message = RTSP::Message.describe(@stream).with_headers({
         accept: 'application/sdp, application/rtsl' })
-      message.to_s.should match /^DESCRIBE rtsp:/
+      message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Accept: application/sdp, application/rtsl\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with new sequence and accept values" do
@@ -58,11 +58,11 @@ describe "RTSP::Message" do
         accept: 'application/sdp, application/rtsl',
         cseq: 2345 })
 
-      message.to_s.should match /^DESCRIBE rtsp:/
+      message.to_s.should match(/^DESCRIBE rtsp:/)
       message.to_s.should include "DESCRIBE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 2345\r\n"
       message.to_s.should include "Accept: application/sdp, application/rtsl\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
   end
 
@@ -70,12 +70,12 @@ describe "RTSP::Message" do
     it "with default sequence, content type, but no body" do
       message = RTSP::Message.announce(@stream).with_headers({ session: 123456789 })
 
-      message.to_s.should match /^ANNOUNCE rtsp:/
+      message.to_s.should match(/^ANNOUNCE rtsp:/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: application/sdp\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with passed-in session and content type but no body" do
@@ -83,12 +83,12 @@ describe "RTSP::Message" do
         session: 123456789,
         content_type: 'application/sdp, application/rtsl' })
 
-      message.to_s.should match /^ANNOUNCE rtsp:/
+      message.to_s.should match(/^ANNOUNCE rtsp:/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: application/sdp, application/rtsl\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with passed-in sequence, session, content-type, but no body " do
@@ -97,12 +97,12 @@ describe "RTSP::Message" do
         content_type: 'application/sdp, application/rtsl',
         cseq: 2345 })
 
-      message.to_s.should match /^ANNOUNCE rtsp:/
+      message.to_s.should match(/^ANNOUNCE rtsp:/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 2345\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: application/sdp, application/rtsl\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with passed-in sequence, session, content-type, and SDP body" do
@@ -116,13 +116,13 @@ describe "RTSP::Message" do
         cseq: 2345 })
       message.body = sdp.to_s
 
-      message.to_s.should match /^ANNOUNCE rtsp/
+      message.to_s.should match(/^ANNOUNCE rtsp/)
       message.to_s.should include "ANNOUNCE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 2345\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: application/sdp\r\n"
       message.to_s.should include "Content-Length: 29\r\n"
-      message.to_s.should match /\r\n\r\nv=1\r\no=bobo     \r\ns=\r\nt= \r\n\r\n$/
+      message.to_s.should match(/\r\n\r\nv=1\r\no=bobo     \r\ns=\r\nt= \r\n\r\n$/)
     end
   end
 
@@ -130,21 +130,21 @@ describe "RTSP::Message" do
     it "with default sequence, client_port, and routing values" do
       message = RTSP::Message.setup(@stream)
 
-      message.to_s.should match /^SETUP rtsp/
+      message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default sequence, transport, and client_port values" do
       message = RTSP::Message.setup(@stream).with_headers({
         transport: ["RTP/AVP", "multicast", { :client_port => "9000-9001" }] })
 
-      message.to_s.should match /^SETUP rtsp/
+      message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Transport: RTP/AVP;multicast;client_port=9000-9001\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
 
     it "with default transport, client_port, and routing values" do
@@ -152,11 +152,11 @@ describe "RTSP::Message" do
         transport: ["RTP/AVP", "multicast", { :client_port => "9000-9001" }],
         cseq: 2345 })
 
-      message.to_s.should match /^SETUP rtsp/
+      message.to_s.should match(/^SETUP rtsp/)
       message.to_s.should include "SETUP rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 2345\r\n"
       message.to_s.should include "Transport: RTP/AVP;multicast;client_port=9000-9001\r\n"
-      message.to_s.should match /\r\n\r\n$/
+      message.to_s.should match(/\r\n\r\n$/)
     end
   end
 
@@ -165,12 +165,12 @@ describe "RTSP::Message" do
       message = RTSP::Message.play(@stream).with_headers({
         session: 123456789 })
 
-      message.to_s.should match /^PLAY rtsp/
+      message.to_s.should match(/^PLAY rtsp/)
       message.to_s.should include "PLAY rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Range: npt=0.000-\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with default sequence value" do
@@ -178,12 +178,12 @@ describe "RTSP::Message" do
         session: 123456789,
         range: { :npt => "0.000-1.234" } })
 
-      message.to_s.should match /^PLAY rtsp/
+      message.to_s.should match(/^PLAY rtsp/)
       message.to_s.should include "PLAY rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Range: npt=0.000-1.234\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -191,10 +191,10 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.pause(@stream)
 
-      message.to_s.should match /^PAUSE rtsp/
+      message.to_s.should match(/^PAUSE rtsp/)
       message.to_s.should include "PAUSE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with session and range headers" do
@@ -202,12 +202,12 @@ describe "RTSP::Message" do
         session: 123456789,
         range: { :npt => "0.000" } })
 
-      message.to_s.should match /^PAUSE rtsp/
+      message.to_s.should match(/^PAUSE rtsp/)
       message.to_s.should include "PAUSE rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Range: npt=0.000\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -215,21 +215,21 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.teardown(@stream)
 
-      message.to_s.should match /^TEARDOWN rtsp/
+      message.to_s.should match(/^TEARDOWN rtsp/)
       message.to_s.should include "TEARDOWN rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with session and range headers" do
       message = RTSP::Message.teardown(@stream).with_headers({
         session: 123456789 })
 
-      message.to_s.should match /^TEARDOWN rtsp/
+      message.to_s.should match(/^TEARDOWN rtsp/)
       message.to_s.should include "TEARDOWN rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
       message.to_s.should include "Session: 123456789\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -237,10 +237,10 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.get_parameter(@stream)
 
-      message.to_s.should match /^GET_PARAMETER rtsp/
+      message.to_s.should match(/^GET_PARAMETER rtsp/)
       message.to_s.should include "GET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, content type, session headers, and text body" do
@@ -253,14 +253,14 @@ describe "RTSP::Message" do
 
       message.body = the_body
 
-      message.to_s.should match /^GET_PARAMETER rtsp/
+      message.to_s.should match(/^GET_PARAMETER rtsp/)
       message.to_s.should include "GET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 431\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: text/parameters\r\n"
       message.to_s.should include "Content-Length: #{the_body.length}\r\n"
       message.to_s.should include the_body
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -268,10 +268,10 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.set_parameter(@stream)
 
-      message.to_s.should match /^SET_PARAMETER rtsp/
+      message.to_s.should match(/^SET_PARAMETER rtsp/)
       message.to_s.should include "SET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, content type, session headers, and text body" do
@@ -283,14 +283,14 @@ describe "RTSP::Message" do
         session: 123456789 })
       message.body = the_body
 
-      message.to_s.should match /^SET_PARAMETER rtsp/
+      message.to_s.should match(/^SET_PARAMETER rtsp/)
       message.to_s.should include "SET_PARAMETER rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 431\r\n"
       message.to_s.should include "Session: 123456789\r\n"
       message.to_s.should include "Content-Type: text/parameters\r\n"
       message.to_s.should include "Content-Length: #{the_body.length}\r\n"
       message.to_s.should include the_body
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -298,10 +298,10 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.redirect(@stream)
 
-      message.to_s.should match /^REDIRECT rtsp/
+      message.to_s.should match(/^REDIRECT rtsp/)
       message.to_s.should include "REDIRECT rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, location, and range headers" do
@@ -310,12 +310,12 @@ describe "RTSP::Message" do
         location: "rtsp://bigserver.com:8001",
         range: { :clock => "19960213T143205Z-" } })
 
-      message.to_s.should match /^REDIRECT rtsp/
+      message.to_s.should match(/^REDIRECT rtsp/)
       message.to_s.should include "REDIRECT rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 732\r\n"
       message.to_s.should include "Location: rtsp://bigserver.com:8001\r\n"
       message.to_s.should include "Range: clock=19960213T143205Z-\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -323,10 +323,10 @@ describe "RTSP::Message" do
     it "with required Request values" do
       message = RTSP::Message.record(@stream)
 
-      message.to_s.should match /^RECORD rtsp/
+      message.to_s.should match(/^RECORD rtsp/)
       message.to_s.should include "RECORD rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 1\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
 
     it "with cseq, session, and conference headers" do
@@ -335,12 +335,12 @@ describe "RTSP::Message" do
         session: 12345678,
         conference: "128.16.64.19/32492374" })
 
-      message.to_s.should match /^RECORD rtsp/
+      message.to_s.should match(/^RECORD rtsp/)
       message.to_s.should include "RECORD rtsp://1.2.3.4:554/stream1 RTSP/1.0\r\n"
       message.to_s.should include "CSeq: 954\r\n"
       message.to_s.should include "Session: 12345678\r\n"
       message.to_s.should include "Conference: 128.16.64.19/32492374\r\n"
-      message.to_s.should match /\r\n\r\n/
+      message.to_s.should match(/\r\n\r\n/)
     end
   end
 
@@ -390,13 +390,13 @@ describe "RTSP::Message" do
     it "adds the passed-in text to the body of the message" do
       new_body = "1234567890"
       message = RTSP::Message.record("rtsp://localhost/track").with_body(new_body)
-      message.to_s.should match /\r\n\r\n#{new_body}$/
+      message.to_s.should match(/\r\n\r\n#{new_body}$/)
     end
 
     it "adds the Content-Length header to reflect the body" do
       new_body = "1234567890"
       message = RTSP::Message.record("rtsp://localhost/track").with_body(new_body)
-      message.to_s.should match /Content-Length: #{new_body.size}\r\n/
+      message.to_s.should match(/Content-Length: #{new_body.size}\r\n/)
     end
   end
 

data/spec/rtsp/response_spec.rb

@@ -64,11 +64,11 @@ describe RTSP::Response do
     end
 
     it "contains the class name and object ID first" do
-      @response.inspect.should match /^#<RTSP::Response:\d+/
+      @response.inspect.should match(/^#<RTSP::Response:\d+/)
     end
 
     it "begins with <# and ends with >" do
-      @response.inspect.should match /^#<.*>$/
+      @response.inspect.should match(/^#<.*>$/)
     end
   end
 

data/spec/rtsp_spec.rb

@@ -21,7 +21,7 @@ describe RTSP do
     RTSP.const_defined?('VERSION').should be_true
   end
 
-  it "has version 0.2.1" do
-    RTSP::VERSION.should == '0.2.1'
+  it "has version 0.2.2" do
+    RTSP::VERSION.should == '0.2.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-14 00:00:00.000000000Z
+date: 2011-04-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: &70200108735200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70200108735200
 - !ruby/object:Gem::Dependency
   name: sdp
-  requirement: &70124087370880 !ruby/object:Gem::Requirement
+  requirement: &70200108733900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70124087370880
+  version_requirements: *70200108733900
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124087370060 !ruby/object:Gem::Requirement
+  requirement: &70200108733140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70124087370060
+  version_requirements: *70200108733140
 - !ruby/object:Gem::Dependency
   name: code_statistics
-  requirement: &70124087369300 !ruby/object:Gem::Requirement
+  requirement: &70200108731600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.2.13
   type: :development
   prerelease: false
-  version_requirements: *70124087369300
+  version_requirements: *70200108731600
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &70124087368480 !ruby/object:Gem::Requirement
+  requirement: &70200108731040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70124087368480
+  version_requirements: *70200108731040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70124087367800 !ruby/object:Gem::Requirement
+  requirement: &70200108730460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70124087367800
+  version_requirements: *70200108730460
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70124087367180 !ruby/object:Gem::Requirement
+  requirement: &70200108729440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70124087367180
+  version_requirements: *70200108729440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70124087365940 !ruby/object:Gem::Requirement
+  requirement: &70200108727820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70124087365940
+  version_requirements: *70200108727820
 description: ! 'This library intends to follow the RTSP RFC document (2326)
 
   to allow for working with RTSP servers.  At this point, it''s up to you to parse
@@ -187,3 +198,4 @@ test_files:
 - features/step_definitions/control_streams_as_client_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
+has_rdoc: