simple_pvr 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 84772c897136fb2024af2906037ff0d6792af853
+  data.tar.gz: 4f10984bc033e0fdb86228cd7f61481087927129
+SHA512:
+  metadata.gz: ebc54083f8e67bac789cf45b67037ad8fef92f23b86036a936b037803f0155c5fce2bc10d13b1525572eba4988f3aae71cd7827f00b2b659a55b5e88b465a964
+  data.tar.gz: 19bf485868ef7a76cf4d26c9fbc46240fb458a0445e886e732c83f58568a0cda2d3bd3ff3f84256d8f8ec762ba0f494a16a6bf0c514166d00312f8fae5ea3b80

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 /channels.txt
+/server.*
 channel_mappings.yaml
 *.sqlite
 tvgrabbed.xmltv

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0

data/.travis.yml

@@ -1,6 +1,3 @@
 language: ruby
 rvm:
- - 1.9.3
-before_install:
- - "export DISPLAY=:99.0"
- - "sh -e /etc/init.d/xvfb start"
+ - 2.0.0

data/Gemfile.lock

@@ -1,37 +1,39 @@
 PATH
   remote: .
   specs:
-    simple_pvr (1.0.0)
+    simple_pvr (1.1.0)
       activesupport (~> 3.2)
       data_mapper (~> 1.2)
       dm-sqlite-adapter (~> 1.2)
       nokogiri (~> 1.5)
-      puma (~> 1.6)
+      puma (~> 2.7)
       sinatra (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.16)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    addressable (2.2.8)
-    bcrypt-ruby (3.0.1)
-    builder (3.1.0)
-    capybara (2.0.3)
+    addressable (2.3.5)
+    bcrypt-ruby (3.1.2)
+    builder (3.2.2)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
+      xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
-    cucumber (1.2.1)
+    cliver (0.3.2)
+    coderay (1.1.0)
+    cucumber (1.3.10)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.11.0)
-      json (>= 1.4.6)
+      gherkin (~> 2.12)
+      multi_json (>= 1.7.5, < 2.0)
+      multi_test (>= 0.0.2)
     data_mapper (1.2.0)
       dm-aggregates (~> 1.2.0)
       dm-constraints (~> 1.2.0)
@@ -42,15 +44,15 @@ GEM
       dm-transactions (~> 1.2.0)
       dm-types (~> 1.2.0)
       dm-validations (~> 1.2.0)
-    data_objects (0.10.12)
+    data_objects (0.10.13)
       addressable (~> 2.1)
-    diff-lcs (1.1.3)
+    diff-lcs (1.2.5)
     dm-aggregates (1.2.0)
       dm-core (~> 1.2.0)
     dm-constraints (1.2.0)
       dm-core (~> 1.2.0)
-    dm-core (1.2.0)
-      addressable (~> 2.2.6)
+    dm-core (1.2.1)
+      addressable (~> 2.3)
     dm-do-adapter (1.2.0)
       data_objects (~> 0.10.6)
       dm-core (~> 1.2.0)
@@ -79,66 +81,75 @@ GEM
       uuidtools (~> 2.1)
     dm-validations (1.2.0)
       dm-core (~> 1.2.0)
-    do_sqlite3 (0.10.12)
-      data_objects (= 0.10.12)
-    eventmachine (1.0.3)
+    do_sqlite3 (0.10.13)
+      data_objects (= 0.10.13)
     fastercsv (1.5.5)
