airplay 1.0.0.beta2 → 1.0.0.beta3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    airplay (1.0.0.beta2)
+    airplay (1.0.0.beta3)
       CFPropertyList (~> 2.2.0)
       celluloid (~> 0.15.0)
       cuba (~> 3.1.0)
@@ -9,14 +9,14 @@ PATH
       log4r (~> 1.1.10)
       micromachine (~> 1.0.4)
       net-http-digest_auth (~> 1.2.1)
-      net-ptth (= 0.0.12)
+      net-ptth (= 0.0.13)
       uuid (~> 2.3.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
     CFPropertyList (2.2.3)
-    celluloid (0.15.1)
+    celluloid (0.15.2)
       timers (~> 1.1.0)
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
@@ -39,12 +39,12 @@ GEM
     micromachine (1.0.4)
     minitest (4.4.0)
     net-http-digest_auth (1.2.1)
-    net-ptth (0.0.12)
+    net-ptth (0.0.13)
       celluloid-io (~> 0.15.0)
       http_parser.rb (~> 0.5.3)
-      rack (~> 1.4.5)
+      rack (~> 1.5.2)
     nio4r (0.5.0)
-    rack (1.4.5)
+    rack (1.5.2)
     rake (10.1.0)
     systemu (2.5.2)
     timers (1.1.0)

data/README.md

@@ -1,19 +1,40 @@
 # Airplay
+
 [![Code Climate](https://codeclimate.com/github/elcuervo/airplay.png)](https://codeclimate.com/github/elcuervo/airplay)
 
-![Airplay](test/fixtures/files/logo.png)
+![Airplay](doc/img/logo.png)
 
 Airplay attempts to be compatible with the latest AppleTV firmware but I'd like
 to add compatibility to other servers.
 
+## Contribute
+
+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
+
+## Help
+
+* irc feenode: #airplay
+* twitter: http://twitter.com/airplayrb
+
 ## Installation
 
+### Library
+
 `gem install airplay --pre`
-`gem install airplay-cli --pre`
 
 ## CLI
 
-### View devices
+`gem install airplay-cli --pre`
+
+## Usage
+
+### CLI
+
+#### View devices
 
 `air list`
 ```text
@@ -22,9 +43,9 @@ to add compatibility to other servers.
   resolution: 1280x720
 ```
 
-### Play a video
+#### Play a video
 
-`air play [url to video]`
+`air play [url to video or local file]`
 ```text
 Playing http://movietrailers.apple.com/movies/universal/rush/rush-tlr3_480p.mov?width=848&height=352
 Time: 00:00:13 [=====                                              ] 7% Apple TV
@@ -34,9 +55,21 @@ Time: 00:00:13 [=====                                              ] 7% Apple TV
 
 `air view [url to image or image folder]`
 
-## Library
+### Library
+
+#### Configuration
+
+```ruby
+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 bind the server (Default: 0.0.0.0)
+  config.port           # In which port bind the server (Default: 1337)
+  config.output         # Where to log (Default: Log4r::Outputter.stdout)
+end
+```
 
-### Finding devices
+#### Devices
 
 ```ruby
 require "airplay"
@@ -44,22 +77,39 @@ require "airplay"
 Airplay.devices.each do |device|
   puts device.name
 end
+
+# You can access an know device easily
+device = Airplay["Apple TV"]
+
+# Or you can group known devices to have them do a given action toghether
+Airplay.group["Backyard"] << Airplay["Apple TV"]
+Airplay.group["Backyard"] << Airplay["Room TV"]
+
+# The groups can later do some actions like:
+Airplay.group["Backyard"].play("video")
 ```
 
-### Sending images
+#### Images
 
 ```ruby
 require "airplay"
 
 apple_tv = Airplay["Apple TV"]
+
+# You can send local files
 apple_tv.view("my_image.png")
+
+# Or use remote files
+apple_tv.view("https://github.com/elcuervo/airplay/raw/master/doc/img/logo.png")
+
+# And define a transition
 apple_tv.view("url_to_the_image", transition: "Dissolve")
 
 # View all transitions
 apple_tv.transitions
 ```
 
-### Playing video
+#### Video
 
 ```ruby
 require "airplay"
@@ -68,7 +118,38 @@ apple_tv = Airplay["Apple TV"]
 trailer = "http://movietrailers.apple.com/movies/dreamworks/needforspeed/needforspeed-tlr1xxzzs2_480p.mov"
 
 player = apple_tv.play(trailer)
+```
 
+##### Playlist
+
+```ruby
+# You can also add videos to a playlist and let the library handle them
+player.playlist << "video_url"
+player.playlist << "video_path"
+player.play
+
+# Or control it yourself
+player.next
+player.previous
+
+# Or if you prefer you can have several playlists
+player = apple_tv.player
+player.playlists["Star Wars Classic"] << "Star Wars Episode IV: A New Hope"
+player.playlists["Star Wars Classic"] << "Star Wars Episode V: The Empire Strikes Back"
+player.playlists["Star Wars Classic"] << "Star Wars Episode VI: Return of the Jedi"
+
+player.playlists["Star Wars"] << "Star Wars Episode I: The Phantom Menace"
+player.playlists["Star Wars"] << "Star Wars Episode II: Attack of the Clones"
+player.playlists["Star Wars"] << "Star Wars Episode III: Revenge of the Sith"
+
+player.use("Star Wars Classic")
+player.play
+player.wait
+```
+
+##### Player
+
+```ruby
 # Wait until the video is finished
 player.wait
 
@@ -80,7 +161,7 @@ player.scrub
 
 # Access the playback time per second
 player.progress -> progress {
-  puts "I'm viewing #{progress["position"]} of #{progress["duration"]}"
+  puts "I'm viewing #{progress.position} of #{progress.duration}"
 }
 ```
 
@@ -88,3 +169,4 @@ player.progress -> progress {
 
 * [sodabrew](http://github.com/sodabrew)
 * [pote](http://github.com/pote)
+

data/Rakefile

@@ -81,3 +81,13 @@ namespace :release, &builder.construct(:release)
 
 task :default => [:test]
 task :test => [:spec]
+
+namespace :doc do
+  task :generate do
+    structure = %w(header installation usage contributors)
+
+    File.open("README.md", "w+") do |f|
+      structure.each { |part| f << File.read("doc/#{part}.md") + "\n" }
+    end
+  end
+end

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.0.beta2")
+  s.add_dependency("airplay",              "=  1.0.0.beta3")
   s.add_dependency("clap",                 "~> 1.0.0")
   s.add_dependency("ruby-progressbar",     "~> 1.2.0")
 end

data/airplay.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   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.12")
+  s.add_dependency("net-ptth",             "=  0.0.13")
   s.add_dependency("net-http-digest_auth", "~> 1.2.1")
 
   s.add_development_dependency("minitest",  "~> 4.4.0")

data/doc/contributors.md

@@ -0,0 +1,4 @@
+## Contributors
+
+* [sodabrew](http://github.com/sodabrew)
+* [pote](http://github.com/pote)

data/doc/header.md

@@ -0,0 +1,21 @@
+# Airplay
+
+[![Code Climate](https://codeclimate.com/github/elcuervo/airplay.png)](https://codeclimate.com/github/elcuervo/airplay)
+
+![Airplay](doc/img/logo.png)
+
+Airplay attempts to be compatible with the latest AppleTV firmware but I'd like
+to add compatibility to other servers.
+
+## Contribute
+
+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
+
+## Help
+
+* irc feenode: #airplay
+* twitter: http://twitter.com/airplayrb

data/doc/installation.md

@@ -0,0 +1,9 @@
+## Installation
+
+### Library
+
+`gem install airplay --pre`
+
+## CLI
+
+`gem install airplay-cli --pre`

data/doc/usage.md

@@ -0,0 +1,134 @@
+## Usage
+
+### CLI
+
+#### View devices
+
+`air list`
+```text
+* Apple TV (AppleTV2,1 running 11A502)
+  ip: 192.168.1.12
+  resolution: 1280x720
+```
+
+#### Play a video
+
+`air play [url to video or local file]`
+```text
+Playing http://movietrailers.apple.com/movies/universal/rush/rush-tlr3_480p.mov?width=848&height=352
+Time: 00:00:13 [=====                                              ] 7% Apple TV
+```
+
+### Show images
+
+`air view [url to image or image folder]`
+
+### Library
+
+#### Configuration
+
+```ruby
+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 bind the server (Default: 0.0.0.0)
+  config.port           # In which port bind the server (Default: 1337)
+  config.output         # Where to log (Default: Log4r::Outputter.stdout)
+end
+```
+
+#### Devices
+
+```ruby
+require "airplay"
+
+Airplay.devices.each do |device|
+  puts device.name
+end
+
+# You can access an know device easily
+device = Airplay["Apple TV"]
+
+# Or you can group known devices to have them do a given action toghether
+Airplay.group["Backyard"] << Airplay["Apple TV"]
+Airplay.group["Backyard"] << Airplay["Room TV"]
+
+# The groups can later do some actions like:
+Airplay.group["Backyard"].play("video")
+```
+
+#### Images
+
+```ruby
+require "airplay"
+
+apple_tv = Airplay["Apple TV"]
+
+# You can send local files
+apple_tv.view("my_image.png")
+
+# Or use remote files
+apple_tv.view("https://github.com/elcuervo/airplay/raw/master/doc/img/logo.png")
+
+# And define a transition
+apple_tv.view("url_to_the_image", transition: "Dissolve")
+
+# View all transitions
+apple_tv.transitions
+```
+
+#### Video
+
+```ruby
+require "airplay"
+
+apple_tv = Airplay["Apple TV"]
+trailer = "http://movietrailers.apple.com/movies/dreamworks/needforspeed/needforspeed-tlr1xxzzs2_480p.mov"
+
+player = apple_tv.play(trailer)
+```
+
+##### Playlist
+
+```ruby
+# You can also add videos to a playlist and let the library handle them
+player.playlist << "video_url"
+player.playlist << "video_path"
+player.play
+
+# Or control it yourself
+player.next
+player.previous
+
+# Or if you prefer you can have several playlists
+player = apple_tv.player
+player.playlists["Star Wars Classic"] << "Star Wars Episode IV: A New Hope"
+player.playlists["Star Wars Classic"] << "Star Wars Episode V: The Empire Strikes Back"
+player.playlists["Star Wars Classic"] << "Star Wars Episode VI: Return of the Jedi"
+
+player.playlists["Star Wars"] << "Star Wars Episode I: The Phantom Menace"
+player.playlists["Star Wars"] << "Star Wars Episode II: Attack of the Clones"
+player.playlists["Star Wars"] << "Star Wars Episode III: Revenge of the Sith"
+
+player.use("Star Wars Classic")
+player.play
+player.wait
+```
+
+##### Player
+
+```ruby
+# Wait until the video is finished
+player.wait
+
+# Actions
+player.pause
+player.resume
+player.stop
+player.scrub
+
+# Access the playback time per second
+player.progress -> progress {
+  puts "I'm viewing #{progress.position} of #{progress.duration}"
+}
+```

data/lib/airplay/cli.rb

@@ -25,7 +25,7 @@ module Airplay
         )
 
         player.progress -> playback {
-          bar.progress = playback.percent
+          bar.progress = playback.percent if playback.percent
         }
 
         player.wait

data/lib/airplay/cli/version.rb

@@ -1,5 +1,5 @@
 module Airplay
   class CLI
-    VERSION = "0.1.0.beta2"
+    VERSION = "0.1.0.beta4"
   end
 end

data/lib/airplay/playable.rb

@@ -19,7 +19,9 @@ module Airplay
       player.playlist
     end
 
-    private
+    def playlists
+      player.playlists
+    end
 
     def player
       @_player ||= Airplay::Player.new(self)

data/lib/airplay/player.rb

@@ -26,8 +26,21 @@ module Airplay
       @device = device
     end
 
+    def playlists
+      @_playlists ||= Hash.new { |h,k| h[k] = Playlist.new(k) }
+    end
+
     def playlist
-      @_playlist ||= Playlist.new
+      @_playlist ||= if playlists.any?
+                       key, value = playlists.first
+                       value
+                     else
+                       Playlist.new("Default")
+                     end
+    end
+
+    def use(name)
+      @_playlist = playlists[name]
     end
 
     # Public: Plays a given url or file.
@@ -125,6 +138,7 @@ module Airplay
       connection.post("/stop")
     end
 
+    def loading?; state == :loading end
     def playing?; state == :playing end
     def paused?;  state == :paused  end
     def played?;  state == :played  end
@@ -133,7 +147,7 @@ module Airplay
     # Public: Locks the execution until the video gets fully played
     #
     def wait
-      sleep 0.1 while !played? || stopped?
+      sleep 1 while wait_for_playback?
       cleanup
     end
 
@@ -144,6 +158,11 @@ module Airplay
 
     private
 
+    def wait_for_playback?
+      return true if playlist.next?
+      loading? || playing? || paused?
+    end
+
     def timers
       @_timers ||= Timers.new
     end
@@ -159,10 +178,10 @@ module Airplay
     def check_for_playback_status
       timers << every(1) do
         case true
-        when info.stopped? then @machine.trigger(:stopped) if playing?
-        when info.played?  then @machine.trigger(:played)  if playing?
-        when info.playing? then @machine.trigger(:playing) if !playing?
-        when info.paused?  then @machine.trigger(:paused)  if playing?
+        when info.stopped? && playing?  then @machine.trigger(:stopped)
+        when info.played?  && playing?  then @machine.trigger(:played)
+        when info.playing? && !playing? then @machine.trigger(:playing)
+        when info.paused?  && playing?  then @machine.trigger(:paused)
         end
       end
     end
@@ -170,10 +189,13 @@ module Airplay
     # Private: Get ready the state machine
     #
     def start_the_machine
-      @machine = MicroMachine.new(:stopped)
+      @machine = MicroMachine.new(:loading)
 
       @machine.on(:stopped) { cleanup }
-      @machine.on(:played)  { cleanup }
+      @machine.on(:played)  do
+        cleanup
+        self.next if playlist.next?
+      end
 
       @machine.when(:loading, :stopped => :loading)
       @machine.when(:playing, {

data/lib/airplay/player/playlist.rb

@@ -7,9 +7,12 @@ module Airplay
       include Enumerable
       extend  Forwardable
 
+      attr_reader :name
+
       def_delegators :@items, :each, :size, :empty?
 
-      def initialize
+      def initialize(name)
+        @name = name
         @items = []
         @position = 0
       end
@@ -22,8 +25,11 @@ module Airplay
         @items << Media.new(file_or_url)
       end
 
+      def next?;     @position + 1 <= @items.size end
+      def previous?; @position - 1 >= 0 end
+
       def next
-        return nil if @position + 1 > @items.size
+        return nil if !next?
 
         item = @items[@position]
         @position += 1
@@ -31,7 +37,7 @@ module Airplay
       end
 
       def previous
-        return nil if @position - 1 < 0
+        return nil if !previous?
 
         @position -= 1
         @items[@position]

data/lib/airplay/version.rb

@@ -1,3 +1,3 @@
 module Airplay
-  VERSION = "1.0.0.beta2"
+  VERSION = "1.0.0.beta3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplay
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
   prerelease: 6
 platform: ruby
 authors:
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,11 @@ files:
 - airplay-cli.gemspec
 - airplay.gemspec
 - bin/air
+- doc/contributors.md
+- doc/header.md
+- doc/img/logo.png
+- doc/installation.md
+- doc/usage.md
 - examples/demo.rb
 - examples/image.rb
 - examples/video.rb
@@ -248,7 +253,6 @@ files:
 - lib/airplay/player/timers.rb
 - lib/airplay/server.rb
 - lib/airplay/server/app.rb
-- lib/airplay/structure.rb
 - lib/airplay/version.rb
 - lib/airplay/viewable.rb
 - lib/airplay/viewer.rb

data/lib/airplay/structure.rb

@@ -1,7 +0,0 @@
-# Public: Stupid class to easily create and initialize a Struct from a hash
-#
-class Structure < Struct
-  def self.create(hash)
-    new(*members.map { |member| hash[member.to_sym] })
-  end
-end