airplay 1.0.0.beta1 → 1.0.0.beta2

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "rbx-19mode"
+before_install:
+  - "sudo apt-get -qq update"
+  - "sudo apt-get -qq install rdnssd libavahi-compat-libdnssd-dev"
+script: bundle exec rake spec

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-gemspec
+gemspec name: 'airplay'
 
 gem "rake"
 

data/Gemfile.lock

@@ -1,17 +1,15 @@
 PATH
   remote: .
   specs:
-    airplay (1.0.0.beta1)
+    airplay (1.0.0.beta2)
       CFPropertyList (~> 2.2.0)
       celluloid (~> 0.15.0)
-      clap (~> 1.0.0)
       cuba (~> 3.1.0)
       dnssd (~> 2.0)
       log4r (~> 1.1.10)
       micromachine (~> 1.0.4)
       net-http-digest_auth (~> 1.2.1)
-      net-ptth (~> 0.0.10)
-      ruby-progressbar (~> 1.2.0)
+      net-ptth (= 0.0.12)
       uuid (~> 2.3.6)
 
 GEM
@@ -23,7 +21,6 @@ GEM
     celluloid-io (0.15.0)
       celluloid (>= 0.15.0)
       nio4r (>= 0.5.0)
-    clap (1.0.0)
     columnize (0.3.6)
     cuba (3.1.0)
       rack
@@ -42,14 +39,13 @@ GEM
     micromachine (1.0.4)
     minitest (4.4.0)
     net-http-digest_auth (1.2.1)
-    net-ptth (0.0.10)
+    net-ptth (0.0.12)
       celluloid-io (~> 0.15.0)
       http_parser.rb (~> 0.5.3)
       rack (~> 1.4.5)
     nio4r (0.5.0)
     rack (1.4.5)
     rake (10.1.0)
-    ruby-progressbar (1.2.0)
     systemu (2.5.2)
     timers (1.1.0)
     uuid (2.3.7)

data/README.md

@@ -8,7 +8,8 @@ to add compatibility to other servers.
 
 ## Installation
 
-`gem install airplay`
+`gem install airplay --pre`
+`gem install airplay-cli --pre`
 
 ## CLI
 

data/Rakefile

@@ -1,9 +1,83 @@
+$: <<  File.expand_path("../lib", __FILE__)
+
 require "rake/testtask"
+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
+
+  TASKS = [:lib, :cli]
+
+  def initialize(options = {})
+    @task = options[:task]
+
+    @info = {
+      lib: { name: "airplay", version: Airplay::VERSION },
+      cli: { name: "airplay-cli", version: Airplay::CLI::VERSION }
+    }
+  end
+
+  def construct(action)
+    -> n {
+      task.call(:all) do
+        TASKS.each { |task| Rake::Task["#{action}:#{task}"].invoke }
+      end
+
+      TASKS.each do |task_name|
+        task.call(task_name) { action_method(action, task_name) }
+      end
+    }
+  end
+
+  private
+
+  def action_method(action, task_name)
+    method("#{action}_gem".to_sym).call(task_name)
+  end
+
+  def build_gem(type)
+    name = info[type][:name]
+    version = info[type][:version]
+
+    gem_name = "#{name}-#{version}.gem"
+
+    FileUtils.mkdir_p("pkg")
+    `gem build #{name}.gemspec`
+    FileUtils.mv(gem_name, "pkg")
+
+    puts "#{name} (v#{version}) builded!"
+
+    "./pkg/#{gem_name}"
+  end
+
+  def install_gem(type)
+    name = info[type][:name]
+    gem_path = build_gem(type)
+    `gem install --local #{gem_path}`
+
+    puts "#{gem_path} installed!"
+  end
+
+  def release_gem(type)
+    name = info[type][:name]
+    gem_path = build_gem(type)
+    `gem push #{gem_path}`
+
+    puts "#{gem_path} released!"
+  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]

data/airplay-cli.gemspec