-    faye-websocket (0.4.7)
-      eventmachine (>= 0.12.0)
-    ffi (1.6.0)
-    gherkin (2.11.2)
-      json (>= 1.4.6)
-    http_parser.rb (0.5.3)
-    i18n (0.6.4)
-    json (1.7.5)
-    json_pure (1.7.7)
-    mime-types (1.21)
-    multi_json (1.3.6)
-    nokogiri (1.5.5)
-    poltergeist (1.1.0)
-      capybara (~> 2.0, >= 2.0.1)
-      faye-websocket (~> 0.4, >= 0.4.4)
-      http_parser.rb (~> 0.5.3)
-    puma (1.6.3)
-      rack (~> 1.2)
-    rack (1.4.1)
-    rack-protection (1.5.0)
+    ffi (1.9.3)
+    gherkin (2.12.2)
+      multi_json (~> 1.3)
+    i18n (0.6.9)
+    json (1.8.1)
+    json_pure (1.8.1)
+    method_source (0.8.2)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.2)
+    multi_test (0.0.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    poltergeist (1.5.0)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    puma (2.7.1)
+      rack (>= 1.1, < 2.0)
+    rack (1.5.2)
+    rack-protection (1.5.1)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.3)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.2)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.31.0)
+    rake (10.1.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.38.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    sinatra (1.3.6)
+    sinatra (1.4.4)
       rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    slop (3.4.7)
     stringex (1.5.1)
-    tilt (1.3.5)
-    uuidtools (2.1.3)
+    tilt (1.4.1)
+    uuidtools (2.1.4)
     websocket (1.0.7)
-    xpath (1.0.0)
+    websocket-driver (0.3.1)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.0)
-  cucumber (~> 1.2)
-  poltergeist (~> 1.1)
+  capybara (~> 2.2)
+  cucumber (~> 1.3)
+  poltergeist (~> 1.5)
+  pry
   rake (>= 10.0.0)
   rspec (~> 2.11)
+  selenium-webdriver
   simple_pvr!

data/README.md

