rbsrt 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 599cf261c097f42b0af1f6ee17958cb2b86766d52bc5bc19a89cea55b25957ea
-  data.tar.gz: 2be8be4acc737eec46c0360140a4896c713a5094508b0b5bba41ef1168c38037
+  metadata.gz: fe25549f98a85f696d9c7b3ef988bc919530d5e17e34acc9366f587e438101e9
+  data.tar.gz: 2802528da33bdfd9a89c79ffe8ce79694e4d75068bc68938f481ba97b374d5eb
 SHA512:
-  metadata.gz: d9798f96042f668e129e16e2082cf386e7b77084e772b6c90d0db2b6063f2081fb6e29dc33b57b67e02c38ae3f5b9bab8ea952808ba7663794324434359f2069
-  data.tar.gz: 37b7bbc0f9e934ab7236993c2adb6b6751bc930d1dbc84aff1c6b2cdb44aa0169d2c90800d9add67dde0f28db8a39e6b91c45f6ae468bf7d558b416ec99e6fe5
+  metadata.gz: 011d75248ff0ffdc146e5069cc5050c017b0aa56416e8957020a2e010ed660cab32d8315a0e57232609e4454a6393e03cb182608cec7444011fd595b5e23185a
+  data.tar.gz: 632898f852865c06668b45da82639c69ac53c0c0354efbde8ee01ff78fcaab029c679a3a67bdfa0fded1466ecab7faa64b340caecca5b10ce0a30d1d5e676372

data/README.md

@@ -70,9 +70,23 @@ Install:
 
 ```
 cd rbsrt
+bundle install
 rake install
 ```
 
+It is possible to provide some information about the location of your srt installation by providing one or more of the following environment variables:
+
+```sh
+RBSRT_LIBSRT_HOME    # a path to the install directory of srt containing the lib and include dirs
+RBSRT_LIBSRT_LIB_DIR # a path to the directory containing libsrt
+RBSRT_LIBSRT_INCLUDE_DIR # a path to the directory containing libsrt headers
+```
+
+For example, you could use the your local srt development repo: 
+
+```
+RBSRT_LIBSRT_HOME="/home/me/code/srt/.build" rake install
+```
 
 ## Examples
 

data/Rakefile

@@ -16,7 +16,10 @@ task :default => :test
 #   sh "make"
 # end
 
-require 'rake/extensiontask'
+desc "Open an irb session with rbsrt library"
+task :console do
+  sh "irb  -r ./lib/rbsrt.rb"
+end
 
 Rake::ExtensionTask.new 'rbsrt' do |ext|
   ext.lib_dir = "lib/rbsrt"
@@ -26,4 +29,4 @@ desc "Run tests"
 task :test => [ :compile ] do
     require './test/test_helper'
     Dir.glob( './test/**/*_test.rb').each { |file| require file }
-end
+end

data/bin/rbsrt-server

@@ -53,11 +53,11 @@ puts "starting server"
 server.start do |connection|
   puts "new connection: connections=#{connection_count}, id=#{connection.id}, streamid=#{connection.streamid}"
 
-  output_file = File.new "recording-#{Process.pid}-#{connection.id}.ts", "w+"
+  output_file_path = File.join options.recording_path, "recording-#{Process.pid}-#{connection.id}.ts"
+  output_file = File.new output_file_path, "w+"
   output_file.close_on_exec = true
 
   connection.at_data do |chunk|
-    puts "data"
     output_file.write(chunk)
   end
 

data/ext/rbsrt/extconf.rb

@@ -2,35 +2,51 @@ require 'mkmf'
 
 extension_name = 'rbsrt/rbsrt'
 
-RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+# RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-# LIBDIR      = CONFIG['libdir']
-# INCLUDEDIR  = CONFIG['includedir']
+LIBDIR      = CONFIG['libdir']
+INCLUDEDIR  = CONFIG['includedir']
 
-# HEADER_DIRS = []
-# HEADER_DIRS << '/opt/local/include' if File.directory?('/opt/local/include')
-# HEADER_DIRS << '/usr/local/include' if File.directory?('/usr/local/include')
-# HEADER_DIRS << INCLUDEDIR
-# HEADER_DIRS << '/usr/include' if File.directory?('/usr/include')
+HEADER_DIRS = []
+HEADER_DIRS << '/opt/local/include' if File.directory?('/opt/local/include')
+HEADER_DIRS << '/usr/local/include' if File.directory?('/usr/local/include')
+HEADER_DIRS << '/opt/homebrew/include' if File.directory?('/opt/homebrew/include')
+HEADER_DIRS << INCLUDEDIR
+HEADER_DIRS << '/usr/include' if File.directory?('/usr/include')
 
-# LIB_DIRS = []
-# LIB_DIRS << '/opt/local/lib' if File.directory?('/opt/local/lib')
-# LIB_DIRS << '/usr/local/lib' if File.directory?('/usr/local/lib')
-# LIB_DIRS << LIBDIR
-# LIB_DIRS << '/usr/lib' if File.directory?('/usr/lib')
 
