simple_pvr 1.0.0 → 1.1.0

data/public/partials/schedules.html

@@ -1,40 +1,52 @@
 <div class="row">
-	<div class="span6" id="schedules">
+	<div class="col-md-6" id="schedules">
 		<h1>Existing schedules</h1>
 		<div class="row" ng-repeat="schedule in schedules">
-			<div class="span6">
+			<div class="col-md-12">
 				<p><span ng-show="schedule.is_exception">Exception:</span> {{schedule.title}}
 					<span ng-show="schedule.channel">on {{schedule.channel.name}}</span>
 					<span ng-show="schedule.start_time">{{schedule.start_time | date:'fullDate'}} at {{schedule.start_time | date:'HH:mm'}}</span>
 					{{schedule | filteredWeekdays}} {{schedule | timeOfDay}} {{schedule | startEarlyEndLate}}
 				</p>
 				<p>
-					<a ng-href="/schedules/{{schedule.id}}" class="btn" ng-hide="schedule.is_exception">Edit</a>
+					<a ng-href="/schedules/{{schedule.id}}" class="btn btn-default" ng-hide="schedule.is_exception">Edit</a>
 					<button type="button" ng-click="deleteSchedule(schedule)" class="btn btn-warning">Delete</button>
 				</p>
 			</div>
 		</div>
 		<div class="row">
-			<div class="span6">
+			<div class="col-md-12">
 				<h1>Create new schedule</h1>
-				<form>
-					<label class="control-label" for="newScheduleTitle">Name</label>
-					<input id="newScheduleTitle" type="text" ng-model="newSchedule.title"></p>
-					<label class="control-label" for="newScheduleChannel">Channel</label>
-					<select id="newScheduleChannel" ng-model="newSchedule.channelId">
-				      <option value="0">-- Any channel --</option>
-				      <option ng-repeat="channel in channels" value="{{channel.id}}">{{channel.name}}</option>
-				    </select></p>
-					<span ng-show="newSchedule.title"><button ng-click="createSchedule()" class="btn">Create schedule</button></span>
+				<form class="form-horizontal" role="form">
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="newScheduleTitle">Name</label>
+						<div class="col-lg-10">
+							<input id="newScheduleTitle" type="text" class="form-control" ng-model="newSchedule.title"></p>
+						</div>
+					</div>
+					<div class="form-group">
+						<label class="control-label col-lg-2" for="newScheduleChannel">Channel</label>
+						<div class="col-lg-10">
+							<select id="newScheduleChannel" class="form-control" ng-model="newSchedule.channelId">
+						      <option value="0">-- Any channel --</option>
+						      <option ng-repeat="channel in channels" value="{{channel.id}}">{{channel.name}}</option>
+						    </select></p>
+						</div>
+					</div>
+					<div class="form-group">
+					    <div class="col-lg-offset-2 col-lg-10">
+							<button ng-click="createSchedule()" class="btn btn-default" ng-disabled="!newSchedule.title">Create schedule</button>
+						</div>
+					</div>
 				</form>
 			</div>
 		</div>
 	</div>
-	<div class="span6" id="upcoming_recordings">
+	<div class="col-md-6" id="upcoming_recordings">
 		<h1>Upcoming recordings</h1>
 		<div class="row" ng-repeat="recording in upcomingRecordings">
-	    	<div class="span6">
-		    	<h2>{{recording.show_name}}<span ng-show="recording.is_conflicting" style="color: red"> (Conflicting)</span> <a ng-href="#" ng-click="excludeRecording(recording)" title="Do not record this specific show"><i class="icon-remove"></i></a></h2>
+	    	<div class="col-md-12">
+		    	<h2>{{recording.show_name}}<span ng-show="recording.is_conflicting" style="color: red"> (Conflicting)</span> <a href ng-click="excludeRecording(recording)" title="Do not record this specific show"><span class="glyphicon glyphicon-remove" style="color:black; font-size:15px; vertical-align: top;"></span></a></h2>
 				<p>{{recording.start_time | date:'fullDate'}} at {{recording.start_time | date:'HH:mm'}} on {{recording.channel.name}}</p>
 				<p ng-show="recording.subtitle">{{recording.subtitle}}</p>
 				<p><a ng-href="/programmes/{{recording.programme_id}}">View details</a></p>

