airplay 1.0.0 → 1.0.1

data/Gemfile.lock

@@ -1,16 +1,17 @@
 PATH
   remote: .
   specs:
-    airplay (1.0.0)
+    airplay (1.0.1)
       CFPropertyList (~> 2.2.0)
       celluloid (~> 0.15.0)
       cuba (~> 3.1.0)
       dnssd (~> 2.0)
       log4r (~> 1.1.10)
       micromachine (~> 1.0.4)
+      mime-types (~> 2.0)
       net-http-digest_auth (~> 1.2.1)
-      net-ptth (= 0.0.13)
-      uuid (~> 2.3.6)
+      net-ptth (= 0.0.16)
+      reel-rack (~> 0.1.0)
 
 GEM
   remote: http://rubygems.org/
@@ -32,25 +33,40 @@ GEM
     debugger-ruby_core_source (1.2.3)
     dnssd (2.0)
     fakeweb (1.3.0)
-    http_parser.rb (0.5.3)
+    given_core (3.0.0)
+      sorcerer (>= 0.3.7)
+    http (0.5.0)
+      http_parser.rb
+    http_parser.rb (0.6.0.beta.2)
     log4r (1.1.10)
-    macaddr (1.6.1)
-      systemu (~> 2.5.0)
     micromachine (1.0.4)
+    mime-types (2.0)
     minitest (4.4.0)
+    minitest-given (3.0.0)
+      given_core (= 3.0.0)
+      minitest (> 4.3)
     net-http-digest_auth (1.2.1)
-    net-ptth (0.0.13)
+    net-ptth (0.0.16)
       celluloid-io (~> 0.15.0)
-      http_parser.rb (~> 0.5.3)
+      http_parser.rb (~> 0.6.0.beta.2)
       rack (~> 1.5.2)
     nio4r (0.5.0)
     rack (1.5.2)
     rake (10.1.0)
-    systemu (2.5.2)
+    reel (0.4.0)
+      celluloid (>= 0.15.1)
+      celluloid-io (>= 0.15.0)
+      http (>= 0.5.0)
+      http_parser.rb (>= 0.6.0.beta.2)
+      websocket_parser (>= 0.1.4)
+    reel-rack (0.1.0)
+      rack (>= 1.4.0)
+      reel (>= 0.4.0)
+    sorcerer (1.0.2)
     timers (1.1.0)
-    uuid (2.3.7)
-      macaddr (~> 1.0)
     vcr (2.4.0)
+    websocket_parser (0.1.4)
+      http
 
 PLATFORMS
   ruby
@@ -60,5 +76,6 @@ DEPENDENCIES
   debugger
   fakeweb (~> 1.3.0)
   minitest (~> 4.4.0)
+  minitest-given (~> 3.0.0)
   rake
   vcr (~> 2.4.0)

data/airplay-cli.gemspec

@@ -4,7 +4,7 @@ require "airplay/cli/version"
 Gem::Specification.new do |s|
   s.name         = "airplay-cli"
   s.version      = Airplay::CLI::VERSION
-  s.summary      = "Airplay client CLI"
+  s.summary      = "Airplay CLI"
   s.description  = "Send pics and videos using the terminal"
   s.executables  = "air"
   s.licenses     = ["MIT", "HUGWARE"]
@@ -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.0")
-  s.add_dependency("clap",                 "~> 1.0.0")
-  s.add_dependency("ruby-progressbar",     "~> 1.2.0")
+  s.add_dependency("airplay",           "=  1.0.1")
+  s.add_dependency("clap",              "~> 1.0.0")
+  s.add_dependency("ruby-progressbar",  "~> 1.2.0")
 end

data/airplay.gemspec

@@ -14,16 +14,18 @@ Gem::Specification.new do |s|
   s.test_files   = `git ls-files test`.split("\n")
 
   s.add_dependency("dnssd",                "~> 2.0")
-  s.add_dependency("uuid",                 "~> 2.3.6")
   s.add_dependency("CFPropertyList",       "~> 2.2.0")
