rtsp 0.1.2 → 0.2.0

data/ChangeLog.rdoc

@@ -1,3 +1,15 @@
+=== 0.2.0 / 2011-09-19
+
+* Changed RTSP::Capturer init_*_server methods to take params in order to reduce
+  dependency on state of the Capturer object.
+* Improvements:
+  * If RTSP::Capturer can't open port 9000, it increments by 1 and tries again,
+    50 times, then raises.
+  * gh-4: Remove dependency on ore en lieu of standard gem commands.
+  * Participate in http://test.rubygems.org!
+* Fixed bugs:
+  * gh-5: Fixed 'Bad file descriptor' bug when capturing to file.
+
 === 0.1.2 / 2011-04-14
 
 * Manually released; the gemspec that Ore created didn't install bin/rtsp_client.

data/Gemfile

@@ -1,21 +1,3 @@
-require 'ore/specification'
-
 source :rubygems
 
 gemspec
-gem 'sdp', '~> 0.2.2'
-
-gem 'simplecov', '>= 0.4.0', :require => false, :group => :test
-
-group :development do
-  gem 'bundler',    '~> 1.0.0'
-  gem 'code_statistics', '~> 0.2.13'
-  gem 'cucumber'
-  gem 'metric_fu',  '>= 2.0.0'
-  gem 'ore',        '~> 0.7.2'
-  gem 'ore-core',   '~> 0.1.5'
-  gem 'ore-tasks',  '~> 0.5.0'
-  gem 'rake',       '~> 0.8.7'
-  gem "rspec",      '~> 2.5.0'
-  gem 'yard',       '~> 0.6.0'
-end

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems' if RUBY_VERSION < "1.9.0"
 require 'rake'
 
 begin
@@ -17,15 +16,13 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'ore/tasks'
-Ore::Tasks.new
-
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.ruby_opts = "-w"
   t.rspec_opts = ['--format', 'documentation', '--color']
 end
 task :default => :spec
+task :test => :spec       # for `gem test`
 
 require 'yard'
 YARD::Rake::YardocTask.new do |t|

data/lib/rtsp.rb

@@ -1,6 +1,5 @@
 require 'pathname'
-
-require File.expand_path(File.dirname(__FILE__) + '/rtsp/version')
+require_relative 'rtsp/version'
 
 # This base module simply defines properties about the library.  See child
 # classes/modules for the meat.

data/lib/rtsp/capturer.rb

@@ -23,6 +23,9 @@ module RTSP
     # Maximum number of bytes to receive on the socket.
     MAX_BYTES_TO_RECEIVE = 3000
 
+    # Maximum times to retry using the next greatest port number.
+    MAX_PORT_NUMBER_RETRIES = 50
+
     # @param [File] rtp_file The file to capture the RTP data to.
     # @return [File]
     attr_accessor :rtp_file
@@ -55,11 +58,11 @@ module RTSP
     # @return [UDPSocket, TCPSocket]
     # @raise [RTSP::Error] If +@transport_protocol was not set to +:UDP+ or
     #   +:TCP+.
-    def init_server
-      if @transport_protocol == :UDP
-        server = init_udp_server
-      elsif @transport_protocol == :tcp
-        server = init_tcp_server
+    def init_server(protocol, port=9000)
+      if protocol == :UDP
+        server = init_udp_server(port)
+      elsif protocol == :TCP
+        server = init_tcp_server(port)
       else
         raise RTSP::Error, "Unknown streaming_protocol requested: #{@transport_protocol}"
       end
@@ -68,51 +71,98 @@ module RTSP
     end
 
     # Starts capturing data on +@rtp_port+ and writes it to +@rtp_file+.
+    # @todo Allow to yield received data.
     def run
-      @server = init_server
+      @server = init_server(@transport_protocol, @rtp_port)
       @run = true
+      log "Starting #{self.class} on port #{@rtp_port}..."
 
-      RTSP::Client.log "Starting #{self.class} on port #{@rtp_port}..."
       while @run
         data = @server.recvfrom(MAX_BYTES_TO_RECEIVE).first
-        RTSP::Client.log "#{self.class} received data with size: #{data.size}"
+        log "received data with size: #{data.size}"
         @rtp_file.write data
       end
