vidibus-recording 0.0.5 → 0.0.6

data/lib/vidibus/recording/backend.rb

@@ -3,8 +3,8 @@ module Vidibus::Recording
     class ConfigurationError < StandardError; end
     class ProtocolError < ConfigurationError; end
 
-    BACKENDS = %[rtmpdump]
-    
+    BACKENDS = %w[rtmpdump]
+
     # Returns an instance of a backend processor
     # that is able to record the given stream.
     def self.load(attributes)

data/lib/vidibus/recording/job.rb

@@ -49,7 +49,7 @@ module Vidibus::Recording
 
     def record!
       Open3::popen3(recording.backend.command) do |stdin, stdout, stderr, process|
-        maxloops = 5
+        maxloops = 10
         loop do
           begin
             string = stdout.read_nonblock(1024)

data/lib/vidibus/recording/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Recording
-    VERSION = "0.0.5"
+    VERSION = '0.0.6'
   end
 end

data/lib/vidibus/recording.rb

@@ -1,4 +1,4 @@
-require "recording/job"
-require "recording/backend"
-require "recording/helpers"
-require "recording/mongoid"
+require 'vidibus/recording/job'
+require 'vidibus/recording/backend'
+require 'vidibus/recording/helpers'
+require 'vidibus/recording/mongoid'

data/lib/vidibus-recording.rb

@@ -1,8 +1,8 @@
-require "open3"
-require "yaml"
-require "delayed_job_mongoid"
-require "active_support/core_ext"
-require "vidibus-uuid"
+require 'open3'
+require 'yaml'
+require 'delayed_job_mongoid'
+require 'active_support/core_ext'
+require 'vidibus-uuid'
 
 module Vidibus
   module Recording
@@ -12,5 +12,4 @@ module Vidibus
   end
 end
 
-$:.unshift(File.join(File.dirname(__FILE__), "vidibus"))
-require "recording"
+require 'vidibus/recording'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-recording
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -14,119 +15,150 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-22 00:00:00 +01:00
-default_executable: 
+date: 2013-04-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         version: "3"
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mongoid
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: activesupport
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         version: "2"
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: delayed_job_mongoid
+  requirement: *id002
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: mongoid
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: vidibus-uuid
+  requirement: *id003
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: delayed_job_mongoid
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  requirement: *id004
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: vidibus-uuid
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
+  requirement: *id005
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: bundler
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  requirement: *id006
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
-        - 2
-        version: "2"
+        - 0
+        version: "0"
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
+  requirement: *id007
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: rdoc
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  requirement: *id008
+  prerelease: false
   name: rcov
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  type: :development
+  requirement: *id009
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  requirement: *id010
+  prerelease: false
+  name: rr
 description: Allows recording of RTMP video streams. Uses RTMPdump.
 email: andre@vidibus.com
 executables: []
@@ -136,29 +168,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .gitignore
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.rdoc
-- Rakefile
-- app/models/recording.rb
-- lib/vidibus-recording.rb
-- lib/vidibus/recording.rb
-- lib/vidibus/recording/backend.rb
 - lib/vidibus/recording/backend/rtmpdump.rb
+- lib/vidibus/recording/backend.rb
 - lib/vidibus/recording/helpers.rb
 - lib/vidibus/recording/job.rb
 - lib/vidibus/recording/mongoid.rb
 - lib/vidibus/recording/version.rb
-- spec/log/v22.log
-- spec/log/v23.log
-- spec/spec_helper.rb
-- spec/vidibus/recording/backend/rtmpdump_spec.rb
-- spec/vidibus/recording/backend_spec.rb
-- spec/vidibus/recording/mongoid_spec.rb
-- vidibus-recording.gemspec
-has_rdoc: true
+- lib/vidibus/recording.rb
+- lib/vidibus-recording.rb
+- app/models/recording.rb
+- LICENSE
+- README.rdoc
+- Rakefile
 homepage: https://github.com/vidibus/vidibus-recording
 licenses: []
 
@@ -168,16 +189,20 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
       - 1
       - 3
@@ -186,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Video stream recording tools

data/.gitignore