+  s.add_dependency("mime-types",           "~> 2.0")
   s.add_dependency("log4r",                "~> 1.1.10")
   s.add_dependency("cuba",                 "~> 3.1.0")
   s.add_dependency("micromachine",         "~> 1.0.4")
   s.add_dependency("celluloid",            "~> 0.15.0")
-  s.add_dependency("net-ptth",             "=  0.0.13")
+  s.add_dependency("reel-rack",            "~> 0.1.0")
+  s.add_dependency("net-ptth",             "=  0.0.16")
   s.add_dependency("net-http-digest_auth", "~> 1.2.1")
 
-  s.add_development_dependency("minitest",  "~> 4.4.0")
-  s.add_development_dependency("fakeweb",   "~> 1.3.0")
-  s.add_development_dependency("vcr",       "~> 2.4.0")
+  s.add_development_dependency("minitest",        "~> 4.4.0")
+  s.add_development_dependency("minitest-given",  "~> 3.0.0")
+  s.add_development_dependency("fakeweb",         "~> 1.3.0")
+  s.add_development_dependency("vcr",             "~> 2.4.0")
 end

data/bin/air

@@ -10,9 +10,11 @@ begin
     "--wait"        => lambda { |sec| @wait = sec.to_i },
     "--interactive" => lambda { @interactive = true },
 
+    "help" => Airplay::CLI.method(:help),
+
     "list" => Airplay::CLI.method(:list),
 
-    "version" => lambda { puts Airplay::CLI::VERSION },
+    "version" => Airplay::CLI.method(:version),
 
     "play" => lambda { |video|
       options = { device: @device || Airplay.devices.first }
@@ -28,6 +30,8 @@ begin
       Airplay::CLI.view(file, options)
     }
 
+  Airplay::CLI.help if ARGV.empty?
+
 rescue Airplay::Browser::NoDevicesFound
   puts "No devices found."
 rescue Interrupt

data/lib/airplay/browser.rb

@@ -49,17 +49,65 @@ module Airplay
     # Returns if there are more nodes coming
     #
     def node_resolver(node, resolved)
-      info = Socket.getaddrinfo(resolved.target, nil, Socket::AF_INET)
-      ip = info[0][2]
+      address = get_device_address(resolved)
+      type = get_type(resolved.text_record)
 
-      airplay_device = Device.new(
-        name:     node.name.gsub(/\u00a0/, ' '),
-        address: "#{ip}:#{resolved.port}",
-      )
+      add_device(node.name, address, type)
+      resolved.flags.more_coming?
+    end
 
-      devices << airplay_device
+    # Private: Gets the device type
+    #
+    # records - The text records hash to be investigated
+    #
+    # Returns a symbol with the type
+    #
+    def get_type(records)
+      # rhd means Remote HD the first product of the Airserver people
+      if records.has_key?("rhd")
+        :airserver
+      else
+        :apple_tv
+      end
+    end
 
-      resolved.flags.more_coming?
+    # Private: Resolves the node complete address
+    #
+    # resolved - The DNS Resolved object
+    #
+    # Returns a string with the address (host:ip)
+    #
+    def get_device_address(resolved)
+      host = get_device_host(resolved.target)
+      "#{host}:#{resolved.port}"
+    end
+
+    # Private: Resolves the node ip or hostname
+    #
+    # resolved - The DNS Resolved object
+    #
+    # Returns a string with the ip or the hostname
+    #
+    def get_device_host(target)
+      info = Socket.getaddrinfo(target, nil, Socket::AF_INET)
+      info[0][2]
+    rescue SocketError
+      target
+    end
+
+    # Private: Creates and adds a device to the pool
+    #
+    # name    - The device name
+    # address - The device address
+    #
+    # Returns nothing
+    #
+    def add_device(name, address, type)
+      devices << Device.new(
+        name:     name.gsub(/\u00a0/, ' '),
+        address:  address,
+        type:     type
+      )
     end
 
     # Private: Resolves the node information given a node

data/lib/airplay/cli.rb