+
+    ensure
+      @server.close unless @server.nil?
     end
 
     # Returns if the run loop is in action.
     #
     # @return [Boolean] true if the run loop is running.
     def running?
-      @run
+      @server.nil? ? @run : (@run || @server.closed?)
     end
 
     # Breaks out of the run loop.
     def stop
-      RTSP::Client.log "Stopping #{self.class} on port #{@rtp_port}..."
+      log "Stopping #{self.class} on port #{@rtp_port}..."
       @run = false
-      @server.close
+
+      until !running?
+        sleep 0.01
+      end
     end
 
     # Sets up to receive data on a UDP socket, using +@rtp_port+.
     #
+    # @param [Fixnum] port Port number to listen for RTP data on.
     # @return [UDPSocket]
-    def init_udp_server
-      server = UDPSocket.open
-      server.bind('0.0.0.0', @rtp_port)
-      RTSP::Client.log "UDP server setup to receive on port #{@rtp_port}"
+    def init_udp_server(port)
+      port_retries = 0
+
+      begin
+        server = UDPSocket.open
+        server.bind('0.0.0.0', port)
+      rescue Errno::EADDRINUSE
+        log "RTP port #{port} in use, trying #{port + 1}..."
+        port += 1
+        port_retries += 1
+        retry until port_retries == MAX_PORT_NUMBER_RETRIES + 1
+        port = 9000
+        raise
+      end
+
+      @rtp_port = port
+      log "UDP server setup to receive on port #{@rtp_port}"
 
       server
     end
 
     # 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]
-    def init_tcp_server
-      server = TCPSocket.new('0.0.0.0', @rtp_port)
-      RTSP::Client.log "TCP server setup to receive on port #{@rtp_port}"
+    def init_tcp_server(port)
+      port_retries = 0
+
+      begin
+        server = TCPServer.new(port)
+      rescue Errno::EADDRINUSE
+        log "RTP port #{port} in use, trying #{port + 1}..."
+        port += 1
+        port_retries += 1
+        retry until port_retries == MAX_PORT_NUMBER_RETRIES + 1
+        port = 9000
+        raise
+      end
+
+      @rtp_port = port
+      log "TCP server setup to receive on port #{@rtp_port}"
 
       server
     end
+
+    # PRIVATES!
+    private
+
+    # Quick wrapper for when not using RTSP::Client (i.e. during tests).
+    #
+    # @param [String] message The String to log.
+    def log(message)
+      if defined? RTSP::Client
+        RTSP::Client.log "<#{self.class}> #{message}"
+      end
+    end
   end
 end

data/lib/rtsp/client.rb

@@ -105,8 +105,11 @@ module RTSP
     def initialize(server_url=nil)
       Thread.abort_on_exception = true
 