data/public/partials/search.html

@@ -1,17 +1,16 @@
 <div class="row">
-	<div class="span12">
+	<div class="col-md-12">
 		<h1>Results for {{query}}</h1>
 	</div>
 </div>
-<div class="row" ng-repeat="programmeChunk in result | chunk:2">
-	<div class="span6" ng-repeat="programme in programmeChunk">
-		<h2>{{programme.title}}</h2>
-		<p>{{programme.start_time | date:'fullDate'}} at {{programme.start_time | date:'HH:mm'}} on channel {{programme.channel.name}}.</p>
-		<p>{{programme.subtitle}}</p>
-		<p>{{programme.description}}</p>
-		<p><a ng-href="/programmes/{{programme.id}}">Show details</a></p>
-		<div ng-show="programme.is_scheduled">
-			<p>This programme is being recorded.</p>
-		</div>
+<div class="col-md-12" ng-repeat-start="programme in result">
+	<h2>{{programme.title}}</h2>
+	<p>{{programme.start_time | date:'fullDate'}} at {{programme.start_time | date:'HH:mm'}} on channel {{programme.channel.name}}.</p>
+	<p>{{programme.subtitle}}</p>
+	<p>{{programme.description}}</p>
+	<p><a ng-href="/programmes/{{programme.id}}">Show details</a></p>
+	<div ng-show="programme.is_scheduled">
+		<p>This programme is being recorded.</p>
 	</div>
 </div>
+<div class="clearfix" ng-show="$index % 2 == 1" ng-repeat-end></div>

data/public/partials/show.html

@@ -1,21 +1,38 @@
 <div class="row">
-	<div class="span12">
+	<div class="col-md-12">
 		<h1>Recordings of {{show.name}}</h1>
 	</div>
 </div>
-<div class="row" ng-repeat="recordingChunk in recordings | orderBy:'start_time' | chunk:2">
-	<div class="span6" ng-repeat="recording in recordingChunk">
-   		<h2>{{recording.episode}}</h2>
-		<img ng-show="recording.has_thumbnail" class="thumbnail" ng-src="/api/shows/{{show.name}}/recordings/{{recording.episode}}/thumbnail.png">
+<div class="row" ng-repeat="recording in recordings | orderBy:'start_time'">
+	<div class="col-md-12 media">
+		<img class="media-object pull-left" ng-if="recording.has_icon" ng-src="/api/shows/{{show.name}}/recordings/{{recording.id}}/icon">
+		<h1 class="media-heading">{{recording.episode}}</h1>
+		<img ng-if="recording.has_thumbnail" class="thumbnail" ng-src="/api/shows/{{show.name}}/recordings/{{recording.id}}/thumbnail.png">
 		<p>{{recording.subtitle}}</p>
 		<p>{{recording.start_time | date:'fullDate'}} at {{recording.start_time | date:'HH:mm'}} from channel {{recording.channel_name}}.</p>
 		<p>{{recording.description}}</p>
+		<p ng-repeat="director in recording.directors">
+			<strong>Director:</strong> {{director}}
+		</p>
+		<p ng-repeat="presenter in recording.presenters">
+			<strong>Presenter:</strong> {{presenter}}
+		</p>
+		<p ng-repeat="actor in recording.actors">
+			<strong ng-show="actor.role_name">{{actor.role_name}}:</strong> {{actor.actor_name}}
+		</p>
+		<p ng-show="recording.categories">
+			<strong>Categories:</strong>
+			<span ng-repeat="category in recording.categories">
+				{{category}}<span ng-hide="$last">, </span>
+			</span>
+		</p>
+
 		<p>
-			<a target="_self" ng-href="/api/shows/{{show.name}}/recordings/{{recording.episode}}/stream.ts">Raw stream</a>
+			<a target="_self" ng-href="/api/shows/{{show.name}}/recordings/{{recording.id}}/stream.ts">Raw stream</a>
 			-