@@ -0,0 +1,19 @@
+$: <<  File.expand_path("../lib", __FILE__)
+require "airplay/cli/version"
+
+Gem::Specification.new do |s|
+  s.name         = "airplay-cli"
+  s.version      = Airplay::CLI::VERSION
+  s.summary      = "Airplay client CLI"
+  s.description  = "Send pics and videos using the terminal"
+  s.executables  = "air"
+  s.licenses     = ["MIT", "HUGWARE"]
+  s.authors      = ["elcuervo"]
+  s.email        = ["yo@brunoaguirre.com"]
+  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("clap",                 "~> 1.0.0")
+  s.add_dependency("ruby-progressbar",     "~> 1.2.0")
+end

data/airplay.gemspec

@@ -1,9 +1,11 @@
+$: <<  File.expand_path("../lib", __FILE__)
+require "airplay/version"
+
 Gem::Specification.new do |s|
   s.name         = "airplay"
-  s.version      = "1.0.0.beta1"
+  s.version      = Airplay::VERSION
   s.summary      = "Airplay client"
   s.description  = "Send image/video to an airplay enabled device"
-  s.executables  = "air"
   s.licenses     = ["MIT", "HUGWARE"]
   s.authors      = ["elcuervo"]
   s.email        = ["yo@brunoaguirre.com"]