@@ -1,5 +0,0 @@
-pkg/*
-*.gem
-.bundle
-cli
-recordings

data/Gemfile

@@ -1,6 +0,0 @@
-source :gemcutter
-
-# Specify your gem's dependencies in vidibus-rtmpdump.gemspec
-gemspec
-
-gem 'delayed_job', '3.0.0', :git => 'git://github.com/collectiveidea/delayed_job.git'

data/Gemfile.lock

@@ -1,75 +0,0 @@
-GIT
-  remote: git://github.com/collectiveidea/delayed_job.git
-  revision: dcd69066144c760922ce2e3e5f538fe1ca6074c5
-  specs:
-    delayed_job (3.0.0)
-      activesupport (~> 3.0)
-
-PATH
-  remote: .
-  specs:
-    vidibus-recording (0.0.5)
-      activesupport (~> 3)
-      delayed_job_mongoid
-      mongoid (~> 2)
-      vidibus-uuid
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
-      builder (~> 3.0.0)
-    activesupport (3.2.0)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    bson (1.5.2)
-    builder (3.0.0)
-    delayed_job_mongoid (1.0.8)
-      delayed_job (~> 3.0.0)
-      mongoid (>= 2.0)
-    diff-lcs (1.1.3)
-    i18n (0.6.0)
-    macaddr (1.5.0)
-      systemu (>= 2.4.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongoid (2.4.1)
-      activemodel (~> 3.1)
-      mongo (~> 1.3)
-      tzinfo (~> 0.3.22)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    rcov (1.0.0)
-    rr (1.0.4)
-    rspec (2.8.0)
-      rspec-core (~> 2.8.0)
-      rspec-expectations (~> 2.8.0)
-      rspec-mocks (~> 2.8.0)
-    rspec-core (2.8.0)
-    rspec-expectations (2.8.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.8.0)
-    systemu (2.4.2)
-    tzinfo (0.3.31)
-    uuid (2.3.4)
-      macaddr (~> 1.0)
-    vidibus-uuid (0.4.1)
-      mongoid (~> 2)
-      uuid (~> 2.3.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activesupport (~> 3)
-  bundler (>= 1.0.0)
-  delayed_job (= 3.0.0)!
-  delayed_job_mongoid
-  mongoid (~> 2)
-  rake
-  rcov
-  rr
-  rspec (~> 2)
-  vidibus-recording!
-  vidibus-uuid

data/spec/log/v22.log

@@ -1,29 +0,0 @@
-RTMPDump v2.2
-(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
-Connecting ...
-ERROR: rtmp server sent error
-Starting Live Stream
-Metadata:
-  author
-  copyright
-  description
-  keywords
-  rating
-  title
-  presetname            Custom
-  creationdate          Mon Jan 17 15:22:50 2011
-  videodevice           Osprey-210 Video Device 1
-  framerate             25.00
-  width                 680.00
-  height                394.00
-  videocodecid          avc1
-  videodatarate         650.00
-  avclevel              31.00
-  avcprofile            66.00
-  videokeyframe_frequency5.00
-  audiodevice           Osprey-210 Audio Device 1
-  audiosamplerate       22050.00
-  audiochannels         1.00
-  audioinputvolume      75.00
-  audiocodecid          .mp3
-  audiodatarate         48.00

data/spec/log/v23.log

@@ -1,30 +0,0 @@
-RTMPDump v2.3
-(c) 2010 Andrej Stepanchuk, Howard Chu, The Flvstreamer Team; license: GPL
-Connecting ...
-INFO: Connected...
-ERROR: rtmp server sent error
-Starting Live Stream
-INFO: Metadata:
-INFO:   author                
-INFO:   copyright             
-INFO:   description           
-INFO:   keywords              
-INFO:   rating                
-INFO:   title                 
-INFO:   presetname            Custom
-INFO:   creationdate          Mon Jan 17 15:22:50 2011
-INFO:   videodevice           Osprey-210 Video Device 1
-INFO:   framerate             25.00
-INFO:   width                 680.00
-INFO:   height                394.00
-INFO:   videocodecid          avc1
-INFO:   videodatarate         650.00
-INFO:   avclevel              31.00
-INFO:   avcprofile            66.00
-INFO:   videokeyframe_frequency5.00
-INFO:   audiodevice           Osprey-210 Audio Device 1
-INFO:   audiosamplerate       22050.00
-INFO:   audiochannels         1.00
-INFO:   audioinputvolume      75.00
-INFO:   audiocodecid          .mp3
-INFO:   audiodatarate         48.00

data/spec/spec_helper.rb

@@ -1,38 +0,0 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
-
-require "rubygems"
-require "rspec"
-require "rr"
-require "mongoid"
-
-require "vidibus-recording"
-require "app/models/recording"
-
-Mongoid.configure do |config|
-  name = "vidibus-recording_test"
-  host = "localhost"
-  config.master = Mongo::Connection.new.db(name)
-  config.logger = nil
-end
-
-RSpec.configure do |config|
-  config.mock_with :rr
-  config.before(:each) do
-    Mongoid.master.collections.select {|c| c.name !~ /system/}.each(&:drop)
-  end
-end
-
-# Helper for stubbing time. Define String to be set as Time.now.
-# Usage:
-#   stub_time('01.01.2010 14:00')
-#   stub_time(2.days.ago)
-#
-def stub_time(string = nil)
-  string ||= Time.now.to_s(:db)
-  now = Time.parse(string.to_s)
-  stub(Time).now { now }
-  now
-end
-
-#I18n.load_path += Dir[File.join('config', 'locales', '**', '*.{rb,yml}')]

data/spec/vidibus/recording/backend/rtmpdump_spec.rb

@@ -1,53 +0,0 @@
-require "spec_helper"
-require "recording/backend/rtmpdump"
-
-describe "Vidibus::Recording::Backend::Rtmpdump" do
-
-  let(:this) {Vidibus::Recording::Backend::Rtmpdump.new(:stream => "rtmp://test", :file => "test.rec")}
-  let(:log_v22) {File.read("spec/log/v22.log")}
-  let(:log_v23) {File.read("spec/log/v23.log")}
-
-  describe "extract_metadata" do
-    it "should extract relevant metadata from RTMPDump v2.2" do
-      this.extract_metadata(log_v22).should eql({
-        "presetname" => "Custom",
-        "creationdate" => "Mon Jan 17 15:22:50 2011",
-        "videodevice" => "Osprey-210 Video Device 1",
-        "framerate" => "25.00",
-        "width" => "680.00",
-        "height" => "394.00",
-        "videocodecid" => "avc1",
-        "videodatarate" => "650.00",
-        "avclevel" => "31.00",
-        "avcprofile" => "66.00",
-        "audiodevice" => "Osprey-210 Audio Device 1",
-        "audiosamplerate" => "22050.00",
-        "audiochannels" => "1.00",
-        "audioinputvolume" => "75.00",
-        "audiocodecid" => ".mp3",
-        "audiodatarate" => "48.00"
-      })
-    end
-    
-    it "should extract relevant metadata from RTMPDump v2.3" do
-      this.extract_metadata(log_v23).should eql({
-        "presetname" => "Custom",
-        "creationdate" => "Mon Jan 17 15:22:50 2011",
-        "videodevice" => "Osprey-210 Video Device 1",
-        "framerate" => "25.00",
-        "width" => "680.00",
-        "height" => "394.00",
-        "videocodecid" => "avc1",
-        "videodatarate" => "650.00",
-        "avclevel" => "31.00",
-        "avcprofile" => "66.00",
-        "audiodevice" => "Osprey-210 Audio Device 1",
-        "audiosamplerate" => "22050.00",
-        "audiochannels" => "1.00",
-        "audioinputvolume" => "75.00",
-        "audiocodecid" => ".mp3",
-        "audiodatarate" => "48.00"
-      })
-    end
-  end
-end

data/spec/vidibus/recording/backend_spec.rb

@@ -1,29 +0,0 @@
-require "spec_helper"
-
-describe "Vidibus::Recording::Backend" do
-
-  describe ".load" do
-    it "should return an error unless a stream attribute is given" do
-      expect {
-        Vidibus::Recording::Backend.load({})
-      }.to raise_error(Vidibus::Recording::Backend::ConfigurationError)
-    end
-
-    it "should return a backend instance for given stream protocol" do
-      Vidibus::Recording::Backend.load(:stream => "rtmp://something", :file => "test").
-        should be_an_instance_of(Vidibus::Recording::Backend::Rtmpdump)
-    end
-
-    it "should return an error unless a stream attribute with consumable protocol is given" do
-      expect {
-        Vidibus::Recording::Backend.load({:stream => "mms://something", :file => "test"})
-      }.to raise_error(Vidibus::Recording::Backend::ProtocolError)
-    end
-
-    it "should return an error unless a stream attribute with a protocol is given" do
-      expect {
-        Vidibus::Recording::Backend.load({:stream => "something", :file => "test"})
-      }.to raise_error(Vidibus::Recording::Backend::ProtocolError)
-    end
-  end
-end

data/spec/vidibus/recording/mongoid_spec.rb

@@ -1,111 +0,0 @@
-require "spec_helper"
-
-describe "Vidibus::Recording::Mongoid" do
-
-  let(:this) do
-    Recording.new(:name => "N-TV Live", :stream => "rtmp://fms.rtl.de/ntvlive/livestream/channel1", :live => true)
-  end
-
-  def cleanup(recording)
-    Process.kill("SIGTERM", recording.pid) if recording.pid
-    delete_safely(recording.file)
-    delete_safely(recording.log_file)
-    delete_safely(recording.yml_file)
-  end
-
-  def delete_safely(file)
-    return unless file.match(/.{32}\..{3}/)
-    File.delete(file) if File.exists?(file)
-  end
-
-  describe "validation" do
-    it "should pass with valid attributes" do
-      this.should be_valid
-    end
-
-    it "should fail without a stream" do
-      this.stream = nil
-      this.should be_invalid
-    end
-
-    it "should fail without a valid stream address" do
-      this.stream = "something"
-      this.should be_invalid
-    end
-
-    it "should fail without a valid rtmp stream address" do
-      this.stream = "rtmp://something"
-      this.should be_valid
-    end
-
-    it "should fail without a name" do
-      this.name = nil
-      this.should be_invalid
-    end
-  end
-
-  describe "job" do
-    it "should return a job instance" do
-      this.job.should be_an_instance_of(Vidibus::Recording::Job)
-    end
-  end
-
-  describe "backend" do
-    it "should return a backend instance for given stream protocol" do
-      this.backend.should be_an_instance_of(Vidibus::Recording::Backend::Rtmpdump)
-    end
-  end
-
-  describe "start" do
-    before {this.save}
-
-    it "should return a process id" do
-      this.start.should be_a(Fixnum)
-    end
-
-    context "without params" do
-      it "should start a recording job now" do
-        pid = this.start
-        Vidibus::Recording::Job.running?(pid).should be_true
-      end
-    end
-
-    context "with a given Time" do
-      it "should schedule a recording job" do
-        stub_time("2011-01-12 00:00")
-        run_at = 10.minutes.since
-        this.start(run_at)
-        Delayed::Backend::Mongoid::Job.count.should eql(1)
-        Delayed::Backend::Mongoid::Job.first.run_at.should eql(run_at)
-      end
-    end
-
-    after {cleanup(this)}
-  end
-
-  describe "stop" do
-    before {this.save}
-
-    it "should return false unless recording has been started" do
-      this.stop.should be_false
-    end
-
-    it "should return false if recording is done" do
-      this.stopped_at = Time.now
-      this.stop.should be_false
-    end
-
-    context "with started job" do
-      before {this.start}
-
-      it "should stop the recording job" do
-        pid = this.pid
-        this.stop
-        sleep 1
-        Vidibus::Recording::Job.running?(pid).should be_false
-      end
-
-      after {cleanup(this)}
-    end
-  end
-end

data/vidibus-recording.gemspec

@@ -1,30 +0,0 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/vidibus/recording/version", __FILE__)
-
-Gem::Specification.new do |s|
-  s.name        = "vidibus-recording"
-  s.version     = Vidibus::Recording::VERSION
-  s.platform    = Gem::Platform::RUBY
-  s.authors     = "Andre Pankratz"
-  s.email       = "andre@vidibus.com"
-  s.homepage    = "https://github.com/vidibus/vidibus-recording"
-  s.summary     = "Video stream recording tools"
-  s.description = "Allows recording of RTMP video streams. Uses RTMPdump."
-
-  s.required_rubygems_version = ">= 1.3.6"
-
-  s.add_dependency "activesupport", "~> 3"
-  s.add_dependency "mongoid", "~> 2"
-  s.add_dependency "delayed_job_mongoid"
-  s.add_dependency "vidibus-uuid"
-
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec", "~> 2"
-  s.add_development_dependency "rr"
-  s.add_development_dependency "rcov"
-
-  s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
-  s.require_path = 'lib'
-end