-			<a ng-show="recording.has_webm" target="_self" ng-href="/api/shows/{{show.name}}/recordings/{{recording.episode}}/stream.webm">View in browser (Firefox/Chrome)</a>
-			<button ng-hide="recording.has_webm" class="btn" type="button" ng-click="startTranscoding(recording)">Prepare for playing in Firefox/Chrome</button>
+			<a ng-show="recording.has_webm" target="_self" ng-href="/api/shows/{{show.name}}/recordings/{{recording.id}}/stream.webm">View in browser (Firefox/Chrome)</a>
+			<button ng-hide="recording.has_webm" class="btn btn-default" type="button" ng-click="startTranscoding(recording)">Prepare for playing in Firefox/Chrome</button>
 		</p>
-		<p><button class="btn" type="button" ng-click="deleteRecording(recording)">Delete recording</button></p>
+		<p><button class="btn btn-warning" type="button" ng-click="deleteRecording(recording)">Delete recording</button></p>
 	</div>
 </div>

data/public/partials/shows.html

@@ -1,7 +1,6 @@
-<div class="row" ng-repeat="showChunk in shows | orderBy:'name' | chunk:2">
-	<div class="span6" ng-repeat="show in showChunk">
-    	<h2>{{show.name}}</h2>
-		<p><a class="btn btn-primary" ng-href="/shows/{{show.id}}">Episodes</a>
-		<button class="btn" type="button" ng-click="deleteEpisodes(show)">Delete all episodes</button></p>
-	</div>
+<div class="col-md-6" ng-repeat-start="show in shows | orderBy:'name'">
+	<h2>{{show.name}}</h2>
+	<p><a class="btn btn-default" ng-href="/shows/{{show.id}}">Episodes</a>
+	<button class="btn btn-warning" type="button" ng-click="deleteEpisodes(show)">Delete all episodes</button></p>
 </div>
+<div class="clearfix" ng-show="$index % 2 == 1" ng-repeat-end></div>

data/public/partials/status.html

@@ -1,5 +1,5 @@
 <div class="row">
-	<div class="span12">
+	<div class="col-md-12">
 		<h1>Current status</h2>
 		<p>{{status.status_text}}</p>
 	</div>

data/public/templates/loginDialog.html

@@ -0,0 +1,30 @@
+<div class="modal fade" id="loginModal" tabindex="-1" role="dialog" aria-labelledby="loginModalLabel" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <form ng-submit="submit()" name="loginCredentialsForm" role="form">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="loginModalLabel">Enter credentials</h4>
+                </div>
+                <div class="modal-body">
+                    <div class="form-horizontal">
+                        <div class="form-group">
+                            <label class="col-lg-4 control-label" for="userName">User name</label>
+                            <div class="col-lg-4">
+                                <input type="text" class="form-control" ng-model="credentials.userName" id="userName" placeholder="User name">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-lg-4 control-label" for="password">Password</label>
+                            <div class="col-lg-4">
+                                <input type="password" class="form-control" ng-model="credentials.password" id="password" placeholder="Password">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <input type="submit" class="btn btn-primary" value="Log in"></input>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>

data/public/templates/logoutLink.html

@@ -0,0 +1 @@
+<p ng-show="isLoggedIn()" class="navbar-text navbar-right"><a href="" ng-click="logOut()">Log out</a></p>

data/public/templates/titleSearch.html

@@ -1,4 +1,6 @@
-<form class="navbar-form pull-right" ng-submit="search()">
-  <input class="span2" name="programme-search-query" type="text" ng-model="title" placeholder="Search programmes...">
-  <button type="submit" class="btn">Search</button>
+<form class="navbar-form navbar-right" role="search" ng-submit="search()">
+  <div class="form-group">
+  	<input class="form-control" name="programme-search-query" type="text" ng-model="title" placeholder="Search programmes...">
+  </div>
+  <button type="submit" class="btn btn-default">Search</button>
 </form>

data/simple_pvr.gemspec

@@ -22,11 +22,13 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'data_mapper', '~> 1.2'
   gem.add_dependency 'dm-sqlite-adapter', '~> 1.2'
   gem.add_dependency 'sinatra', '~> 1.3'
