airplayer 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    airplayer (0.0.2)
+    airplayer (0.0.3)
       airplay
       rack
       ruby-progressbar
@@ -16,6 +16,13 @@ GEM
       net-http-persistent (>= 2.6)
     diff-lcs (1.1.3)
     dnssd (2.0)
+    guard (1.4.0)
+      listen (>= 0.4.2)
+      thor (>= 0.14.6)
+    guard-rspec (2.0.0)
+      guard (>= 1.1)
+      rspec (~> 2.11)
+    listen (0.5.3)
     net-http-digest_auth (1.2.1)
     net-http-persistent (2.7)
     rack (1.4.1)
@@ -36,5 +43,6 @@ PLATFORMS
 
 DEPENDENCIES
   airplayer!
+  guard-rspec
   rake
   rspec

data/Guardfile

@@ -0,0 +1,8 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { 'spec' }
+end

data/README.markdown

@@ -15,6 +15,7 @@ Command-line AirPlay video client for Apple TV
 Requirements
 -------------------------------------------------------------------------------
 
+- OSX or Ubuntu
 - Ruby 1.9.2 or later
 - AppleTV 2G or later
 
@@ -50,30 +51,53 @@ Usage
 ### Play online video
 
 ```sh
-$ airplayer play http://example.com/my-video.mp4
-AirPlay: http://example.com/my-video.mp4 to Apple TV(10.0.1.18)
-   Time: 00:00:31 |==============================================| 100% Complete
+$ airplayer play http://heinlein.local/Movies/AKIRA.m4v
+
+ Source: http://heinlein.local/misc/Movies/AKIRA.m4v
+  Title: AKIRA.m4v
+ Device: Apple TV (10.0.1.2)
+   Time: 00:04:25 |=                                              | 3% Streaming
 ```
 
-### Play local video
+### Play video
 
 ```sh
-$ airplayer play $HOME/Movies/video.mp4
-AirPlay: http://10.0.1.13:7070 to Apple TV(10.0.1.18)
-   Time: 00:00:31 |==============================================| 100% Complete
+$ airplayer play '~/Movies/Trailers/007 SKYFALL.mp4'
+
+ Source: http://10.0.1.6:7070
+  Title: SKYFALL.mp4
+ Device: Apple TV (10.0.1.2)
+   Time: 00:00:20 |=====                                         | 11% Streaming
 ```
 
+### Play all video in directory
+
+```sh
+$ airplayer play ~/Movies/Trailers
+
+ Source: http://10.0.1.6:7070
+  Title: 007 Casino Royale.mp4
+ Device: Apple TV (10.0.1.2)
+   Time: 00:02:33 |==============================================| 100% Complete
+
+ Source: http://10.0.1.6:7070
+  Title: 007 Quantum Of Solace.mp4
+ Device: Apple TV (10.0.1.2)
+   Time: 00:02:01 |==============================================| 100% Complete
+
+ Source: http://10.0.1.6:7070
+  Title: 007 SKYFALL.mp4
+ Device: Apple TV (10.0.1.2)
+   Time: 00:02:36 |==============================================| 100% Complete
+```
 
 ### Repeat play
 
 ```sh
-$ airplayer play ./video.mp4 --repeat
-AirPlay: http://10.0.1.13:7070 to Apple TV(10.0.1.18)
-   Time: 00:00:31 |=====================                         | 50% Streaming
+$ airplayer play '~/Movies/Trailers/007 SKYFALL.mp4' --repeat
 ```
 
 
-
 LICENSE
 --------------------------------------------------------------------------------
 

data/airplayer.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'guard-rspec'
 end

data/lib/airplayer.rb

@@ -2,8 +2,10 @@ require 'rubygems'
 require 'airplayer/version'
 
 module AirPlayer
-  autoload :Logger, 'airplayer/logger'
-  autoload :App,    'airplayer/app'
-  autoload :Player, 'airplayer/player'
-  autoload :Server, 'airplayer/server'
+  autoload :Logger,     'airplayer/logger'
+  autoload :App,        'airplayer/app'
+  autoload :Controller, 'airplayer/controller'
+  autoload :Server,     'airplayer/server'
+  autoload :Playlist,   'airplayer/playlist'
+  autoload :Media,      'airplayer/media'
 end

data/lib/airplayer/app.rb

@@ -2,10 +2,13 @@ require 'thor'
 
 module AirPlayer
   class App < Thor
-    desc 'play <URI|FILE> [-r|--repeat]', 'Play video(URI or local video file path)'
-    method_option :repeat, :aliases => '-r', :desc => 'Repeat play'
-    def play(uri)
-      Player.play(uri, options.repeat?)
+    desc 'play <URI|FILE|DIR> [-r|--repeat] ', 'Play video(URI or local video file path or video directory)'
+    method_option :repeat, :aliases => '-r', :desc => 'Repeat play', :type => :boolean
+    def play(target)
+      controller = Controller.new
+      Playlist.new.add(target).entries(options.repeat) do |media|
+        controller.play(media)
+      end
     end
 
     map '--version' => :version