@@ -11,7 +13,6 @@ Gem::Specification.new do |s|
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files test`.split("\n")
 
-  # Lib
   s.add_dependency("dnssd",                "~> 2.0")
   s.add_dependency("uuid",                 "~> 2.3.6")
   s.add_dependency("CFPropertyList",       "~> 2.2.0")
@@ -19,13 +20,9 @@ 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.10")
+  s.add_dependency("net-ptth",             "=  0.0.12")
   s.add_dependency("net-http-digest_auth", "~> 1.2.1")
 
-  # CLI
-  s.add_dependency("clap",                 "~> 1.0.0")
-  s.add_dependency("ruby-progressbar",     "~> 1.2.0")
-
   s.add_development_dependency("minitest",  "~> 4.4.0")
   s.add_development_dependency("fakeweb",   "~> 1.3.0")
   s.add_development_dependency("vcr",       "~> 2.4.0")

data/examples/demo.rb

@@ -11,21 +11,18 @@ videos = [
 ]
 
 apple_tv = Airplay["Apple TV"]
-player = apple_tv.play(videos.last)
-sleep 4
-player.stop
-sleep 5
-
-
 
+apple_tv.view("./test/fixtures/files/logo.png", transition: "SlideLeft")
+sleep 2
+puts apple_tv.view("./test/fixtures/files/a.png", transition: "SlideLeft")
+sleep 20
 exit
 
 videos.each do |video|
   player = apple_tv.play(video)
+  sleep 10
 end
 
-apple_tv.stop
-
 Airplay.group["Backyard"] << Airplay["Pool TV"]
 Airplay.group["Backyard"] << Airplay.devices.add("BBQTV", "192.168.1.12")
 

data/lib/airplay.rb

@@ -1,5 +1,8 @@
 require "airplay/configuration"
 require "airplay/browser"
+require "airplay/group"
+require "airplay/server"
+require "airplay/version"
 
 # Public: Airplay core module
 #
@@ -9,14 +12,30 @@ module Airplay
       yield(configuration) if block
     end
 
+    def server
+      @_server ||= Server.new
+    end
+
     def browse
       browser.browse
     end
 
+    def group
+      @_group ||= Hash.new { |h, k| h[k] = Group.new(k) }
+    end
+
+    def all
+      @_all ||= begin
+        group = Group.new(:all)
+        devices.each { |device| group << device }
+        group
+      end
+    end
+
     # Public: Lists found devices
     #
     def devices
-      browse if browser.devices.empty?
+      browse if browser.devices.empty? && configuration.autodiscover
       browser.devices
     end
 
@@ -35,4 +54,3 @@ module Airplay
     end
   end
 end
-

data/lib/airplay/cli/version.rb

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

data/lib/airplay/configuration.rb

@@ -1,15 +1,19 @@
-require 'log4r/config'
+require "log4r/config"
+require "airplay/logger"
 
 module Airplay
   # Public: Handles the Airplay configuration
   #
   class Configuration
-    attr_accessor :log_level, :output
+    attr_accessor :log_level, :output, :autodiscover, :host, :port
 
     def initialize
       Log4r.define_levels(*Log4r::Log4rConfig::LogLevels)
 
-      @log_level = Log4r::WARN
+      @log_level = Log4r::ERROR
+      @autodiscover = true
+      @host = "0.0.0.0"
+      @port = "1337"
       @output = Log4r::Outputter.stdout
     end
 
@@ -24,6 +28,7 @@ module Airplay
 
       Log4r::Logger.root.add @output
       Log4r::Logger.root.level = level
+      Celluloid.logger = Airplay::Logger.new("airplay::celluloid")
     end
   end
 end

data/lib/airplay/connection.rb

@@ -8,8 +8,6 @@ module Airplay
   class Connection
     Response = Struct.new(:connection, :response)
 
-    attr_accessor :reverse, :events, :persistent
-
     include Celluloid
 
     def initialize(device, options = {})
@@ -23,11 +21,6 @@ module Airplay
       @_persistent ||= Airplay::Connection::Persistent.new(address, @options)
     end
 
-    def start_reverse_connection
-      @reverse = Airplay::Protocol::Reverse.new(Airplay.active)
-      @reverse.async.connect
-    end
-
     def close
       persistent.close
       @_persistent = nil

data/lib/airplay/devices.rb

@@ -28,6 +28,10 @@ module Airplay
       find_by_block { |device| device if device.ip == ip }
     end
 
+    def add(name, address)
+      self << Device.new(name: name, address: address)
+    end
+
     # Public: Adds a device to the list
     #
     #   value - The Node
@@ -41,6 +45,5 @@ module Airplay
     def find_by_block(&block)
       @items.find(&block)
     end
-
   end
 end

data/lib/airplay/group.rb

@@ -0,0 +1,33 @@
+require "forwardable"
+require "airplay/group/players"
+
+module Airplay
+  class Group
+    include Enumerable
+    extend  Forwardable
+
+    def_delegators :@devices, :each, :size, :empty?
+
+    def initialize(name)
+      @devices = []
+      @players = []
+      @name = name
+    end
+
+    def <<(device)
+      @devices << device
+    end
+
+    def play(file_or_url, options = {})
+      @players = @devices.map { |device| device.play(file_or_url, options) }
+      Players.new(@players)
+    end
+
+    def view(media_or_io, options = {})
+      @devices.map do |device|
+        ok = device.view(media_or_io, options)
+        [device, ok]
+      end
+    end
+  end
+end

data/lib/airplay/group/players.rb

@@ -0,0 +1,31 @@
+module Airplay
+  class Group
+    class Players
+      attr_reader :players
+
+      def initialize(players)
+        @players = players
+      end
+
+      def progress(callback)
+        players.each do |player|
+          player.progress -> info {
+            callback.call(player.device, info) if player.playing?
+          }
+        end
+      end
+
+      def wait
+        sleep 0.1 while still_playing?
+        players.map(&:cleanup)
+      end
+
+      private
+
+      def still_playing?
+        states = players.map { |player| !player.played? || player.stopped? }
+        states.uniq == [true]
+      end
+    end
+  end
+end

data/lib/airplay/playable.rb

@@ -1,4 +1,4 @@
-require "airplay/protocol/player"
+require "airplay/player"
 
 module Airplay
   module Playable
@@ -10,15 +10,19 @@ module Airplay
     #
     # Returns a Player object to control the playback
     #
-    def play(file_or_url, options = {})
+    def play(file_or_url = "playlist", options = {})
       player.async.play(file_or_url, options)
       player
     end
 
+    def playlist
+      player.playlist
+    end
+
     private
 
     def player
-      @_player ||= Airplay::Protocol::Player.new(self)
+      @_player ||= Airplay::Player.new(self)
     end
   end
 end