airplayer 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7bf034c4f9676f92eb321ceb9dd2cddeb1738fb0
-  data.tar.gz: 798347f078900bec063af19462f77f62d824097e
+  metadata.gz: 8498cbf608d7722d098753117793a825b4f65e04
+  data.tar.gz: 67b89490ab729572c54f0d3d259b86d0a62183b5
 SHA512:
-  metadata.gz: ee3c2abc153a8cd5154071df25d8d2c8a28345ffe7401c2f6531e3e0d123884dc90c36c5dacd72399c4853ee4d33e2cd8de5a124b47b3fceddfac277584ff3e9
-  data.tar.gz: 7e734aa5e86af89e9a80b42f4bd35c4c11172e4f20d4a363a79571ca3469f6e250bf9468e70c0b9475791cd6905cdb1cc5d2c266d36720c044efb7aa4e987feb
+  metadata.gz: 95a6c703fd68fe8975ae9bf567956a13f333dec5cef75cb79e59b5e066a15b812fb5396a934cdb339af5e423e355a62c94db091f736b101cb8f82653b6cd6365
+  data.tar.gz: dfe225b835b481d59d6df7dd5416e1b710f58221d42f9ac29b34213d59a7014b88619f0be2c5fd9809c42101637ed82decbab4ccfa757f033912031fa465c377

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    airplayer (0.0.8)
-      airplay (~> 0.2.9)
+    airplayer (0.0.9)
+      airplay (= 1.0.2)
       mime-types
       nokogiri
       rack
@@ -12,75 +12,111 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    airplay (0.2.9)
+    CFPropertyList (2.2.6)
+    airplay (1.0.2)
+      CFPropertyList (~> 2.2.0)
+      celluloid (>= 0.15.0)
+      cuba (~> 3.1.0)
       dnssd (~> 2.0)
-      net-http-digest_auth (~> 1.2)
-      net-http-persistent (>= 2.6)
-    celluloid (0.15.1)
+      log4r (~> 1.1.10)
+      micromachine (~> 1.0.4)
+      mime-types (>= 1.16)
+      net-http-digest_auth (~> 1.2.1)
+      net-ptth (= 0.0.17)
+      reel-rack (~> 0.1.0)
+    celluloid (0.15.2)
       timers (~> 1.1.0)
-    coderay (1.0.9)
+    celluloid-io (0.15.0)
+      celluloid (>= 0.15.0)
+      nio4r (>= 0.5.0)
+    coderay (1.1.0)
     coveralls (0.7.0)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    diff-lcs (1.2.4)
+    cuba (3.1.0)
+      rack
+    diff-lcs (1.2.5)
     dnssd (2.0)
-    ffi (1.9.0)
+    docile (1.1.2)
+    fakefs (0.5.0)
+    ffi (1.9.3)
     formatador (0.2.4)
-    guard (2.0.1)
+    guard (2.3.0)
       formatador (>= 0.2.4)