-      Struct.new("Connection", :server_url, :timeout, :socket,
+      unless defined? Struct::Connection
+        Struct.new("Connection", :server_url, :timeout, :socket,
           :do_capture, :interleave)
+      end
+
       @connection = Struct::Connection.new
       @capturer   = RTSP::Capturer.new
 

data/lib/rtsp/version.rb

@@ -1,4 +1,4 @@
 module RTSP
   # rtsp version
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/rtsp/capturer_spec.rb

@@ -0,0 +1,228 @@
+require_relative '../spec_helper'
+require 'rtsp/capturer'
+
+Thread.abort_on_exception = true
+
+def use_udp_ports(range)
+  sockets = []
+
+  range.each do |port|
+    begin
+      socket = UDPSocket.open
+      socket.bind('0.0.0.0', port)
+      sockets << socket
+    rescue Errno::EADDRINUSE
+      # That's ok
+    end
+  end
+
+  sockets
+end
+
+describe RTSP::Capturer do
+  before do
+    if defined? RTSP::Client
+      RTSP::Client.log = false
+    end
+  end
+
+  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
+      end
+
+      it "uses port 9000" do
+        @capturer.instance_variable_get(:@rtp_port).should == 9000
+      end
+
+      it "creates a new Tempfile" do
+        @capturer.instance_variable_get(:@rtp_file).should be_a Tempfile
+      end
+    end
+
+    context "non-default parameters" do
+      it "can use TCP" do
+        capturer = RTSP::Capturer.new(:TCP)
+        capturer.instance_variable_get(:@transport_protocol).should == :TCP
+      end
+
+      it "can take another port" do
+        capturer = RTSP::Capturer.new(:UDP, 12345)
+        capturer.instance_variable_get(:@rtp_port).should == 12345
+      end
+
+      it "can take an IO object" do
+        fd = IO.sysopen("/dev/null", "w")
+        io = IO.new(fd, 'w')
+        capturer = RTSP::Capturer.new(:UDP, 12345, io)
+        capturer.instance_variable_get(:@rtp_file).should be_a IO
+      end
+    end
+
+    it "isn't running" do
+      RTSP::Capturer.new.should_not be_running
+    end
+  end
+
+  describe "#init_server" do
+    after :each do
+      @capturer.stop
+    end
+
+    it "creates a UDPSocket when initialized with :UDP" do
+      @capturer = RTSP::Capturer.new
+      @capturer.init_server(:UDP).should be_a UDPSocket
+    end
+
+    it "creates a TCPSocket when initialized with :TCP" do
+      TCPServer.new('0.0.0.0', 9000)
+      @capturer = RTSP::Capturer.new
+      @capturer.init_server(:TCP).should be_a TCPSocket
+    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
+      end
+
+      after do
+        @sender_thread.exit
+        @receiver_thread.exit
+      end
+
+      it "gets access to a UDPSocket via @server" do
+        @capturer.instance_variable_get(:@server).should be_a UDPSocket
+      end
+
+      it "sets @run to true" do
+        @capturer.instance_variable_get(:@run).should be_true
+      end
+
+      it "receives data and writes to @rtp_file" do
+        @capturer.rtp_file.size.should > 0
+      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
+      end
+    end
+  end
+
+  describe "#running?" do
+    before { @capturer = RTSP::Capturer.new }
+
+    it "returns false before issuing #run" do
+      @capturer.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
+    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
+    end
+  end
+
+  describe "#stop" do
+    before { @capturer = RTSP::Capturer.new }
+
+    context "not running yet" do
+      it "sets @run to false" do
+        @capturer.stop
+        @capturer.instance_variable_get(:@run).should == false
+      end
+    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
+    end
+  end
+
+  describe "#init_udp_server" do
+    after :each do
+      unless @sockets.nil?
+        @sockets.each { |s| s.close }
+      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)
+
+        @capturer = RTSP::Capturer.new
+      end
+
+      it "retries MAX_PORT_NUMBER_RETRIES times then raises" do
+        expect { @capturer.init_udp_server(@capturer.rtp_port) }.to raise_error Errno::EADDRINUSE
+      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
+      end
+    end
+  end
+
+  describe "#init_tcp_server" do
+    before do
+      @capturer = RTSP::Capturer.new(:TCP)
+      @server = @capturer.init_tcp_server(@capturer.rtp_port)
+    end
+
+    it "returns a TCPSocket" do
+      @server.should be_a TCPSocket
+    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
+    end
+  end
+end

data/spec/rtsp/client_spec.rb

@@ -19,6 +19,11 @@ describe RTSP::Client do
     client
   end
 
+  before do
+    RTSP::Capturer.any_instance.stub(:run)
+    RTSP::Capturer.any_instance.stub(:stop)
+  end
+
   describe "#initialize" do
     before :each do
       mock_socket = double 'MockSocket'

data/spec/rtsp/message_spec.rb

@@ -10,11 +10,11 @@ describe "RTSP::Message" do
   it "raises if the header type isn't a Symbol" do
     message = RTSP::Message.options(@stream)
     lambda { message.header "hi", "everyone"
-      }.should raise_error RTSP::Error
+    }.should raise_error RTSP::Error
   end
 
-  it "adds a User-Agent header to every method" do
-    RTSP::Message.instance_variable_get(:@message_types).each do |method|
+  RTSP::Message.instance_variable_get(:@message_types).each do |method|
+    it "adds a User-Agent header to the #{method} method" do
       message = RTSP::Message.send(method, @stream)
       message.to_s.should include "User-Agent: RubyRTSP/"
     end