-  gem.add_dependency 'puma', '~> 1.6'
+  gem.add_dependency 'puma', '~> 2.7'
 
   gem.add_development_dependency 'rake', '>= 10.0.0'
   gem.add_development_dependency 'rspec', '~> 2.11'
-  gem.add_development_dependency 'cucumber', '~> 1.2'
-  gem.add_development_dependency 'capybara', '~> 2.0'
-  gem.add_development_dependency 'poltergeist', '~> 1.1'
+  gem.add_development_dependency 'cucumber', '~> 1.3'
+  gem.add_development_dependency 'capybara', '~> 2.2'
+  gem.add_development_dependency 'selenium-webdriver'
+  gem.add_development_dependency 'poltergeist', '~> 1.5'
+  gem.add_development_dependency 'pry'
 end

data/spec/resources/dummyImage.png

@@ -0,0 +1 @@
+This is not really a PNG file...

data/spec/resources/programmes-with-categories.xmltv

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tv generator-info-name="www.ontv.dk/xmltv">
+	<channel id="www.ontv.dk/tv/1">
+		<display-name lang="dk">DR1 DK</display-name>
+	</channel>
+	<channel id="www.ontv.dk/tv/2">
+		<display-name lang="dk">DR2 DK</display-name>
+	</channel>
+	
+	<programme channel="www.ontv.dk/tv/1" start="20120717060000 +0200" stop="20120717061000 +0200">
+		<title lang="dk">Noddy</title>
+		<sub-title lang="dk">Bare vær dig selv, Noddy.</sub-title>
+		<desc lang="dk">Tegnefilm.
+Her kommer Noddy - så kom ud og leg! Den lille dreng af træ har altid travlt med at køre sine venner rundt i Legebyen - og du kan altid høre, når han er på vej!</desc>
+		<category lang="EN">kids</category>
+		<category lang="EN">serie</category>
+		<icon src="http://ontv.dk//imgs/print_img.php?sti=/imgs/epg/channel/2012-07-17/1/11342497600.jpg&amp;height=300&amp;width=300"/>
+	</programme>
+	<programme channel="www.ontv.dk/tv/1" start="20120717120000 +0200" stop="20120717123000 +0200">
+		<title lang="dk">Black Business</title>
+		<desc lang="dk">Hvis du har den rigtige idé, mod og eventyrlyst, kan du gøre store forretninger og tjene mange penge i Afrika. For Afrika er økonomisk set blandt de hurtigste voksende regioner i verden. Det sker lige nu, og det gælder om at komme først. Esben Sørensen er en rødhåret dansker på 30 år, der er vokset op delvist i Afrika og delvist i Danmark. Han har et pladeselskab, hvor han indtil nu kun har udgivet en enkelt plade - med sig selv. Drømmen er at Caravan Records bliver det største pladeselskab i Østafrika, og det er absolut ikke urealistisk, for Østafrika er fyldt med musikalsk talent, markedet er gigantisk og afrikanernes købekraft stiger.
+Sendt første gang 25.01.11</desc>
+		<category lang="EN">documentary</category>
+		<category lang="EN">serie</category>
+		<episode-num system="xmltv_ns"> .1/4. </episode-num>
+	</programme>
+</tv>

data/spec/resources/programmes-with-credits.xmltv

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tv generator-info-name="www.ontv.dk/xmltv">
+	<channel id="www.ontv.dk/tv/1">
+		<display-name lang="dk">DR1 DK</display-name>
+		<icon src="http://ontv.dk/imgs/epg/logos/dr1_big.png"/>
+	</channel>
+	<channel id="www.ontv.dk/tv/2">
+		<display-name lang="dk">DR2 DK</display-name>
+		<icon src="http://ontv.dk/imgs/epg/logos/dr2_big.png"/>
+	</channel>
+	
+    <programme channel="www.ontv.dk/tv/1" start="20131118001000 +0100" stop="20131118005500 +0100">
+        <title lang="dk">Maria Wern: Alle de stille døde</title>
+        <sub-title lang="dk">Svensk krimi-miniserie fra 2010.</sub-title>
+        <desc lang="dk">En advokat med voldelige tendenser er meldt savnet. Samtidig er liget af en anden mand blevet fisket op af havet. Det viser sig, at begge mænd havde gjort tjeneste som FN-soldater på Cypern. Snart meldes et tredje medlem af samme kompagni savnet, og vicekriminalkommissær Maria Wern må finde ud af, om de tre mænd havde en fælles fjende.</desc><category lang="EN">serie</category>
+	    <episode-num system="xmltv_ns"> .1/2. </episode-num>
+     <credits>
+      	<actor role="Maria Wern">Eva Röse</actor>
+      	<actor role="Thomas Hartman">Allan Svensson</actor>
+      	<actor role="Ivan Sirén">Thomas W. Gabrielsson</actor>
+      	<director>Erik Leijonborg</director>
+     </credits>
+  </programme>
+</tv>