data/lib/airplayer/controller.rb

@@ -0,0 +1,83 @@
+require 'timeout'
+require 'airplay'
+require 'airplayer/progress_bar/base'
+
+module AirPlayer
+  class Controller
+    BufferingTimeoutError = Class.new(TimeoutError)
+
+    def initialize
+      @airplay      = Airplay::Client.new
+      @device       = @airplay.browse.first
+      @player       = nil
+      @progressbar  = nil
+      @timeout      = 30
+      @interval     = 1
+      @total_sec    = 0
+      @current_sec  = 0
+    rescue Airplay::Client::ServerNotFoundError
+      abort '[ERROR] Apple device not found'
+    end
+
+    def play(media)
+      raise TypeError unless media.kind_of? Media
+
+      display_information(media)
+      @player = @airplay.send_video(media.open)
+
+      buffering
+      @progressbar.progress = @current_sec while playing
+
+      @progressbar.title = :Complete
+      pause
+      media.close
+    rescue BufferingTimeoutError
+      abort '[ERROR] Buffering timeout'
+    rescue TypeError
+      abort '[ERROR] Not media class'
+    end
+
+    def pause
+      @player.stop        if @player
+      @progressbar.finish if @progressbar
+    end
+
+    def replay
+      @player.scrub(0)
+      @player.resume
+
+      @progressbar.reset
+      @progressbar.resume
+    end
+
+    private
+      def display_information(media)
+        puts
+        puts " Source: #{media.path}"
+        puts "  Title: #{media.title}"
+        puts " Device: #{@device.name} (#{@device.ip})"
+
+        @progressbar = ProgressBar.create(:format => '   %a |%b%i| %p%% %t')
+      end
+
+      def buffering
+        timeout @timeout, BufferingTimeoutError do
+          @progressbar.title = :Buffering until playing
+          @progressbar.title = :Streaming
+          @progressbar.total = @total_sec
+        end
+      end
+
+      def playing
+        scrub = @player.scrub
+        @total_sec   = scrub['duration']
+        @current_sec = scrub['position']
+        sleep @interval
+        progress?
+      end
+
+      def progress?
+        0 < @current_sec && @current_sec < @total_sec
+      end
+  end
+end

data/lib/airplayer/media.rb

@@ -0,0 +1,38 @@
+require 'uri'
+
+module AirPlayer
+  class Media
+    attr_reader :title, :path, :type
+
+    def initialize(target)
+      path   = File.expand_path(target)
+      @title = File.basename(path)
+
+      if File.exist? path
+        @video_server = AirPlayer::Server.new(path)
+        @path = @video_server.uri
+        @type = :file
+      else
+        @path = URI.encode(target)
+        @type = :url
+      end
+    end
+
+    def open
+      Thread.start { @video_server.start } if file?
+      @path
+    end
+
+    def close
+      @video_server.stop if file?
+    end
+
+    def file?
+      @type == :file
+    end
+
+    def url?
+      @type == :url
+    end
+  end
+end

data/lib/airplayer/playlist.rb

@@ -0,0 +1,24 @@
+module AirPlayer
+  class Playlist < Array
+    def add(item)
+      path = File.expand_path(item)
+      Dir.exists?(path) ? concat(media_in(path)) : push(Media.new(item))
+      self
+    end
+
+    def entries(repeat = false, &blk)
+      loop do
+        send(:each, &blk)
+        break unless repeat
+      end
+    end
+
+    private
+      def media_in(path)
+        Dir.entries(path).map do |node|
+          media_path = File.expand_path(node, path)
+          Media.new(media_path) if File.file? media_path
+        end.compact
+      end
+  end
+end

data/lib/airplayer/server.rb

@@ -18,18 +18,23 @@ module AirPlayer
       $stderr = STDERR
     end
 
-    # networking - Getting the Hostname or IP in Ruby on Rails - Stack Overflow
-    #   http://stackoverflow.com/questions/42566/getting-the-hostname-or-ip-in-ruby-on-rails
-    def local_ip
-      # turn off reverse DNS resolution temporarily
-      orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
+    def stop
+      @server.server.shutdown
+    end
+
+    private
+      # networking - Getting the Hostname or IP in Ruby on Rails - Stack Overflow
+      #   http://stackoverflow.com/questions/42566/getting-the-hostname-or-ip-in-ruby-on-rails
+      def local_ip
+        # turn off reverse DNS resolution temporarily
+        orig, Socket.do_not_reverse_lookup = Socket.do_not_reverse_lookup, true
 
-      UDPSocket.open do |s|
-        s.connect('8.8.8.8', 1)
-        s.addr.last
+        UDPSocket.open do |s|
+          s.connect('8.8.8.8', 1)
+          s.addr.last
+        end
+      ensure
+        Socket.do_not_reverse_lookup = orig
       end
-    ensure
-      Socket.do_not_reverse_lookup = orig
-    end
   end
 end

data/lib/airplayer/version.rb

@@ -1,3 +1,3 @@
 module AirPlayer
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/airplayer_spec.rb

@@ -1,17 +1,52 @@
 require 'spec_helper'
 