@@ -56,7 +56,7 @@ describe "RTSP::Message" do
     it "with new sequence and accept values" do
       message = RTSP::Message.describe(@stream).with_headers({
         accept: 'application/sdp, application/rtsl',
-        cseq:  2345 })
+        cseq: 2345 })
 
       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"
@@ -81,7 +81,7 @@ describe "RTSP::Message" do
     it "with passed-in session and content type but no body" do
       message = RTSP::Message.announce(@stream).with_headers({
         session: 123456789,
-        content_type: 'application/sdp, application/rtsl'})
+        content_type: 'application/sdp, application/rtsl' })
 
       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"
@@ -95,7 +95,7 @@ describe "RTSP::Message" do
       message = RTSP::Message.announce(@stream).with_headers({
         session: 123456789,
         content_type: 'application/sdp, application/rtsl',
-        cseq: 2345})
+        cseq: 2345 })
 
       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"
@@ -347,7 +347,7 @@ describe "RTSP::Message" do
   context "#to_s turns a Hash into an String of header strings" do
     it "single header, non-hyphenated name, hash value" do
       message = RTSP::Message.play(@stream).with_headers({
-          range: { npt: "0.000-" }
+        range: { npt: "0.000-" }
       })
 
       string = message.to_s
@@ -357,7 +357,7 @@ describe "RTSP::Message" do
 
     it "single header, hyphenated, non-hash value" do
       message = RTSP::Message.play(@stream).with_headers({
-          :if_modified_since => "Sat, 29 Oct 1994 19:43:31 GMT"
+        :if_modified_since => "Sat, 29 Oct 1994 19:43:31 GMT"
       })
 
       string = message.to_s
@@ -367,8 +367,8 @@ describe "RTSP::Message" do
 
     it "two headers, mixed hyphenated, array & hash values" do
       message = RTSP::Message.redirect(@stream).with_headers({
-          :cache_control => ["no-cache", { :max_age => 12345 }],
-          :content_type => ['application/sdp', 'application/x-rtsp-mh']
+        :cache_control => ["no-cache", { :max_age => 12345 }],
+        :content_type => ['application/sdp', 'application/x-rtsp-mh']
       })
 
       string = message.to_s

data/spec/rtsp_spec.rb

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

data/spec/spec_helper.rb

@@ -68,3 +68,14 @@ Server: DSS/5.5 (Build/489.7; Platform/Linux; Release/Darwin; )\r\n
 Cseq: \r\n
 Connection: Close\r\n
 \r\n}
+
+
+# Define #describe so when RTSP::Message calls #method_missing, RSpec doesn't
+# get in the way (and cause tests to fail).
+module RTSP
+  class Message
+    def self.describe request_uri
+      self.new(:describe, request_uri)
+    end
+  end
+end

data/spec/support/fake_rtsp_server.rb

@@ -120,4 +120,4 @@ response\r
 CSeq: #{@cseq}\r
 \r\n}
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rtsp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,9 +11,20 @@ bindir: bin
 cert_chain: []
 date: 2011-04-14 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sdp
+  requirement: &70295097540840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70295097540840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156826340 !ruby/object:Gem::Requirement
+  requirement: &70295097539860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156826340
+  version_requirements: *70295097539860
 - !ruby/object:Gem::Dependency
   name: code_statistics
-  requirement: &2156825760 !ruby/object:Gem::Requirement
+  requirement: &70295097539280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 0.2.13
   type: :development
   prerelease: false
-  version_requirements: *2156825760
+  version_requirements: *70295097539280
 - !ruby/object:Gem::Dependency
   name: metric_fu
-  requirement: &2156825000 !ruby/object:Gem::Requirement
+  requirement: &70295097538660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,65 +54,21 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156825000
-- !ruby/object:Gem::Dependency
-  name: ore
-  requirement: &2156797700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.2
-  type: :development
-  prerelease: false
-  version_requirements: *2156797700
-- !ruby/object:Gem::Dependency
-  name: ore-core
-  requirement: &2156797060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :development
-  prerelease: false
-  version_requirements: *2156797060
-- !ruby/object:Gem::Dependency
-  name: ore-tasks
-  requirement: &2156796360 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-  type: :development
-  prerelease: false
-  version_requirements: *2156796360
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2156795580 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *2156795580
+  version_requirements: *70295097538660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156794880 !ruby/object:Gem::Requirement
+  requirement: &70295097537880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2156794880
+  version_requirements: *70295097537880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156794100 !ruby/object:Gem::Requirement
+  requirement: &70295097537360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,36 +76,25 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2156794100
+  version_requirements: *70295097537360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156793400 !ruby/object:Gem::Requirement
+  requirement: &70295097536880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *2156793400
-- !ruby/object:Gem::Dependency
-  name: sdp
-  requirement: &2156792700 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156792700
-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 the data
-  from a play call, but we''ll get there.  ...eventually.
+  version_requirements: *70295097536880
+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
 