-dir_config('srt')
+LIB_DIRS = []
+LIB_DIRS << '/opt/local/lib' if File.directory?('/opt/local/lib')
+LIB_DIRS << '/usr/local/lib' if File.directory?('/usr/local/lib')
+LIB_DIRS << '/opt/homebrew/lib' if File.directory?('/opt/homebrew/lib')
+LIB_DIRS << LIBDIR
+LIB_DIRS << '/usr/lib' if File.directory?('/usr/lib')
+
+if lib_srt_home_path = ENV["RBSRT_LIBSRT_HOME"]
+  HEADER_DIRS << File.join(lib_srt_home_path, "include") if File.directory?(File.join(lib_srt_home_path, "include"))
+  LIB_DIRS << File.join(lib_srt_home_path, "lib") if File.directory?(File.join(lib_srt_home_path, "lib"))
+end
+
+if lib_srt_lib_path = ENV["RBSRT_LIBSRT_LIB_DIR"]
+  LIB_DIRS << lib_srt_lib_path if File.directory?(lib_srt_lib_path)
+end
+
+if lib_srt_include_path = ENV["RBSRT_LIBSRT_INCLUDE_DIR"]
+  LIB_DIRS << lib_srt_include_path if File.directory?(lib_srt_include_path)
+end
+
+dir_config('srt', HEADER_DIRS, LIB_DIRS)
 # dir_config('srt', HEADER_DIRS, LIB_DIRS)
 # dir_config('c++', HEADER_DIRS, LIB_DIRS)
 
 # srt dependencies
 
 unless find_header('srt/srt.h')
-  abort "libsrt is missing.  please install libsrt: https://github.com/Haivision/srt"
+  abort "libsrt is missing no header.  please install libsrt: https://github.com/Haivision/srt"
 end
 
 unless find_library('srt', 'srt_create_socket')
-  abort "libsrt is missing.  please install libsrt: https://github.com/Haivision/srt"
+  abort "libsrt is missing no sock.  please install libsrt: https://github.com/Haivision/srt"
 end
 
 dir_config(extension_name)

data/lib/rbsrt/streamid_components.rb

@@ -58,6 +58,23 @@ module SRT
       streamid + vars.join(",")
     end
 
+    def to_h
+      h = {}
+
+      @extra.each do |key, value|
+        h[key] = value
+      end
+
+      h[:resource_name] = resource_name if resource_name
+      h[:user_name] = user_name if user_name
+      h[:mode] = mode if mode
+      h[:host_name] = host_name if host_name
+      h[:type] = type if type
+      h[:sessionid] = sessionid if sessionid
+      
+      return h
+    end
+
     def method_missing(name, *args)
       return extra[name.to_s] if extra.key? name.to_s
       match = name.to_s.match(/^(.*?)(=?)$/)

data/lib/rbsrt/version.rb

@@ -1,3 +1,3 @@
 module SRT
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/rbsrt.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.extensions  = %w[ext/rbsrt/extconf.rb]
   s.required_ruby_version = ">= 2.2.0"
   s.add_development_dependency "rake-compiler", "~> 1.0"
-end
+  s.add_development_dependency "gem-release", "~> 2.2"
+end

data/test/rbsrt/streamid_components_test.rb

@@ -277,5 +277,41 @@ describe SRT::StreamIDComponents do
       s.baz.must_equal "bar"
     end
   end
+
+  describe "#to_h" do
+    let(:streamid) { "#!::r=foobar,u=admin,h=stream.recce.nl,s=12345,t=stream,m=publish,foo=bar" }
+
+    let(:parser) { 
+      SRT::StreamIDComponents.new(streamid)
+    }
+
+    it "stores the 'r' as the :resource_name" do
+      parser.to_h[:resource_name].must_equal "foobar"
+    end
+
+    it "stores the 'u' var to :user_name" do
+      parser.to_h[:user_name].must_equal "admin"
+    end
+
+    it "stores the 'm' var to :mode" do
+      parser.to_h[:mode].must_equal :publish
+    end
+
+    it "stores the 'h' to :host_name" do
+      parser.to_h[:host_name].must_equal "stream.recce.nl"
+    end
+
+    it "stores the 't' var to :type" do
+      parser.to_h[:type].must_equal :stream
+    end
+
+    it "stores the 's' var to :sessionid" do
+      parser.to_h[:sessionid].must_equal "12345"
+    end
+
+    it "stores extra attributes when available" do
+      parser.to_h["foo"].must_equal "bar"
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbsrt
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Klaas Speller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-20 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 description: Build SRT (Secure Reliable Transport) servers and clients with Ruby
 email:
 - klaas@recce.nl
@@ -58,7 +72,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/spllr/rbsrt
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -73,11 +87,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Ruby API for SRT (Secure Reliable Transport)
 test_files:
+- test/rbsrt/poll_test.rb
 - test/rbsrt/stats_test.rb
 - test/rbsrt/streamid_components_test.rb
-- test/rbsrt/poll_test.rb