-describe AirPlayer do
-  let(:app) { AirPlayer::App.new }
+describe :AirPlayer do
+  context :App do
+    let(:app) { AirPlayer::App.new }
 
-  context 'App' do
     it 'class type is Thor' do
       expect(app).to be_kind_of Thor
     end
   end
 
-  context 'Logger' do
+  context :Logger do
     it 'file path is /tmp/airplayer-access.log on Linux' do
-      expect(AirPlayer::Logger.path).to eq '/tmp/airplayer-access.log'
+      if RbConfig::CONFIG['target_os'] =~ /linux|unix/
+        expect(AirPlayer::Logger.path).to eq '/tmp/airplayer-access.log'
+      end
+    end
+  end
+
+  context :Media do
+    it 'give to local file' do
+      media = AirPlayer::Media.new('./Gemfile')
+      expect(media.file?).to be_true
+    end
+    it 'give to url' do
+      media = AirPlayer::Media.new('http://example.com/video.mp4')
+      expect(media.url?).to be_true
+    end 
+  end
+
+  context :Playlist do
+    let(:playlist) { AirPlayer::Playlist.new }
+
+    it 'add URL to list, and that media type is url' do
+      playlist.add('http://example.com/video.mp4')
+      expect(playlist.first.path).to match 'http'
+    end
+
+    it 'add file to list, and that media type is file' do
+      expect(playlist.add('./LICENSE').size).to eq 1
+      expect(playlist.add('./Gemfile').size).to eq 2
+      expect(playlist.first.file?).to be_true
+    end
+
+    it 'has list contains url or file path' do
+      playlist.add('../airplayer')
+      playlist.entries do |media|
+        expect(media).to be_kind_of AirPlayer::Media
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -107,6 +107,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Command-line AirPlay video client for Apple TV
 email:
 - tomohiro.t@gmail.com
@@ -120,6 +136,7 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.markdown
 - Rakefile
@@ -127,8 +144,10 @@ files:
 - bin/airplayer
 - lib/airplayer.rb
 - lib/airplayer/app.rb
+- lib/airplayer/controller.rb
 - lib/airplayer/logger.rb
-- lib/airplayer/player.rb
+- lib/airplayer/media.rb
+- lib/airplayer/playlist.rb
 - lib/airplayer/progress_bar/base.rb
 - lib/airplayer/server.rb
 - lib/airplayer/version.rb
@@ -148,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2589441194092994510
+      hash: 1247565518444440084
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -157,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2589441194092994510
+      hash: 1247565518444440084
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/airplayer/player.rb

@@ -1,105 +0,0 @@
-require 'timeout'
-require 'uri'
-require 'airplay'
-require 'airplayer/progress_bar/base'
-
-module AirPlayer
-  class Player
-    BufferingTimeoutError = Class.new(TimeoutError)
-
-    def self.play(*opts)
-      new.play(*opts)
-    rescue Airplay::Client::ServerNotFoundError
-      abort '[ERROR] Apple device not found'
-    end
-
-    def initialize
-      @airplay     = Airplay::Client.new
-      @player      = nil
-      @progressbar = nil
-      @timeout     = 30
-      @interval    = 1
-      @total_sec   = 0
-      @current_sec = 0
-    end
-
-    def play(target, repeat = false)
-      path = File.expand_path(target)
-      if local_file? path
-        video_server = AirPlayer::Server.new(path)
-        uri = video_server.uri
-        Thread.start { video_server.start }
-      else
-        uri = URI.encode(target)
-      end
-
-      device = @airplay.browse.first
-      puts "AirPlay: #{uri} to #{device.name}(#{device.ip})"
-      @progressbar = ProgressBar.create(:format => '   %a |%b%i| %p%% %t', :title => :Waiting)
-      @player = @airplay.send_video(uri)
-
-      loop do
-        buffering
-        @progressbar.progress = @current_sec while playing
-        break unless repeat
-        reset
-      end
-
-      stop
-    rescue BufferingTimeoutError
-      abort '[ERROR] Buffering timeout'
-    end
-
-    def reset
-      @player.scrub(0)
-      @player.resume
-
-      @progressbar.reset
-      @progressbar.resume
-    end
-
-    def stop
-      unless @player.nil?
-        @player.stop
-      end
-
-      unless @progressbar.nil?
-        @progressbar.title = :Complete
-        @progressbar.finish
-      end
-    end
-
-    private
-      def local_file?(path)
-        File.exist? path
-      end
-
-      def buffering
-        timeout @timeout, BufferingTimeoutError do
-          loop do
-            playing
-            redo unless buffering?
-            @progressbar.title = :Streaming
-            @progressbar.total = @total_sec
-            break
-          end
-        end
-      end
-
-      def playing
-        scrub = @player.scrub
-        @total_sec   = scrub['duration']
-        @current_sec = scrub['position']
-        sleep @interval
-        progress?
-      end
-
-      def progress?
-        0 < @current_sec && @current_sec < @total_sec
-      end
-
-      def buffering?
-        0 < @total_sec && 0 < @current_sec
-      end
-  end
-end