-  For more information
+  the data from a play call, but we''ll get there.  ...eventually.
 
-  RTSP: http://www.ietf.org/rfc/rfc2326.txt'
+  For more information see: http://www.ietf.org/rfc/rfc2326.txt'
 email:
 - steve.loveless@gmail.com, mkiby@gmail.com
 executables:
@@ -149,27 +105,7 @@ extra_rdoc_files:
 - LICENSE.rdoc
 - README.rdoc
 files:
-- .document
-- .infinity_test
-- .rspec
-- .yardopts
-- ChangeLog.rdoc
-- Gemfile
-- Gemfile.lock
-- LICENSE.rdoc
-- README.rdoc
-- Rakefile
-- bin/rtsp_client
-- features/client_changes_state.feature
-- features/client_requests.feature
-- features/control_streams_as_client.feature
-- features/step_definitions/client_changes_state_steps.rb
-- features/step_definitions/client_requests_steps.rb
-- features/step_definitions/control_streams_as_client_steps.rb
-- features/support/env.rb
-- features/support/hooks.rb
 - lib/ext/logger.rb
-- lib/rtsp.rb
 - lib/rtsp/capturer.rb
 - lib/rtsp/client.rb
 - lib/rtsp/error.rb
@@ -179,8 +115,18 @@ files:
 - lib/rtsp/response.rb
 - lib/rtsp/transport_parser.rb
 - lib/rtsp/version.rb
-- rtsp.gemspec
-- spec/.rspec
+- lib/rtsp.rb
+- bin/rtsp_client
+- tasks/metrics.rake
+- tasks/roodi_config.yml
+- tasks/stats.rake
+- .gemtest
+- Gemfile
+- ChangeLog.rdoc
+- LICENSE.rdoc
+- README.rdoc
+- Rakefile
+- spec/rtsp/capturer_spec.rb
 - spec/rtsp/client_spec.rb
 - spec/rtsp/helpers_spec.rb
 - spec/rtsp/message_spec.rb
@@ -189,9 +135,14 @@ files:
 - spec/rtsp_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_rtsp_server.rb
-- tasks/metrics.rake
-- tasks/roodi_config.yml
-- tasks/stats.rake
+- features/client_changes_state.feature
+- features/client_requests.feature
+- features/control_streams_as_client.feature
+- features/step_definitions/client_changes_state_steps.rb
+- features/step_definitions/client_requests_steps.rb
+- features/step_definitions/control_streams_as_client_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb
 homepage: http://rubygems.org/gems/rtsp
 licenses:
 - MIT
@@ -213,16 +164,25 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: rtsp
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Library to allow RTSP streaming from RTSP-enabled devices.
 test_files:
-- spec/rtsp_spec.rb
+- spec/rtsp/capturer_spec.rb
 - spec/rtsp/client_spec.rb
 - spec/rtsp/helpers_spec.rb
 - spec/rtsp/message_spec.rb
 - spec/rtsp/response_spec.rb
 - spec/rtsp/transport_parser_spec.rb
 - spec/rtsp_spec.rb
-has_rdoc: 
+- spec/spec_helper.rb
+- spec/support/fake_rtsp_server.rb
+- features/client_changes_state.feature
+- features/client_requests.feature
+- features/control_streams_as_client.feature
+- features/step_definitions/client_changes_state_steps.rb
+- features/step_definitions/client_requests_steps.rb
+- features/step_definitions/control_streams_as_client_steps.rb
+- features/support/env.rb
+- features/support/hooks.rb

data/.document

@@ -1,3 +0,0 @@
--
-ChangeLog.*
-LICENSE.rdoc

data/.infinity_test