data/spec/resources/programmes-with-icons.xmltv

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tv generator-info-name="www.ontv.dk/xmltv">
+	<channel id="www.ontv.dk/tv/1">
+		<display-name lang="dk">DR1 DK</display-name>
+		<icon src="http://ontv.dk/imgs/epg/logos/dr1_big.png"/>
+	</channel>
+	<channel id="www.ontv.dk/tv/2">
+		<display-name lang="dk">DR2 DK</display-name>
+		<icon src="http://ontv.dk/imgs/epg/logos/dr2_big.png"/>
+	</channel>
+	
+    <programme channel="www.ontv.dk/tv/1" start="20131118001000 +0100" stop="20131118005500 +0100">
+        <title lang="dk">Maria Wern: Alle de stille døde</title>
+        <sub-title lang="dk">Svensk krimi-miniserie fra 2010.</sub-title>
+        <desc lang="dk">En advokat med voldelige tendenser er meldt savnet. Samtidig er liget af en anden mand blevet fisket op af havet. Det viser sig, at begge mænd havde gjort tjeneste som FN-soldater på Cypern. Snart meldes et tredje medlem af samme kompagni savnet, og vicekriminalkommissær Maria Wern må finde ud af, om de tre mænd havde en fælles fjende.</desc><category lang="EN">serie</category>
+	    <episode-num system="xmltv_ns"> .1/2. </episode-num>
+     <credits>
+      	<actor role="Maria Wern">Eva Röse</actor>
+      	<actor role="Thomas Hartman">Allan Svensson</actor>
+      	<actor role="Ivan Sirén">Thomas W. Gabrielsson</actor>
+      	<director>Erik Leijonborg</director>
+     </credits>
+     <icon src="http://static.timefor.tv/imgs/print_img.php?sti=imgs/epg/channel/2013-11-17/528381020f0c1.jpg&amp;height=300&amp;width=300" />
+  </programme>
+</tv>

data/spec/resources/programmes-with-presenters.xmltv

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tv generator-info-name="www.ontv.dk/xmltv">
+	<channel id="www.ontv.dk/tv/1">
+		<display-name lang="dk">DR1 DK</display-name>
+	</channel>
+	<channel id="www.ontv.dk/tv/2">
+		<display-name lang="dk">DR2 DK</display-name>
+	</channel>
+	
+    <programme channel="www.ontv.dk/tv/1" start="20131213015000 +0100" stop="20131213022000 +0100">
+        <title lang="dk">Natholdet</title>
+        <sub-title lang="dk">Show med Anders Breinholt</sub-title>
+        <desc lang="dk">Anders Breinholt, i godt selskab med komiker Magnus Millang, kaster sit falkeblik på de absurditeter og morsomheder, vores tilværelse er fuld af. Idéerne til programmet stammer fra seerne, der hver dag sender masser link og klip ind til Anders Breinholt og resten af redaktionen. Derfor tager programmet altid afsæt i den virkelighed, som seerne oplever rundt om i riget og på internettet.</desc><category lang="EN">entertainment</category><category lang="EN">serie</category>
+     <credits>
+      	<presenter>Anders Breinholt.</presenter>
+     </credits>
+     <icon src="http://static.timefor.tv/imgs/print_img.php?sti=imgs/epg/channel/2013-12-12/524d7aa4d161c.jpg&amp;height=300&amp;width=300" />
+  </programme>
+</tv>

data/spec/resources/{programs.xmltv → programmes.xmltv}