@@ -2,19 +2,22 @@ SimplePVR-Ruby-backend
 ======================
 A really, really simple PVR (Personal Video Recorder) system which only supports the
 [HDHomeRun network tuners](http://www.silicondust.com/). It's written in Ruby and is highly hackable. If
-you don't want to hack it, but just want a solid PVR system, no worries: It's dead-simple to use.
+you don't want to hack it, but just want a solid PVR, no worries: It's dead-simple to use.
 
-SimplePVR does not contain its own player, but currently provides an XBMC plug-in and some half-hearted
-browser playback. Apart from that, all recordings are stored in a simple directory structure (see below
-for an explanation), so that you can just point your favorite player to the recordings.
+SimplePVR does not contain its own player, but currently provides an XBMC plug-in. Apart from that, all
+recordings are stored in a simple directory structure (see below for an explanation), so that you can just
+point your favorite player to the recordings.
+
+Wanna see what it looks like? [Take a look at the Wiki.](https://github.com/olefriis/simplepvr-backend-ruby/wiki)
 
 Why?
 ====
-MythTV stopped working for me and my HDHomeRun box in the 0.25 release. And even though MythTV has loads
-of merits, I just have no idea what to do when it stops working - I am not in control of my media center.
+MythTV stopped working for me and my HDHomeRun box in the 0.25 release. Even though MythTV has loads
+of merits, I just have no idea what to do when it stops working. I was not in control of my media center.
 
 During the last couple of years, I have spent a substantial amount of time on bugs that suddenly appeared
-in MythTV and suddenly went away. I really don't like using systems this brittle.
+in MythTV and suddenly went away. I really don't like using systems this brittle. My wife got frustrated
+too, which is unfortunate as well...
 
 So I wanted to create a really simple PVR in Ruby, making it possible for others to hack away and have
 fun while recording TV shows for the rest of the family.
@@ -30,13 +33,13 @@ Installation
 First of all, you need a computer and an HDHomeRun tuner box. On your computer, you need to have the
 "hdhomerun_config" tool on the path.
 
-You need Ruby 1.9.2 or newer (1.9.0 or newer is probably enough).
+You need Ruby 2.0.0 or newer. When that's in place, simply run this from the command line:
 
         gem install simple_pvr
 
 It might not always be completely straightforward... simple_pvr uses DataMapper, which in turn relies on
 bcrypt-ruby, which compiles some native stuff. So on MacOS, you need to install XCode and its command-line
-utilities, or get "make" in some other way. On Linux, it should just work. Don't know about Windows.
+utilities, or get "make" in some other way. On Linux, it should just work. There's no Windows support.
 
 If you'd like thumbnails for the recorded shows and ability to transcode recordings to WebM (so you can view
 them directly in your browser), you need FFMPEG on the command-line. Install it using MacPorts, Homebrew,
@@ -53,7 +56,16 @@ URL to the outside world, you'd better supply a username and password:
 
         username=me password=secret pvr_server
 
-This will secure the application with Basic HTTP Authentication.
+This will secure the application with Basic HTTP Authentication. However, everything is sent in clear text. If
+you're worried about your PVR data, you should create an SSL certificate (see
+[https://devcenter.heroku.com/articles/ssl-certificate-self](this description), for example) and supply the key
+and certificate paths when starting the server:
+
+        username=me password=secret key=server.key cert=server.crt pvr_server
+
+You can also supply the `port` variable, in case you want to expose the server on another port than 4567:
+
+        username=me password=secret key=server.key cert=server.crt port=8443 pvr_server
 
 XMLTV
 =====
@@ -76,21 +88,26 @@ Or, if you've secured your web server with Basic HTTP Authentication like I told
 
         curl -d "" -u me:secret localhost:4567/api/schedules/reload
 
+If you've been really good and enabled HTTPS, you should specify that (here we're also running on port 8443, and
+we've disabled curl's SSL validation, since we're running with a self-signed certificate...):
+
+        curl -d "" -u me:secret --insecure https://localhost:8443/api/schedules/reload
+
 Recordings
 ==========
 The recordings are laid out like this, from the directory where you ran pvr_server:
 
 * recordings/
   * Borgias/
-     * 1/
-     * 2/
+     * 1331214600/
+     * 1333893000/
   * Sports news/
-     * 1/
-     * 2/
-     * 3/
+     * 1331387400/
+     * 1331473800/
+     * 1331560200/
   * ...
 
-Inside the numbered directories are these files:
+The numbers on the directories are simply time stamps. Inside these numbered directories are these files:
 
 * stream.ts: The actual stream. Let VLC or another media player show these for you.
 * hdhomerun_save.log: The output from the actual recording command.
@@ -100,18 +117,16 @@ Inside the numbered directories are these files:
 
 XBMC Plug-In
 ============
-There's a very simple XBMC plug-in for SimplePVR. See [the home page](https://github.com/olefriis/simplepvr)
-for more information.
+There's a simple XBMC plug-in for SimplePVR which enables you to easily watch your recordings, see
+metadata, and delete watched recordings. See
+[the home page](https://github.com/olefriis/simplepvr-frontend-xbmc) for more information.
 
 Future?
 =======
 This projects needs to be a nice, readable, hackable, tested system. No pull requests are
 accepted that violate this.
 
-For version 1 of SimplePVR, there are no more features planned. I'll see if the current incarnation seems
-stable in the long run on my own setup, and if so, I'll mark it as 1.0.0.
-
-There is lots of stuff I'd like to do after that, but I have no deadline - which means that pull
+There is lots of stuff I'd like to do, but I have no deadline - which means that pull
 requests are the only means you have for speeding things up. This includes:
 
 * Web interface:
@@ -128,7 +143,6 @@ requests are the only means you have for speeding things up. This includes:
 * XMLTV import:
   * Let SimplePVR itself fetch XMLTV URLs at specified times of day.
   * Set-up of matching XMLTV IDs to channels could make good use of a GUI.
-  * Parse and make use of programme icons etc.
 * Searching for tuners and scanning for channels would be nice through the web GUI.
 * Saving with the hdhomerun_config command is done through a shell script, so we can shut it down properly. I'd
   like a simpler solution, but haven't found anything that works both on OS X and Linux.
@@ -138,18 +152,22 @@ Some features would be cool to have, but I don't have a personal need for them,
 happen if *you* implement them and send me a pull request. Besides, some of them I have no clue how
 to implement...
 
-* Some kind of live TV.
-* Create metadata for XBMC and Serviio.
-* Duplication detection.
+* A logo!
+* Some kind of live TV through an XBMC PVR plug-in.
+* Plug-ins for other media systems than XBMC.
 * Commercial detection.
+* Intelligent planning of recordings, taking into account re-runs etc.
 * Record multiple programmes on same multiplex, so we are not restricted to only recording two
   programmes at once.
+* More complete XMLTV parser.
+* Windows support.
+* Support for other tuners than HDHomeRun.
 
 Development
 ===========
 You need the following installed:
 
-* Ruby 1.9.3 or newer.
+* Ruby 2.0 or newer.
 * [Bundler](http://gembundler.com/).
 * [Karma](http://karma-runner.github.com/0.8/index.html).
 * [PhantomJS](http://phantomjs.org/) - and the phantomjs executable must be on your path.
@@ -172,13 +190,12 @@ If you want to keep Karma running and let it execute whenever a file changes, ru
 
         karma start test/karma.conf.js
 
-The specs currently use Selenium to drive Firefox, but you can choose to use PhantomJS instead:
-
-        capybara_driver=poltergeist rake test:features
+The specs currently use Poltergeist to drive PhantomJS, but you can let Selenium drive Firefox instead:
 
-This currently doesn't work for all specs, though. (Again, if you can fix it, please send a pull request!)
+        capybara_driver=selenium rake test:features
 
-To create the gem, make sure that lib/simple_pvr/version.rb is up-to-date, commit everything and run:
+To create the gem, make sure that lib/simple_pvr/version.rb and changelog.txt are up-to-date, commit
+everything and run:
 
         rake build
 
@@ -189,4 +206,5 @@ the automatic tests, right?), and execute
 
 ...which will release the gem to rubygems.org.
 
-I'm trying to make Travis CI like SimplePVR, but it's not easy: [![Build Status](https://travis-ci.org/olefriis/simplepvr-backend-ruby.png)](https://travis-ci.org/olefriis/simplepvr-backend-ruby)
+I'm trying to make Travis CI like SimplePVR, but it's not easy... tests run fine on my own and several
+other machines, but fail on Travis: [![Build Status](https://travis-ci.org/olefriis/simplepvr-backend-ruby.png)](https://travis-ci.org/olefriis/simplepvr-backend-ruby)

data/bin/pvr_server

@@ -1,10 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'rack'
+require 'puma/cli'
 require 'simple_pvr'
 
-Rack::Server.start(
-  :config => SimplePvr::PvrInitializer.rackup_file_path,
-  :Port => 4567,
-  :server => 'puma'
-)
+port = ENV['port'] || 4567
+key = ENV['key']
+cert = ENV['cert']
+use_ssl = key && cert
+
+if use_ssl
+  bind_url = "ssl://0.0.0.0:#{port}?key=#{key}&cert=#{cert}"
+else
+  puts 'Consider setting up SSL by specifying key and cert. Please consult the documentation.'
+  bind_url = "tcp://0.0.0.0:#{port}"
+end
+
+Puma::CLI.new([SimplePvr::PvrInitializer.rackup_file_path, '--bind', bind_url]).run

data/changelog.txt

@@ -0,0 +1,11 @@
+1.1.0
+- Proper log-in dialog, instead of the browser's own HTTP Basic Authentication dialog.
+- Updated to Twitter Bootstrap 3 (and newer versions of other JS libraries).
+- Using CDNs for most of the JavaScript, reducing the size of the gem.
+- Possibility to run server in HTTPS.
+- More extensive use of XMLTV data: categories, actors, directors, images, etc.
+- Recording subdirectories now use timestamps as names instead of a sequence, since XBMC
+  would get a little bit confused with new recordings in old directories.
+
+1.0.0
+- Initial release. Everything is working nicely.

data/development_server

@@ -1,10 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'rack'
+require 'puma/cli'
 require File.dirname(__FILE__) + '/lib/simple_pvr'
 
-Rack::Server.start(
-  :config => SimplePvr::PvrInitializer.rackup_file_path,
-  :Port => 4567,
-  :server => 'puma'
-)
+port = ENV['port'] || 4567
+key = ENV['key']
+cert = ENV['cert']
+use_ssl = key && cert
+
+if use_ssl
+  bind_url = "ssl://0.0.0.0:#{port}?key=#{key}&cert=#{cert}"
+else
+  puts 'Consider setting up SSL by specifying key and cert. Please consult the documentation.'
+  bind_url = "tcp://0.0.0.0:#{port}"
+end
+
+Puma::CLI.new([SimplePvr::PvrInitializer.rackup_file_path, '--bind', bind_url]).run