@@ -1,4 +0,0 @@
-infinity_test do
-  use :rubies => %w(1.9.2), :test_framework => :rspec
-  notifications :growl
-end

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---tty

data/.yardopts

@@ -1,4 +0,0 @@
---title "rtsp Documentation"
---protected
---private
---readme README.rdoc

data/Gemfile.lock

@@ -1,134 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rtsp (0.1.2)
-      sdp (~> 0.2.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    Saikuro (1.1.0)
-    abstract (1.0.0)
-    activesupport (3.0.6)
-    arrayfields (4.7.4)
-    blankslate (2.1.2.4)
-    builder (3.0.0)
-    chronic (0.3.0)
-    churn (0.0.13)
-      chronic (>= 0.2.3)
-      hirb
-      json_pure
-      main
-      ruby_parser (~> 2.0.4)
-      sexp_processor (~> 3.0.3)
-    code_statistics (0.2.13)
-    colored (1.2)
-    cucumber (0.10.2)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    fattr (2.2.0)
-    flay (1.4.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    flog (2.5.1)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    gherkin (2.3.5)
-      json (>= 1.4.6)
-    gherkin (2.3.5-java)
-      json (>= 1.4.6)
-    haml (3.0.25)
-    hirb (0.4.3)
-    i18n (0.5.0)
-    json (1.5.1)
-    json (1.5.1-java)
-    json_pure (1.5.1)
-    main (4.4.0)
-      arrayfields (>= 4.7.4)
-      fattr (>= 2.1.0)
-    metric_fu (2.1.1)
-      Saikuro (>= 1.1.0)
-      activesupport (>= 2.0.0)
-      chronic (~> 0.3.0)
-      churn (>= 0.0.7)
-      flay (>= 1.2.1)
-      flog (>= 2.3.0)
-      rails_best_practices (>= 0.6.4)
-      rcov (>= 0.8.3.3)
-      reek (>= 1.2.6)
-      roodi (>= 2.1.0)
-      syntax
-    ore (0.7.2)
-      ore-core (>= 0.1.4, ~> 0.1)
-      thor (~> 0.14.3)
-    ore-core (0.1.5)
-    ore-tasks (0.5.0)
-      ore-core (>= 0.1.3, ~> 0.1)
-    parslet (1.1.1)
-      blankslate (~> 2.0)
-    rails_best_practices (0.7.5)
-      activesupport
-      colored (~> 1.2)
-      erubis (~> 2.6.6)
-      haml (~> 3.0.18)
-      i18n
-      ruby-progressbar (~> 0.0.9)
-      ruby_parser (~> 2.0.4)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rcov (0.9.9-java)
-    reek (1.2.8)
-      ruby2ruby (~> 1.2)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    roodi (2.1.0)
-      ruby_parser
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    ruby-progressbar (0.0.9)
-    ruby2ruby (1.2.5)
-      ruby_parser (~> 2.0)
-      sexp_processor (~> 3.0)
-    ruby_parser (2.0.6)
-      sexp_processor (~> 3.0)
-    sdp (0.2.2)
-      parslet (~> 1.1.0)
-    sexp_processor (3.0.5)
-    simplecov (0.4.2)
-      simplecov-html (~> 0.4.4)
-    simplecov-html (0.4.4)
-    syntax (1.0.0)
-    term-ansicolor (1.0.5)
-    thor (0.14.6)
-    yard (0.6.8)
-
-PLATFORMS
-  java
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  code_statistics (~> 0.2.13)
-  cucumber
-  metric_fu (>= 2.0.0)
-  ore (~> 0.7.2)
-  ore-core (~> 0.1.5)
-  ore-tasks (~> 0.5.0)
-  rake (~> 0.8.7)
-  rspec (~> 2.5.0)
-  rtsp!
-  sdp (~> 0.2.2)
-  simplecov (>= 0.4.0)
-  yard (~> 0.6.0)

data/rtsp.gemspec

@@ -1,127 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('lib/', File.dirname(__FILE__))
-$:.unshift lib unless $:.include?(lib)
-
-require 'rtsp/version'
-
-Gem::Specification.new do |s|
-  s.name = "rtsp"
-  s.version = RTSP::VERSION
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Steve Loveless, Mike Kirby"]
-  s.date = %q{2011-04-14}
-  s.description = %q{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 the data from a play call, but we'll get there.  ...eventually.
-For more information
-RTSP: http://www.ietf.org/rfc/rfc2326.txt}
-  s.email = ["steve.loveless@gmail.com, mkiby@gmail.com"]
-  s.executables = ["rtsp_client"]
-  s.extra_rdoc_files = [
-    "ChangeLog.rdoc",
-    "LICENSE.rdoc",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".infinity_test",
-    ".rspec",
-    ".yardopts",
-    "ChangeLog.rdoc",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.rdoc",
-    "README.rdoc",
-    "Rakefile",
-    "bin/rtsp_client",
-    "features/client_changes_state.feature",
-    "features/client_requests.feature",
-    "features/control_streams_as_client.feature",
-    "features/step_definitions/client_changes_state_steps.rb",
-    "features/step_definitions/client_requests_steps.rb",
-    "features/step_definitions/control_streams_as_client_steps.rb",
-    "features/support/env.rb",
-    "features/support/hooks.rb",
-    "lib/ext/logger.rb",
-    "lib/rtsp.rb",
-    "lib/rtsp/capturer.rb",
-    "lib/rtsp/client.rb",
-    "lib/rtsp/error.rb",
-    "lib/rtsp/global.rb",
-    "lib/rtsp/helpers.rb",
-    "lib/rtsp/message.rb",
-    "lib/rtsp/response.rb",
-    "lib/rtsp/transport_parser.rb",
-    "lib/rtsp/version.rb",
-    "rtsp.gemspec",
-    "spec/.rspec",
-    "spec/rtsp/client_spec.rb",
-    "spec/rtsp/helpers_spec.rb",
-    "spec/rtsp/message_spec.rb",
-    "spec/rtsp/response_spec.rb",
-    "spec/rtsp/transport_parser_spec.rb",
-    "spec/rtsp_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/fake_rtsp_server.rb",
-    "tasks/metrics.rake",
-    "tasks/roodi_config.yml",
-    "tasks/stats.rake"
-  ]
-  s.homepage = %q{http://rubygems.org/gems/rtsp}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{rtsp}
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Library to allow RTSP streaming from RTSP-enabled devices.}
-  s.test_files = [
-    "spec/rtsp_spec.rb",
-    "spec/rtsp/client_spec.rb",
-    "spec/rtsp/helpers_spec.rb",
-    "spec/rtsp/message_spec.rb",
-    "spec/rtsp/response_spec.rb",
-    "spec/rtsp/transport_parser_spec.rb",
-    "spec/rtsp_spec.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<code_statistics>, ["~> 0.2.13"])
-      s.add_development_dependency(%q<metric_fu>, [">= 2.0.0"])
-      s.add_development_dependency(%q<ore>, ["~> 0.7.2"])
-      s.add_development_dependency(%q<ore-core>, ["~> 0.1.5"])
-      s.add_development_dependency(%q<ore-tasks>, ["~> 0.5.0"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.4.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_runtime_dependency(%q<sdp>, ["~> 0.2.2"])
-    else
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<code_statistics>, ["~> 0.2.13"])
-      s.add_dependency(%q<metric_fu>, [">= 2.0.0"])
-      s.add_dependency(%q<ore>, ["~> 0.7.2"])
-      s.add_dependency(%q<ore-core>, ["~> 0.1.5"])
-      s.add_dependency(%q<ore-tasks>, ["~> 0.5.0"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-      s.add_dependency(%q<simplecov>, [">= 0.4.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<sdp>, ["~> 0.2.2"])
-    end
-  else
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<code_statistics>, ["~> 0.2.13"])
-    s.add_dependency(%q<metric_fu>, [">= 2.0.0"])
-    s.add_dependency(%q<ore>, ["~> 0.7.2"])
-    s.add_dependency(%q<ore-core>, ["~> 0.1.5"])
-    s.add_dependency(%q<ore-tasks>, ["~> 0.5.0"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 2.5.0"])
-    s.add_dependency(%q<simplecov>, [">= 0.4.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<sdp>, ["~> 0.2.2"])
-  end
-end
-

data/spec/.rspec

@@ -1 +0,0 @@
---format documentation --color