@@ -9,6 +9,35 @@ module Airplay
   #
   module CLI
     class << self
+      # Public: Shows CLI help
+      #
+      # Returns nothing.
+      #
+      def help
+        Airplay.configuration.load
+        puts <<-EOS.gsub!(" "*10, "")
+          Usage: air [OPTIONS] ACTION [URL OR PATH]
+
+          Command line for the apple tv.
+          Example: air play my_video.mov
+
+          Actions:
+
+          list    - Lists the available devices in the network.
+          help    - This help.
+          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.
+
+          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.
+
+        EOS
+      end
+
       # Public: Lists all the devices to STDOUT
       #
       # Returns nothing.
@@ -18,6 +47,7 @@ module Airplay
           puts <<-EOS.gsub(/^\s{12}/,'')
             * #{device.name} (#{device.info.model} running #{device.info.os_version})
               ip: #{device.ip}
+              type: #{device.type}
               resolution: #{device.info.resolution}
 
           EOS
@@ -76,6 +106,42 @@ module Airplay
         end
       end
 
+      # Public: Shows the current CLI version
+      #
+      # Returns nothing
+      #
+      def version
+        Airplay.configuration.load
+        v = Airplay::CLI::VERSION
+        puts <<-EOS
+
+                            i@@@@@@@@@@@@@@@@@@@@@@@@@
+                          i80000000000000000000000000000
+                        i80000000000000000000000000000000G
+                      i8000000000000000000000000000000000000
+                    i80000000000000000000000000000000000000000
+            @00000    @0000000000000000000000000000000000000@   000000@
+            @0000008    @000000000000000000000000000000000@   80000000@
+            @001          @00000000000000000000000000000@          100@
+            @001            @0000000000000000000000000@            100@
+            @001              80000000000000000000008              t00@
+            @001                8000000000000000008                t00@
+            @001                  800000000000008                  t00@
+            @001                    G000000000G                    t00@
+            @001                      G00000G                      t00@
+            @001                        L0L                        t00@
+            @001                                                   t00@
+            @001                        air                        t00@
+            @001                       #{v}                       t00@
+            @001                                                   t00@
+            @001                                                   t00@
+            @001                                                   100@
+            @00000000000000000000000000000000000000000000000000000G000@
+            @000000000000000000000000000000000000000000000000000000000@
+
+        EOS
+      end
+
     end
   end
 end

data/lib/airplay/cli/version.rb

@@ -1,5 +1,5 @@
 module Airplay
   module CLI
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/airplay/connection.rb

@@ -89,7 +89,8 @@ module Airplay
     def default_headers
       {
         "User-Agent"         => "MediaControl/1.0",
-        "X-Apple-Session-Id" => persistent.session
+        "X-Apple-Session-ID" => persistent.session,
+        "X-Apple-Device-ID"  => persistent.mac_address
       }
     end
 

data/lib/airplay/connection/persistent.rb

@@ -1,26 +1,25 @@
 require "net/ptth"
-require "uuid"
+require "securerandom"
 
 module Airplay
   # Public: The class that handles all the outgoing basic HTTP connections
   #
   class Connection
-    attr_reader :session
-
     # Public: Class that wraps a persistent connection to point to the airplay
     #         server and other configuration
     #
     class Persistent
+      attr_reader :session, :mac_address
+
       def initialize(address, options = {})
         @logger = Airplay::Logger.new("airplay::connection::persistent")
         @socket = Net::PTTH.new(address, options)
         @socket.set_debug_output = @logger
 
-        @socket.socket
-      end
+        @session = SecureRandom.uuid
+        @mac_address = "0x#{SecureRandom.hex(6)}"
 
-      def session
-        @_session ||= UUID.generate
+        @socket.socket
       end
 
       def close

data/lib/airplay/device.rb

@@ -1,3 +1,4 @@
+require "airplay"
 require "airplay/playable"
 require "airplay/viewable"
 require "airplay/device/features"
@@ -7,14 +8,19 @@ module Airplay
   # Public: Represents an Airplay Node
   #
   class Device