@@ -17,7 +17,6 @@ Her kommer Noddy - så kom ud og leg! Den lille dreng af træ har altid travlt m
 		<category lang="EN">kids</category>
 		<category lang="EN">serie</category>
 		<episode-num system="xmltv_ns"> .2/12. </episode-num>
-		<icon src="http://ontv.dk//imgs/print_img.php?sti=/imgs/epg/channel/2012-07-17/1/11342497600.jpg&amp;height=300&amp;width=300"/>
 	</programme>
 	<programme channel="www.ontv.dk/tv/1" start="20120717061000 +0200" stop="20120717062000 +0200">
 		<title lang="dk">Sprutte-Patruljen</title>
@@ -44,7 +43,6 @@ Her kommer Noddy - så kom ud og leg! Den lille dreng af træ har altid travlt m
 Slå griseører og øjne ud, for modige Olivia er klar til at tage verden med storm! Den skæve, skøre og sjove gris Olivia er god til alt muligt, bl.a. at gøre folk rigtig trætte. Olivia kan nemlig som ingen anden prøve tøj fra skabet eller male billeder på væggen. Olivia har også startet sit eget band og sågar optrådt i cirkus.</desc>
 		<category lang="EN">kids</category>
 		<category lang="EN">serie</category>
-		<icon src="http://ontv.dk//imgs/print_img.php?sti=/imgs/epg/channel/2012-07-17/1/11342500600.jpg&amp;height=300&amp;width=300"/>
 	</programme>
 	
 	<programme channel="www.ontv.dk/tv/2" start="20120717080500 +0200" stop="20120717120000 +0200">
@@ -85,7 +83,6 @@ Sendt første gang 16.08.06</desc>
 		<desc lang="dk">Den tidligere jægersoldat Marco Tancredis hustru, Lidia, er blevet skudt. Marco er sikker på, at det var overlagt mord, og han er parat til at gøre hvad som helst for at finde ud af, hvem der står bag. Snart gør han en forbløffende opdagelse - nemlig at Lidia arbejdede for den italienske efterretningstjeneste. Men hvad arbejdede hun på? Og hvorfor skulle hun slås ihjel?</desc>
 		<category lang="EN">serie</category>
 		<episode-num system="xmltv_ns"> .1/12. </episode-num>
-		<icon src="http://ontv.dk//imgs/print_img.php?sti=/imgs/epg/channel/2012-07-17/2/21342524600.jpg&amp;height=300&amp;width=300"/>
 	</programme>
 	<programme channel="www.ontv.dk/tv/2" start="20120717142500 +0200" stop="20120717152000 +0200">
 		<title lang="dk">Intelligence - i hemmelig tjeneste</title>
@@ -93,6 +90,5 @@ Sendt første gang 16.08.06</desc>
 		<desc lang="dk">Den tidligere jægersoldat Marco Tancredis hustru er blevet myrdet. Marco har opdaget, at hun arbejdede for den italienske efterretningstjeneste, og nu har han selv ladet sig ansætte som efterretningsagent for at finde frem til sandheden om hendes død. Marcos jagt på svar bringer ham til Rumænien - og ansigt til ansigt med en kvinde, der er ude på sit eget private hævntogt.</desc>
 		<category lang="EN">serie</category>
 		<episode-num system="xmltv_ns"> .2/12. </episode-num>
-		<icon src="http://ontv.dk//imgs/print_img.php?sti=/imgs/epg/channel/2012-07-17/2/21342527900.jpg&amp;height=300&amp;width=300"/>
 	</programme>
 </tv>

data/spec/simple_pvr/ffmpeg_spec.rb

@@ -1,26 +1,28 @@
 require 'simple_pvr'
 
