airplay 1.0.2 → 1.0.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 75a8e290e50f4041dbc8e11f04e7d251089eb5fc
+  data.tar.gz: 373a3cac124b0d0ae1c6ef84c3be92efbdb571aa
+SHA512:
+  metadata.gz: 97485baf2965f80a3bc5c72680306312d9caecc756f7f2512c6901c0cf31fe8740714ce362dbb8807c4d384641f8931a2fbc68552bb3bb5f21a8b26d764f2ffe
+  data.tar.gz: f62352ac1f675c802b68e8a2d647b32dd17c2d2a7c667092f37db34129096ab0420bfb2a1535c9daaab5f78efd2b26c50c0b1bd6eae552982c0bb164e1e5c977

data/.gitignore

@@ -1 +1,2 @@
 pkg
+.env

data/.travis.yml

@@ -1,8 +1,12 @@
 language: ruby
 rvm:
-  - "1.9.3"
-  - "2.0.0"
+- 1.9.3
+- 2.0.0
+- 2.1.0
 before_install:
-  - "sudo apt-get -qq update"
-  - "sudo apt-get -qq install rdnssd libavahi-compat-libdnssd-dev"
-script: bundle exec rake spec
+- sudo apt-get -qq update
+- sudo apt-get -qq install rdnssd libavahi-compat-libdnssd-dev
+script: bundle exec rake
+env:
+  global:
+    secure: PDEIoCg7nim32QGeJKvWcpcTEB0jOSfrH+v5ebrO4ioqznUfoaf1qypWNHrXYY4hINA+L5Tm6HXAPah2OhFkBxZzIlKgWlH1MIx5y6Q7PyBN6MTZMw1GN7sTm+zy9z79ytjdtepI4rlKVSxhAwl3Uid7mNliZx6T8eOP634Rg9s=

data/Gemfile

@@ -1,9 +1,6 @@
 source "http://rubygems.org"
 
 gemspec name: 'airplay'
+gemspec name: 'airplay-cli'
 
 gem "rake"
-
-group :development do
-  gem "debugger"
-end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    airplay (1.0.2)
+    airplay (1.0.3)
       CFPropertyList (~> 2.2.0)
       celluloid (>= 0.15.0)
       cuba (~> 3.1.0)
@@ -12,32 +12,30 @@ PATH
       net-http-digest_auth (~> 1.2.1)
       net-ptth (= 0.0.17)
       reel-rack (~> 0.1.0)
+    airplay-cli (1.0.2)
+      airplay (= 1.0.3)
+      clap (~> 1.0.0)
+      ruby-progressbar (~> 1.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    CFPropertyList (2.2.3)
+    CFPropertyList (2.2.6)
     celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    columnize (0.3.6)
-    cuba (3.1.0)
+    clap (1.0.0)
+    cuba (3.1.1)
       rack
-    debugger (1.6.2)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.2.3)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.2.3)
     dnssd (2.0)
     fakeweb (1.3.0)
     given_core (3.0.0)
       sorcerer (>= 0.3.7)
     http (0.5.0)
       http_parser.rb
-    http_parser.rb (0.6.0.beta.2)
+    http_parser.rb (0.6.0)
     log4r (1.1.10)
     micromachine (1.0.4)
     mime-types (2.0)
@@ -50,7 +48,7 @@ GEM
       celluloid-io (>= 0.15.0)
       http_parser.rb (>= 0.6.0.beta.2)
       rack (>= 1.4.5)
-    nio4r (0.5.0)
+    nio4r (1.0.0)
     rack (1.5.2)
     rake (10.1.0)
     reel (0.4.0)
@@ -62,10 +60,11 @@ GEM
     reel-rack (0.1.0)
       rack (>= 1.4.0)
       reel (>= 0.4.0)
+    ruby-progressbar (1.2.0)
     sorcerer (1.0.2)
     timers (1.1.0)
     vcr (2.4.0)
-    websocket_parser (0.1.4)
+    websocket_parser (0.1.5)
       http
 
 PLATFORMS
@@ -73,7 +72,7 @@ PLATFORMS
 
 DEPENDENCIES
   airplay!
-  debugger
+  airplay-cli!
   fakeweb (~> 1.3.0)
   minitest (~> 4.4.0)
   minitest-given (~> 3.0.0)

data/README.md