-    attr_reader :name, :address, :password
+    MissingAttributes = Class.new(KeyError)
+
+    attr_reader :name, :address, :type, :password
 
     include Playable
     include Viewable
 
     def initialize(attributes = {})
-      @name = attributes[:name]
-      @address = attributes[:address]
+      validate_attributes(attributes)
+
+      @name     = attributes[:name]
+      @address  = attributes[:address]
+      @type     = attributes[:type]
       @password = attributes[:password]
 
       Airplay.configuration.load
@@ -98,6 +104,18 @@ module Airplay
 
     private
 
+    # Private: Validates the mandatory attributes for a device
+    #
+    # attributes - The attributes hash to be validated
+    #
+    # Returns nothing or raises a MissingAttributes if some key is missing
+    #
+    def validate_attributes(attributes)
+      if !([:name, :address] - attributes.keys).empty?
+        raise MissingAttributes.new("A :name and an :address are mandatory")
+      end
+    end
+
     # Private: Access the basic info of the device
     #
     # Returns a hash with the basic information
@@ -121,6 +139,8 @@ module Airplay
         new_device.address = "#{ip}:7100"
 
         response = new_device.connection.get("/stream.xml").response
+        return {} if response.status != 200
+
         plist = CFPropertyList::List.new(data: response.body)
         CFPropertyList.native_types(plist.value)
       end

data/lib/airplay/device/info.rb

@@ -15,7 +15,9 @@ module Airplay
       end
 
       def resolution
-        @_resolution ||= "#{@device.server_info["width"]}x#{@device.server_info["height"]}"
+        @_resolution ||= begin
+          "#{@device.server_info["width"]}x#{@device.server_info["height"]}"
+        end
       end
     end
   end

data/lib/airplay/player/media.rb

@@ -1,22 +1,53 @@
+require "mime/types"
+
+require "airplay/server"
+
 module Airplay
   class Player
     class Media
-      attr_reader :url
+      attr_reader :file_or_url, :url
+
+      COMPATIBLE_TYPES = %w(
+        application/mp4
+        video/mp4
+        video/vnd.objectvideo
+        video/MP2T
+        video/quicktime
+        video/mpeg4
+      )
 
       def initialize(file_or_url)
-        @url = case true
-               when File.exists?(file_or_url)
-                 Airplay.server.serve(File.expand_path(file_or_url))
-               when !!(file_or_url =~ URI::regexp)
-                 file_or_url
-               else
-                 raise Errno::ENOENT, file_or_url
-               end
+        @file_or_url = file_or_url
+      end
+
+      def url
+        @_url ||= case true
+                 when local?
+                   Airplay.server.serve(File.expand_path(file_or_url))
+                 when remote?
+                   file_or_url
+                 else
+                   raise Errno::ENOENT, file_or_url
+                 end
       end
 
-      def to_s
-        @url
+      def compatible?
+        @_compatible ||= begin
+          path = File.basename(file_or_url)
+          compatibility = MIME::Types.type_for(path).map(&:to_s) & COMPATIBLE_TYPES
+          compatibility.any?
+        end
       end
+
+      def local?
+        File.exists?(file_or_url)
+      end
+
+      def remote?
+        !!(file_or_url =~ URI::regexp)
+      end
+
+      def to_s; url end
     end
   end
 end

data/lib/airplay/player/playback_info.rb

@@ -9,12 +9,16 @@ module Airplay
         info["duration"]
       end
 
+      def has_duration?
+        !duration.to_f.zero?
+      end
+
       def position
         info["position"]
       end
 
       def percent
-        return unless position && duration
+        return unless position && has_duration?
         (position * 100 / duration).floor
       end
 

data/lib/airplay/server.rb

@@ -1,6 +1,7 @@
 require "rack"
 require "socket"
-require "uuid"
+require "celluloid"
+require "reel/rack"
 
 require "airplay/logger"
 require "airplay/server/app"