-describe SimplePvr::Ffmpeg do
-  it 'spawns an ffmpeg process for creating thumbnails' do
-    Process.should_receive(:spawn)
-    Process.should_receive(:detach)
-
-    SimplePvr::Ffmpeg.create_thumbnail_for('path/to/show')
-  end
-
-  it 'spawns an ffmpeg process for transcoding to WebM' do
-    File.should_receive(:exists?).with('path/to/show/stream.webm').and_return(false)
-    Process.should_receive(:spawn)
-    Process.should_receive(:detach)
-
-    SimplePvr::Ffmpeg.transcode_to_webm('path/to/show')
-  end
-
-  it 'does not start ffmpeg for transcoding to WebM if WebM file already exists' do
-    File.should_receive(:exists?).with('path/to/show/stream.webm').and_return(true)
-    Process.should_not_receive(:spawn)
-    Process.should_not_receive(:detach)
-
-    SimplePvr::Ffmpeg.transcode_to_webm('path/to/show')
+module SimplePvr
+  describe Ffmpeg do
+    it 'spawns an ffmpeg process for creating thumbnails' do
+      Process.should_receive(:spawn)
+      Process.should_receive(:detach)
+  
+      Ffmpeg.create_thumbnail_for('path/to/show')
+    end
+  
+    it 'spawns an ffmpeg process for transcoding to WebM' do
+      File.should_receive(:exists?).with('path/to/show/stream.webm').and_return(false)
+      Process.should_receive(:spawn)
+      Process.should_receive(:detach)
+  
+      Ffmpeg.transcode_to_webm('path/to/show')
+    end
+  
+    it 'does not start ffmpeg for transcoding to WebM if WebM file already exists' do
+      File.should_receive(:exists?).with('path/to/show/stream.webm').and_return(true)
+      Process.should_not_receive(:spawn)
+      Process.should_not_receive(:detach)
+  
+      Ffmpeg.transcode_to_webm('path/to/show')
+    end
   end
 end

data/spec/simple_pvr/hdhomerun_spec.rb

@@ -1,82 +1,84 @@
 require 'simple_pvr'
 
-describe SimplePvr::HDHomeRun do
-  before do
-    @pipe = double('pipe')
-    IO.should_receive(:popen).with('hdhomerun_config discover').and_yield(@pipe)
-    FileUtils.stub(:exists? => false)
-  end
-
-  context 'when initializing' do
-    it 'discovers a device when present' do
-      @pipe.stub(:read => 'hdhomerun device ABCDEF01 found at 10.0.0.4')
-
-      SimplePvr::HDHomeRun.new.device_id.should == 'ABCDEF01'
+module SimplePvr
+  describe HDHomeRun do
+    before do
+      @pipe = double('pipe')
+      IO.should_receive(:popen).with('hdhomerun_config discover').and_yield(@pipe)
+      FileUtils.stub(:exists? => false)
     end
   
-    it 'raises an exception when no device is present' do
-      @pipe.stub(:read => 'no devices found')
-
-      expect { SimplePvr::HDHomeRun.new }.to raise_error(Exception, 'No device found: no devices found')
-    end
-  end
+    context 'when initializing' do
+      it 'discovers a device when present' do
+        @pipe.stub(:read => 'hdhomerun device ABCDEF01 found at 10.0.0.4')
   
-  context 'when initialized' do
-    before do
-      @pipe.stub(:read => 'hdhomerun device ABCDEF01 found at 10.0.0.4')
-      @hdhomerun = SimplePvr::HDHomeRun.new
-      @hdhomerun.stub(:tuner_control_file).with(0).and_return('tuner0.lock')
-      @hdhomerun.stub(:tuner_control_file).with(1).and_return('tuner1.lock')
-      @file = File.open(File.dirname(__FILE__) + '/../resources/channels.txt', 'r:UTF-8')
-    end
+        HDHomeRun.new.device_id.should == 'ABCDEF01'
+      end
     
-    after do
-      @file.close
-    end
+      it 'raises an exception when no device is present' do
+        @pipe.stub(:read => 'no devices found')
   
-    it 'can do a channel scan' do
-      @hdhomerun.should_receive(:system).with('hdhomerun_config ABCDEF01 scan /tuner0 channels.txt')
-      SimplePvr::Model::Channel.should_receive(:clear)
-      File.should_receive(:open).with('channels.txt', 'r:UTF-8').and_yield(@file)
-      SimplePvr::Model::Channel.should_receive(:add).with('DR K', 282000000, 1098)
-      SimplePvr::Model::Channel.should_receive(:add).with('DR HD', 282000000, 1165)
-
-      @hdhomerun.scan_for_channels
+        expect { HDHomeRun.new }.to raise_error(Exception, 'No device found: no devices found')
+      end
     end
     