@@ -1,6 +1,7 @@
 # Airplay
 
 [![Code Climate](https://codeclimate.com/github/elcuervo/airplay.png)](https://codeclimate.com/github/elcuervo/airplay)
+[![Build Status](https://travis-ci.org/elcuervo/airplay.png?branch=master)](https://travis-ci.org/elcuervo/airplay)
 
 ![Airplay](doc/img/logo.png)
 
@@ -13,13 +14,24 @@ You can contribute with code, bugs or feature requests.
 
 The development of the gem takes time and there's a lot of research and hardware
 tests to make all of this. If you want to contribute please consider donating as
-much as you want in: https://gumroad.com/l/airplay
+much as you want in: [Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HE867B8J6ARQ4) or [Gumroad](https://gumroad.com/l/airplay)
 
 ## Help
 
 * irc feenode: #airplay
 * twitter: http://twitter.com/airplayrb
 
+# Table of Contents
+
+* [Contribute](#contribute)
+* [Installation](#installation)
+* [Usage](#usage)
+  * [CLI](#cli-1)
+  * [Library](#library-1)
+* [Testing](#testing)
+* [Documentation](#documentation)
+* [Contributors](#contributors)
+
 ## Installation
 
 ### Library
@@ -70,7 +82,7 @@ Airplay.configure do |config|
   config.log_level      # Log4r levels (Default: Log4r::ERROR)
   config.autodiscover   # Allows to search for nodes (Default: true)
   config.host           # In which host to bind the server (Default: 0.0.0.0)
-  config.port           # In which port to bind the server (Default: 1337)
+  config.port           # In which port to bind the server (Default: will find one)
   config.output         # Where to log (Default: Log4r::Outputter.stdout)
 end
 ```
@@ -85,12 +97,15 @@ Airplay.devices.each do |device|
 end
 ```
 
-#### Accesing and Grouping
+#### Accessing and Grouping
 
 ```ruby
 # You can access a known device easily
 device = Airplay["Apple TV"]
 
+# And add the password of the device if needed
+device.password = "my super secret password"
+
 # Or you can group known devices to have them do a given action together
 Airplay.group["Backyard"] << Airplay["Apple TV"]
 Airplay.group["Backyard"] << Airplay["Room TV"]
@@ -168,6 +183,8 @@ player.pause
 player.resume
 player.stop
 player.scrub
+player.info
+player.seek
 
 # Access the playback time per second
 player.progress -> progress {
@@ -175,6 +192,21 @@ player.progress -> progress {
 }
 ```
 
+# Testing
+
+Now there are two types of tests: Regular unit tests and integration tests.
+Thanks to the magic of the internet and a raspberry pi there are integration
+tests with a real Apple TV that is currently accessible.
+
+![Block TV](doc/img/block_tv.jpg)
+
+The Apple TV is password protected to avoid issues with the tests but is
+configured in Travis CI. For that reason you won't be able to run those tests if
+you don't have an Apple TV.
+
+Run unit tests with: `rake test:unit` and integration ones with: `rake test:integration`
+You can run all of them together with: `rake test:all`
+
 ## Documentation
 
 All the documentation of the README can be found in the `doc` folder.
@@ -184,5 +216,6 @@ To generate an updated README based on the contents of `doc` please use `rake do
 
 * [sodabrew](http://github.com/sodabrew)
 * [pote](http://github.com/pote)
-* [janogonzalez](http://github.com/janogonzalez) - Who allowed me to release 1.0
-  from startech conf <3
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/elcuervo/airplay/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/Rakefile

@@ -5,11 +5,6 @@ require "fileutils"
 require "airplay/version"
 require "airplay/cli/version"
 
-Rake::TestTask.new("spec") do |t|
-  t.libs << "test"
-  t.pattern = "test/**/*_test.rb"
-end
-
 class RuleBuilder
   attr_reader :task, :info
 
@@ -74,17 +69,33 @@ class RuleBuilder
   end
 end
 
+
+
 builder = RuleBuilder.new(task: method(:task))
 namespace :build,   &builder.construct(:build)
 namespace :install, &builder.construct(:install)
 namespace :release, &builder.construct(:release)
 
-task :default => [:test]
-task :test => [:spec]
+Rake::TestTask.new("test:all") do |t|
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
+end
+
+Rake::TestTask.new("test:unit") do |t|
+  t.libs << "test"
+  t.pattern = "test/unit/**/*_test.rb"
+end
+
+Rake::TestTask.new("test:integration") do |t|
+  t.libs << "test"
+  t.pattern = "test/integration**/*_test.rb"
+end
+
+task :default => "test:all"
 
 namespace :doc do
   task :generate do
-    structure = %w(header installation usage documentation contributors)
+    structure = %w(header toc installation usage testing documentation contributors bitdeli)
 
     File.open("README.md", "w+") do |f|
       structure.each { |part| f << File.read("doc/#{part}.md") + "\n" }

data/airplay-cli.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.homepage     = "http://github.com/elcuervo/airplay"
   s.files        = %w(bin/air lib/airplay/cli.rb)
 
-  s.add_dependency("airplay",           "=  1.0.2")
+  s.add_dependency("airplay",           "=  1.0.3")
   s.add_dependency("clap",              "~> 1.0.0")
   s.add_dependency("ruby-progressbar",  "~> 1.2.0")
 end

data/bin/air

@@ -7,24 +7,34 @@ require "airplay/cli/version"
 begin
   Clap.run ARGV,
     "--device"      => lambda { |device_name| @device = Airplay[device_name] },
+    "--url"         => lambda { |url| @url = url },
     "--wait"        => lambda { |sec| @wait = sec.to_i },
     "--interactive" => lambda { @interactive = true },
+    "--password"    => lambda { |password| @password = password },
 
     "help" => Airplay::CLI.method(:help),
 
     "list" => Airplay::CLI.method(:list),
 
+    "doctor" => Airplay::CLI.method(:doctor),
+
     "version" => Airplay::CLI.method(:version),
 
     "play" => lambda { |video|
-      options = { device: @device || Airplay.devices.first }
+      options = {
+        device: @device || Airplay.devices.first,
+        password: @password || false,
+        url: @url || false
+      }
       Airplay::CLI.play(video, options)
     },
 
     "view" => lambda { |file|
       options = {
-        device: @device || Airplay.devices.first,
+        device: @device || @url ? false : Airplay.devices.first,
         interactive: @interactive || false,
+        password: @password || false,
+        url: @url || false,
         wait: @wait || 3
       }
       Airplay::CLI.view(file, options)

data/doc/bitdeli.md

@@ -0,0 +1 @@
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/elcuervo/airplay/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/doc/header.md

@@ -1,6 +1,7 @@
 # Airplay
 
 [![Code Climate](https://codeclimate.com/github/elcuervo/airplay.png)](https://codeclimate.com/github/elcuervo/airplay)
+[![Build Status](https://travis-ci.org/elcuervo/airplay.png?branch=master)](https://travis-ci.org/elcuervo/airplay)
 
 ![Airplay](doc/img/logo.png)
 
@@ -13,7 +14,7 @@ You can contribute with code, bugs or feature requests.
 
 The development of the gem takes time and there's a lot of research and hardware
 tests to make all of this. If you want to contribute please consider donating as
-much as you want in: https://gumroad.com/l/airplay
+much as you want in: [Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HE867B8J6ARQ4) or [Gumroad](https://gumroad.com/l/airplay)
 
 ## Help
 

data/doc/installation.md

@@ -2,8 +2,8 @@
 
 ### Library
 
-`gem install airplay --pre`
+`gem install airplay`
 
 ## CLI
 
-`gem install airplay-cli --pre`
+`gem install airplay-cli`

data/doc/testing.md

@@ -0,0 +1,14 @@
+# Testing
+
+Now there are two types of tests: Regular unit tests and integration tests.
+Thanks to the magic of the internet and a raspberry pi there are integration
+tests with a real Apple TV that is currently accessible.
+
+![Block TV](doc/img/block_tv.jpg)
+
+The Apple TV is password protected to avoid issues with the tests but is
+configured in Travis CI. For that reason you won't be able to run those tests if
+you don't have an Apple TV.
+
+Run unit tests with: `rake test:unit` and integration ones with: `rake test:integration`
+You can run all of them together with: `rake test:all`

data/doc/toc.md

@@ -0,0 +1,10 @@
+# Table of Contents
+
+* [Contribute](#contribute)
+* [Installation](#installation)
+* [Usage](#usage)
+  * [CLI](#cli-1)
+  * [Library](#library-1)
+* [Testing](#testing)
+* [Documentation](#documentation)
+* [Contributors](#contributors)

data/doc/usage.md

@@ -38,7 +38,7 @@ Airplay.configure do |config|
   config.log_level      # Log4r levels (Default: Log4r::ERROR)
   config.autodiscover   # Allows to search for nodes (Default: true)
   config.host           # In which host to bind the server (Default: 0.0.0.0)
-  config.port           # In which port to bind the server (Default: 1337)
+  config.port           # In which port to bind the server (Default: will find one)
   config.output         # Where to log (Default: Log4r::Outputter.stdout)
 end
 ```
@@ -53,12 +53,15 @@ Airplay.devices.each do |device|
 end
 ```
 
-#### Accesing and Grouping
+#### Accessing and Grouping
 
 ```ruby
 # You can access a known device easily
 device = Airplay["Apple TV"]
 
+# And add the password of the device if needed
+device.password = "my super secret password"
+
 # Or you can group known devices to have them do a given action together
 Airplay.group["Backyard"] << Airplay["Apple TV"]
 Airplay.group["Backyard"] << Airplay["Room TV"]
@@ -136,6 +139,8 @@ player.pause
 player.resume
 player.stop
 player.scrub
+player.info
+player.seek
 
 # Access the playback time per second
 player.progress -> progress {

data/lib/airplay/browser.rb

@@ -52,7 +52,11 @@ module Airplay
       address = get_device_address(resolved)
       type = get_type(resolved.text_record)
 
-      add_device(node.name, address, type)
+      device = create_device(node.name, address, type)
+      device.text_records = resolved.text_record
+
+      devices << device
+
       resolved.flags.more_coming?
     end
 
@@ -95,15 +99,15 @@ module Airplay
       target
     end
 
-    # Private: Creates and adds a device to the pool
+    # Private: Creates a device
     #
     # name    - The device name
     # address - The device address
     #
     # Returns nothing
     #
-    def add_device(name, address, type)
-      devices << Device.new(
+    def create_device(name, address, type)
+      Device.new(
         name:     name.gsub(/\u00a0/, ' '),
         address:  address,
         type:     type

data/lib/airplay/cli.rb

@@ -1,6 +1,7 @@
 require "ruby-progressbar"
 require "airplay"
 require "airplay/cli/image_viewer"
+require "airplay/cli/doctor"
 
 # Public: Airplay core module
 #
@@ -28,12 +29,15 @@ module Airplay
           version - The current airplay-cli version.
           play    - Plays a local or remote video.
           view    - Shows an image or a folder of images, can be an url.
+          doctor  - Shows some debug information to trace bugs.
 
           Options:
 
           --device      - Name of the device where it should be played (Default: The first one)
           --wait        - The wait time for playing an slideshow (Default: 3)
           --interactive - Control the slideshow using left and right arrows.
+          --password    - Adds the device password
+          --url         - Allows you to specify an Apple TV url
 
         EOS
       end
@@ -47,6 +51,8 @@ module Airplay
           puts <<-EOS.gsub(/^\s{12}/,'')
             * #{device.name} (#{device.info.model} running #{device.info.os_version})
               ip: #{device.ip}
+              mac: #{device.id}
+              password?: #{device.password? ? "yes" : "no"}
               type: #{device.type}
               resolution: #{device.info.resolution}
 
@@ -64,6 +70,12 @@ module Airplay
       #
       def play(video, options)
         device = options[:device]
+        password = options[:password]
+        url = options[:url]
+
+        Airplay.devices.add("Apple TV", url) if url
+        device.password = password if password
+
         player = device.play(video)
         puts "Playing #{video}"
         bar = ProgressBar.create(
@@ -78,6 +90,20 @@ module Airplay
         player.wait
       end
 
+      def doctor
+        puts <<-EOS.gsub!(" "*10, "")
+
+          This will run some basic tests on your network trying to find errors
+          and debug information to help fix them.
+
+        EOS
+
+        who = Airplay::CLI::Doctor.new
+
+        puts "Running dns-sd tests:"
+        who.information
+      end
+
       # Public: Show an image given a device
       #
       # file_or_dir - The url, file path or folder path to the image/s
@@ -90,6 +116,15 @@ module Airplay
       #
       def view(file_or_dir, options)
         device = options[:device]
+        password = options[:password]
+        url = options[:url]
+
+        if url
+          Airplay.configure { |c| c.autodiscover = false }
+          device = Airplay.devices.add("Apple TV", url)
+        end
+        device.password = password if password
+
         viewer = ImageViewer.new(device, options)
 
         if File.directory?(file_or_dir)