-      listen (~> 2.0)
+      listen (~> 2.1)
       lumberjack (~> 1.0)
       pry (>= 0.9.12)
       thor (>= 0.18.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    listen (2.0.0)
-      celluloid (>= 0.15.1)
+    guard-rspec (4.2.4)
+      guard (~> 2.1)
+      rspec (>= 2.14, < 4.0)
+    http (0.5.0)
+      http_parser.rb
+    http_parser.rb (0.6.0)
+    listen (2.4.0)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
+    log4r (1.1.10)
     lumberjack (1.0.4)
     method_source (0.8.2)
-    mime-types (1.25)
-    mini_portile (0.5.1)
-    multi_json (1.8.1)
-    net-http-digest_auth (1.4)
-    net-http-persistent (2.9)
-    nokogiri (1.6.0)
+    micromachine (1.0.4)
+    mime-types (2.0)
+    mini_portile (0.5.2)
+    multi_json (1.8.4)
+    net-http-digest_auth (1.2.1)
+    net-ptth (0.0.17)
+      celluloid-io (>= 0.15.0)
+      http_parser.rb (>= 0.6.0.beta.2)
+      rack (>= 1.4.5)
+    nio4r (1.0.0)
+    nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    pry (0.9.12.4)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
-    rake (10.1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.2)
+    rake (10.1.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
       ffi (>= 0.5.0)
+    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)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    ruby-progressbar (1.2.0)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
+    rspec-mocks (2.14.4)
+    ruby-progressbar (1.4.0)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
     timers (1.1.0)
-    tins (0.11.0)
+    tins (0.13.1)
+    websocket_parser (0.1.5)
+      http
 
 PLATFORMS
   ruby
@@ -89,6 +125,7 @@ DEPENDENCIES
   airplayer!
   bundler
   coveralls
+  fakefs
   guard-rspec
   rake
   rspec

data/airplayer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thor'
   spec.add_runtime_dependency 'ruby-progressbar'
-  spec.add_runtime_dependency 'airplay', '~> 0.2.9'
+  spec.add_runtime_dependency 'airplay', '= 1.0.2'
   spec.add_runtime_dependency 'rack'
   spec.add_runtime_dependency 'mime-types'
   spec.add_runtime_dependency 'nokogiri'
@@ -28,5 +28,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'guard-rspec'
+  spec.add_development_dependency 'fakefs'
   spec.add_development_dependency 'coveralls'
 end

data/lib/airplayer.rb

@@ -1,13 +1,11 @@
-require 'rubygems'
 require 'airplay'
+Airplay.configuration.load
 
 module AirPlayer
   require 'airplayer/version'
-  require 'airplayer/logger'
   require 'airplayer/app'
   require 'airplayer/controller'
   require 'airplayer/device'
-  require 'airplayer/server'
   require 'airplayer/playlist'
   require 'airplayer/media'
 end

data/lib/airplayer/app.rb

@@ -7,15 +7,18 @@ module AirPlayer
     method_option :shuffle, aliases: '-s', desc: 'Shuffle play',  type: :boolean
     method_option :device,  aliases: '-d', desc: 'Device number', type: :numeric
     def play(target)
-      controller = Controller.new
+      controller = Controller.new(device: options.fetch('device', 0))
       Playlist.new(options).add(target).entries do |media|
-        controller.play(media, device: options.fetch('device', nil))
+        controller.play(media)
+        controller.pause
       end
     end
 
     desc 'devices', 'Show AirPlay devices'
     def devices
-      Device.new.list
+      Device.devices.each_with_index do |device, number|
+        puts "#{number}: #{device.name} (Resolution: #{device.info.resolution}, Version: #{device.info.os_version}, IP: #{device.address})"
+      end
     end
 
     map '--version' => :version

data/lib/airplayer/controller.rb

@@ -1,98 +1,36 @@
-require 'timeout'
-require 'airplayer/progress_bar/base'
+require 'ruby-progressbar'
 
 module AirPlayer
   class Controller
-    BufferingTimeoutError = Class.new(TimeoutError)
-
-    def initialize
-      @airplay      = Airplay::Client.new
-      @player       = nil
-      @progressbar  = nil
-      @timeout      = 30
-      @interval     = 1
-      @total_sec    = 0
-      @current_sec  = 0
-    rescue Airplay::Client::ServerNotFoundError
-      abort '[ERROR] AirPlay device is not found'
+    def initialize(options = { device: nil })
+      @device      = Device.get(options[:device])
+      @player      = nil
+      @progressbar = nil
     end
 
-    def play(media, options = {})
-      raise TypeError unless media.is_a? Media
-
-      device = select_device(options.fetch(:device, nil))
-      @airplay.use(device.name)
-
-      display_information(device, 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'
-    rescue
-      abort 'Play stopped'
+    def play(media)
+      puts " Source: #{media.path}"
+      puts "  Title: #{media.title}"
+      puts " Device: #{@device.name} (Resolution: #{@device.info.resolution})"
+
+      @progressbar = ProgressBar.create(format: '   %a |%b%i| %p%% %t')
+      @player = @device.play(media.path)
+      @player.progress -> playback {
+        @progressbar.title    = 'Streaming'
+        @progressbar.progress = playback.percent if playback.percent
+      }
+      @player.wait
     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(device, 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?
+      if @player
+        @player.stop
       end
 
-      def progress?
-        0 < @current_sec && @total_sec - @current_sec > 1
-      end
-
-      def select_device(device_number = nil)
-        device_number ||= 0
-        device = Device.new
-
-        if device.exist?(device_number)
-          device.get(device_number)
-        else
-          puts "Device number #{device_number} is not found. Use default device"
-          device.default
-        end
+      if @progressbar
+        @progressbar.title = 'Complete'
+        @progressbar.finish
       end
+    end
   end
 end

data/lib/airplayer/device.rb

@@ -1,26 +1,27 @@
 module AirPlayer
   class Device
-    def initialize
-      @airplay = Airplay::Client.new
-    rescue Airplay::Client::ServerNotFoundError
-      abort "[ERROR] AirPlay device is not found"
-    end
-
-    def default
-      @airplay.browse.first
-    end
+    class << self
+      def devices
+        Airplay.devices.to_a
+      rescue Airplay::Browser::NoDevicesFound
+        abort 'AirPlay devices not found.'
+      end
 
-    def exist?(device_number)
-      !!@airplay.browse.at(device_number)
-    end
+      def get(device_number = 0)
+        if exist?(device_number)
+          Airplay[devices.at(device_number).name]
+        else
+          puts "Device number #{device_number} is not found. So choose #{default.name}."
+          default
+        end
+      end
 
-    def get(device_number)
-      @airplay.browse[device_number]
-    end
+      def exist?(device_number)
+        !!devices.at(device_number)
+      end
 
-    def list
-      @airplay.browse.each_with_index do |device, number|
-        puts "#{number}: #{device.name} (#{device.ip}:#{device.port})"
+      def default
+        devices.first
       end
     end
   end

data/lib/airplayer/media.rb

@@ -31,8 +31,7 @@ module AirPlayer
       path = File.expand_path(target)
 
       if File.exist? path
-        @video_server = AirPlayer::Server.new(path)
-        @path  = @video_server.uri
+        @path  = path
         @title = File.basename(path)
         @type  = :file
       else
@@ -56,15 +55,6 @@ module AirPlayer
       false
     end
 
-    def open
-      @video_server.start if file?
-      @path
-    end
-
-    def close
-      @video_server.stop if file?
-    end
-
     def file?
       @type == :file
     end

data/lib/airplayer/version.rb

@@ -1,3 +1,3 @@
 module AirPlayer
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/airplayer/app_spec.rb

@@ -2,9 +2,31 @@ require 'spec_helper'
 
 module AirPlayer
   describe App do
-    context 'class type' do
-      it 'Thor' do
-        expect(subject).to be_kind_of Thor
+    let (:airplayer) do
+      AirPlayer::App.new
+    end
+
+    describe '.new' do
+      it 'returns instance of Thor' do
+        expect(airplayer).to be_kind_of Thor
+      end
+    end
+
+    describe '.devices' do
+      before do
+        Airplay.devices << double_device
+      end
+
+      it 'display devices' do
+        devices = capture(:stdout) { airplayer.devices }
+        expect(devices).to match double_device.name
+      end
+    end
+
+    describe '.version' do
+      it 'display version' do
+        version = capture(:stdout) { airplayer.version }
+        expect(version.chomp).to eq AirPlayer::VERSION
       end
     end
   end

data/spec/airplayer/controller_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+module AirPlayer
+  describe Controller do
+    let (:controller) do
+      AirPlayer::Controller
+    end
+
+    before do
+      Airplay.devices << double_device
+    end
+
+    describe '.new' do
+      context 'with args' do
+        it 'returns instance of Controller' do
+          expect(controller.new(device: 0)).to be_kind_of Controller
+        end
+      end
+
+      context 'without args' do
+        it 'raise TypeError' do
+          expect{ controller.new }.to raise_error(TypeError)
+        end
+      end
+    end
+
+    describe '.pause' do
+      context 'with not playing media' do
+        it 'do nothing' do
+          expect(controller.new(device: 0).pause).to be nil
+        end
+      end
+    end
+  end
+end

data/spec/airplayer/device_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+module AirPlayer
+  describe Device do
+    let (:device) do
+      AirPlayer::Device
+    end
+
+    before do
+      Airplay.devices << double_device
+    end
+
+    describe '#devices' do
+      it 'returns array' do
+        expect(device.devices).to be_kind_of Array
+      end
+    end
+
+    describe '#get' do
+      context 'with exist device number' do
+        it 'returns instance of device' do
+          expect(device.get(0)).to be_kind_of Airplay::Device
+        end
+      end
+
+      context 'with not exist device number' do
+        it 'returns default device and display message' do
+          default_device = nil
+          message = capture(:stdout) { default_device = device.get(99) }
+          expect(default_device).to eq device.default
+          expect(message).to match('Device number 99 is not found')
+        end
+      end
+    end
+
+    describe '#exist?' do
+      context 'with exist device number' do
+        it 'returns true' do
+          expect(device.exist?(0)).to be true
+        end
+      end
+
+      context 'with not exist device number' do
+        it 'returns false' do
+          expect(device.exist?(99)).to be false
+        end
+      end
+    end
+
+    describe '#default' do
+      it 'returns first airplay device' do
+        expect(device.default).to eq Airplay.devices.first
+      end
+    end
+  end
+end

data/spec/airplayer/media_spec.rb

@@ -1,54 +1,50 @@
 # encoding: UTF-8
+require 'fakefs/spec_helpers'
 require 'spec_helper'
 
 module AirPlayer
   describe Media do
-    subject { AirPlayer::Media }
+    include FakeFS::SpecHelpers
 
-    context 'valid mime types' do
-      it 'supported' do
-        expect(subject.playable?('007 SKYFALL.mp4')).to be_true
-        expect(subject.playable?('007 SKYFALL.ts')).to be_true
-        expect(subject.playable?('007 SKYFALL.m4v')).to be_true
-        expect(subject.playable?('007 SKYFALL.mov')).to be_true
-        expect(subject.playable?('007 SKYFALL.ts')).to be_true
-      end
+    let (:media) do
+      AirPlayer::Media
     end
 
-    context 'invalid mime types' do
-      it 'unsupported' do
-        expect(subject.playable?('007 SKYFALL.flv')).to be_false
-        expect(subject.playable?('007 SKYFALL.wmv')).to be_false
-        expect(subject.playable?('.DS_Store')).to be_false
-        expect(subject.playable?('Fate_Kaleid_Liner_プリズマ☆イリヤ')).to be_false
+    describe '#playable?' do
+      context 'with supported mime types' do
+        it 'returns true' do
+          expect(media.playable?('007 SKYFALL.mp4')).to be true
+          expect(media.playable?('007 SKYFALL.ts')).to be true
+          expect(media.playable?('007 SKYFALL.m4v')).to be true
+          expect(media.playable?('007 SKYFALL.mov')).to be true
+          expect(media.playable?('007 SKYFALL.ts')).to be true
+          expect(media.playable?('マルチ☆バイト.mp4')).to be true
+        end
       end
-    end
 
-    context 'give Gemfile' do
-      it 'file' do
-        media = subject.new('./Gemfile')
-        expect(media.file?).to be_true
+      context 'with unsupported mime types' do
+        it 'returns false' do
+          expect(media.playable?('007 SKYFALL.flv')).to be false
+          expect(media.playable?('007 SKYFALL.wmv')).to be false
+          expect(media.playable?('NOT_PLAYABLE_FILE')).to be false
+        end
       end
     end
 
-    context 'give URL' do
-      it 'URL' do
-        #media = subject.new('http://example.com/video.mp4')
-        #expect(media.url?).to be_true
+    describe '.file?' do
+      context 'with given local file' do
+        it 'returns true' do
+          FileUtils.touch('fake_movie.m4v')
+          expect(media.new('fake_movie.m4v').file?).to be true
+        end
       end
     end
 
-    context 'give YouTube URL' do
-      it 'has title and url' do
-        #media = subject.new('http://www.youtube.com/watch?v=gVNYm9Qncyc')
-        #expect(media.url?).to be_true
-        #expect(media.title).to match(/Mogwai/)
-      end
-
-      it 'has title and short url' do
-        #media = subject.new('http://youtu.be/gVNYm9Qncyc')
-        #expect(media.url?).to be_true
-        #expect(media.title).to match(/Mogwai/)
+    describe '.url?' do
+      context 'with given URL' do
+        it 'returns true' do
+          expect(media.new('http://example.com/video.mp4').url?).to be true
+        end
       end
     end
   end

data/spec/airplayer/playlist_spec.rb

@@ -1,37 +1,54 @@
+require 'fakefs/spec_helpers'
 require 'spec_helper'
 
 module AirPlayer
   describe Playlist do
-    subject { AirPlayer::Playlist.new }
+    let (:playlist) do
+      AirPlayer::Playlist.new
+    end
+
+    describe '.add' do
+      context 'with local directory' do
+        it 'returns media type is local file' do
+          FakeFS do
+            FileUtils.touch('01.m4v')
+            FileUtils.touch('02.m4v')
+          end
 
-    describe '#add' do
-      context 'url' do
-        before { subject.add('http://example.com/video.mp4') }
-        it 'media type is url' do
-          expect(subject.first.path).to match 'http'
+          playlist.add('.')
+          playlist.entries do |media|
+            expect(media.file?).to be true
+          end
         end
       end
 
-      context 'Podcast RSS' do
-        it do
-          subject.add('http://rss.cnn.com/services/podcasting/cnnnewsroom/rss.xml')
-          subject.entries do |media|
-            expect(media).to be_kind_of AirPlayer::Media
-          end
+      context 'with URL' do
+        it 'returns media type is url' do
+          playlist.add('http://example.com/video.mp4')
+          expect(playlist.first.path).to match 'http'
         end
       end
 
-      context 'multiple files' do
+      context 'with multiple files' do
         it 'have multiple files' do
-          expect(subject.add('./video.mp4').size).to eq 1
-          expect(subject.add('./video.m4v').size).to eq 2
+          expect(playlist.add('video.mp4').size).to eq 1
+          expect(playlist.add('video.m4v').size).to eq 2
+        end
+      end
+
+      context 'with podcast RSS' do
+        it 'returns media instances' do
+          playlist.add('http://rss.cnn.com/services/podcasting/cnnnewsroom/rss.xml')
+          playlist.entries do |media|
+            expect(media).to be_kind_of AirPlayer::Media
+          end
         end
       end
 
-      context 'local file' do
-        it 'type is Media' do
-          subject.add('../airplayer')
-          subject.entries do |media|
+      context 'with local file' do
+        it 'returns media instances' do
+          playlist.add('video.mp4')
+          playlist.entries do |media|
             expect(media).to be_kind_of AirPlayer::Media
           end
         end

data/spec/spec_helper.rb

@@ -1,4 +1,39 @@
-require 'airplayer'
-
 require 'coveralls'
 Coveralls.wear!
+
+require 'stringio'
+RSpec.configure do |c|
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval "$#{stream} = #{stream.upcase}"
+    end
+    result
+  end
+end
+
+
+require 'airplay'
+Airplay.configure do |c|
+  c.autodiscover = false
+end
+
+# https://github.com/elcuervo/airplay/blob/master/lib/airplay/device.rb
+# https://github.com/elcuervo/airplay/blob/master/lib/airplay/device/info.rb
+def double_device
+  device = Airplay::Device.new(name: 'Double Device', address: 'double.appletv.local:7000')
+  allow(device).to receive('ip').and_return('127.0.0.1')
+  allow(device).to receive('server_info').and_return({
+    'model'      => 'AppleTV2,1',
+    'os_version' => '11B554a',
+    'width'      => '1280',
+    'height'     => '720'
+  })
+  device
+end
+
+require 'airplayer'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tomohiro TAIRA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-06 00:00:00.000000000 Z
+date: 2014-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -42,16 +42,16 @@ dependencies:
   name: airplay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.9
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +150,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -187,14 +201,12 @@ files:
 - lib/airplayer/app.rb
 - lib/airplayer/controller.rb
 - lib/airplayer/device.rb
-- lib/airplayer/logger.rb
 - lib/airplayer/media.rb
 - lib/airplayer/playlist.rb
-- lib/airplayer/progress_bar/base.rb
-- lib/airplayer/server.rb
 - lib/airplayer/version.rb
 - spec/airplayer/app_spec.rb
-- spec/airplayer/logger_spec.rb
+- spec/airplayer/controller_spec.rb
+- spec/airplayer/device_spec.rb
 - spec/airplayer/media_spec.rb
 - spec/airplayer/playlist_spec.rb
 - spec/spec_helper.rb
@@ -223,7 +235,8 @@ specification_version: 4
 summary: Command-line AirPlay video client for Apple TV
 test_files:
 - spec/airplayer/app_spec.rb
-- spec/airplayer/logger_spec.rb
+- spec/airplayer/controller_spec.rb
+- spec/airplayer/device_spec.rb
 - spec/airplayer/media_spec.rb
 - spec/airplayer/playlist_spec.rb
 - spec/spec_helper.rb

data/lib/airplayer/logger.rb

@@ -1,18 +0,0 @@
-require 'rbconfig'
-
-module AirPlayer
-  class Logger
-    def self.path
-      case RbConfig::CONFIG['target_os']
-      when /darwin|osx/i
-        File.expand_path('~/Library/Logs/airplayer-access.log')
-      when /linux|unix/i
-        '/tmp/airplayer-access.log'
-      when /mswin|windows|cygwin/i
-        'NUL'
-      else
-        STDOUT
-      end
-    end
-  end
-end

data/lib/airplayer/progress_bar/base.rb

@@ -1,9 +0,0 @@
-require 'ruby-progressbar'
-
-class ProgressBar
-  class Base
-    def total=(new_total)
-      with_update { with_progressables(:total=, new_total) }
-    end
-  end
-end

data/lib/airplayer/server.rb

@@ -1,41 +0,0 @@
-require 'rack'
-require 'socket'
-
-module AirPlayer
-  class Server
-    attr_reader :uri
-
-    def initialize(video_path)
-      @server = Rack::Server.new(server: :webrick, Host: local_ip, Port: 7070, app: Rack::File.new(video_path))
-      @uri  = "http://#{@server.options[:Host]}:#{@server.options[:Port]}"
-    end
-
-    def start
-      Thread.start do
-        # Output WEBrick access log to file
-        $stderr = File.open(Logger.path, File::WRONLY | File::APPEND | File::CREAT)
-        @server.start
-        $stderr = STDERR
-      end
-    end
-
-    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
-        end
-      ensure
-        Socket.do_not_reverse_lookup = orig
-      end
-  end
-end

data/spec/airplayer/logger_spec.rb

@@ -1,15 +0,0 @@
-require 'spec_helper'
-
-module AirPlayer
-  describe Logger do
-    subject { AirPlayer::Logger }
-
-    context 'file path' do
-      it '/tmp/airplayer-access.log on Linux' do
-        if RbConfig::CONFIG['target_os'] =~ /linux|unix/
-          expect(subject.path).to eq '/tmp/airplayer-access.log'
-        end
-      end
-    end
-  end
-end