@@ -13,11 +14,12 @@ module Airplay
       @port = Airplay.configuration.port
       @logger = Airplay::Logger.new("airplay::server")
       @server = Rack::Server.new(
-        server: :webrick,
+        server: :reel,
         Host: private_ip,
         Port: @port,
         Logger: @logger,
         AccessLog: [],
+        quiet: true,
         app: App.app
       )
 

data/lib/airplay/server/app.rb

@@ -1,10 +1,11 @@
 require "cuba"
+require "securerandom"
 
 module Airplay
   class Server
     class App < Cuba
       settings[:assets] ||= Hash.new do |h, k|
-        h[k] = UUID.generate
+        h[k] = SecureRandom.uuid
       end
 
       define do

data/lib/airplay/version.rb

@@ -1,3 +1,3 @@
 module Airplay
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/test_helper.rb

@@ -0,0 +1,5 @@
+require "bundler/setup"
+require "minitest/spec"
+require "minitest/pride"
+require "minitest/autorun"
+require "minitest/given"

data/test/unit/configuration_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+require "airplay/configuration"
+
+describe Airplay::Configuration do
+  Given(:configuration) { Airplay::Configuration.new }
+
+  context "default configuration" do
+    Then { configuration.log_level == 4 }
+    Then { configuration.autodiscover == true }
+    Then { configuration.host == "0.0.0.0" }
+    Then { configuration.port == "1337" }
+    Then { configuration.output.respond_to?(:info) }
+  end
+
+  context "changing configuration" do
+    When do
+      configuration.log_level = 1
+      configuration.autodiscover = false
+      configuration.host = "200.47.220.245"
+      configuration.port = "80"
+    end
+
+    Then { configuration.log_level == 1 }
+    And  { configuration.autodiscover == false }
+    And  { configuration.host == "200.47.220.245" }
+    And  { configuration.port == "80" }
+  end
+end

data/test/unit/device_test.rb

@@ -0,0 +1,12 @@
+require "test_helper"
+require "airplay/device"
+
+describe Airplay::Device do
+  context "a Device must have at least a name and an address" do
+    When(:result) { Airplay::Device.new name: "Test" }
+    Then { result == Failure(Airplay::Device::MissingAttributes) }
+
+    When(:result) { Airplay::Device.new address: "192.168.1.1:80" }
+    Then { result == Failure(Airplay::Device::MissingAttributes) }
+  end
+end

data/test/unit/player/media_test.rb

@@ -0,0 +1,16 @@
+require "test_helper"
+require "airplay/player/media"
+
+describe Airplay::Player::Media do
+  context "finding if a media is compatible" do
+    Given(:media) { Airplay::Player::Media.new("test.mov") }
+    When(:compatibility) { media.compatible? }
+    Then { compatibility == true }
+  end
+
+  context "finding if a media is not compatible" do
+    Given(:media) { Airplay::Player::Media.new("test.psd") }
+    When(:compatibility) { media.compatible? }
+    Then { compatibility == false }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplay
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnssd
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +42,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.6
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: CFPropertyList
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.15.0
+- !ruby/object:Gem::Dependency
+  name: reel-rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: net-ptth
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.16
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
   requirement: !ruby/object:Gem::Requirement
@@ -171,6 +187,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.4.0
+- !ruby/object:Gem::Dependency
+  name: minitest-given
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +293,10 @@ files:
 - test/fixtures/files/transition_1.png
 - test/fixtures/files/transition_2.png
 - test/fixtures/files/transition_3.png
+- test/test_helper.rb
+- test/unit/configuration_test.rb
+- test/unit/device_test.rb
+- test/unit/player/media_test.rb
 homepage: http://github.com/elcuervo/airplay
 licenses:
 - MIT
@@ -293,3 +329,7 @@ test_files:
 - test/fixtures/files/transition_1.png
 - test/fixtures/files/transition_2.png
 - test/fixtures/files/transition_3.png
+- test/test_helper.rb
+- test/unit/configuration_test.rb
+- test/unit/device_test.rb
+- test/unit/player/media_test.rb