-    it 'can start recording on one tuner' do
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/channel auto:282000000")
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/program 1098")
-      @hdhomerun.should_receive(:spawn) #... with a lot of arguments ...
-      FileUtils.should_receive(:touch).with('tuner0.lock')
+    context 'when initialized' do
+      before do
+        @pipe.stub(:read => 'hdhomerun device ABCDEF01 found at 10.0.0.4')
+        @hdhomerun = HDHomeRun.new
+        @hdhomerun.stub(:tuner_control_file).with(0).and_return('tuner0.lock')
+        @hdhomerun.stub(:tuner_control_file).with(1).and_return('tuner1.lock')
+        @file = File.open(File.dirname(__FILE__) + '/../resources/channels.txt', 'r:UTF-8')
+      end
       
-      @hdhomerun.start_recording(0, 282000000, 1098, 'test directory')
-    end
+      after do
+        @file.close
+      end
     
-    it 'can stop recording on one tuner' do
-      @hdhomerun.stub(:system)
-      @hdhomerun.stub(:spawn => 32)
+      it 'can do a channel scan' do
+        @hdhomerun.should_receive(:system).with('hdhomerun_config ABCDEF01 scan /tuner0 channels.txt')
+        Model::Channel.should_receive(:clear)
+        File.should_receive(:open).with('channels.txt', 'r:UTF-8').and_yield(@file)
+        Model::Channel.should_receive(:add).with('DR K', 282000000, 1098)
+        Model::Channel.should_receive(:add).with('DR HD', 282000000, 1165)
+  
+        @hdhomerun.scan_for_channels
+      end
       
-      FileUtils.should_receive(:touch).with('tuner0.lock')
-      FileUtils.should_receive(:rm).with('tuner0.lock')
-      Process.should_receive(:wait).with(32)
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/channel none")
-
-      @hdhomerun.start_recording(0, 282000000, 1098, 'test directory')
-      @hdhomerun.stop_recording(0)
-    end
-    
-    it 'can start and stop recording on another tuner' do
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/channel auto:282000000")
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/program 1098")
-      @hdhomerun.stub(:spawn => 32)
-      FileUtils.should_receive(:touch).with('tuner1.lock')
-      FileUtils.should_receive(:rm).with('tuner1.lock')
-      Process.should_receive(:wait).with(32)
-      @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/channel none")
-
-      @hdhomerun.start_recording(1, 282000000, 1098, 'test directory')
-      @hdhomerun.stop_recording(1)
+      it 'can start recording on one tuner' do
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/channel auto:282000000")
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/program 1098")
+        @hdhomerun.should_receive(:spawn) #... with a lot of arguments ...
+        FileUtils.should_receive(:touch).with('tuner0.lock')
+        
+        @hdhomerun.start_recording(0, 282000000, 1098, 'test directory')
+      end
+      
+      it 'can stop recording on one tuner' do
+        @hdhomerun.stub(:system)
+        @hdhomerun.stub(:spawn => 32)
+        
+        FileUtils.should_receive(:touch).with('tuner0.lock')
+        FileUtils.should_receive(:rm).with('tuner0.lock')
+        Process.should_receive(:wait).with(32)
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner0/channel none")
+  
+        @hdhomerun.start_recording(0, 282000000, 1098, 'test directory')
+        @hdhomerun.stop_recording(0)
+      end
+      
+      it 'can start and stop recording on another tuner' do
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/channel auto:282000000")
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/program 1098")
+        @hdhomerun.stub(:spawn => 32)
+        FileUtils.should_receive(:touch).with('tuner1.lock')
+        FileUtils.should_receive(:rm).with('tuner1.lock')
+        Process.should_receive(:wait).with(32)
+        @hdhomerun.should_receive(:system).with("hdhomerun_config ABCDEF01 set /tuner1/channel none")
+  
+        @hdhomerun.start_recording(1, 282000000, 1098, 'test directory')
+        @hdhomerun.stop_recording(1)
+      end
     end
   end
 end