airplayer 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    airplayer (0.0.4)
+    airplayer (0.0.5)
       airplay
       mime-types
       rack

data/lib/airplayer/app.rb

@@ -2,11 +2,12 @@ require 'thor'
 
 module AirPlayer
   class App < Thor
-    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
+    desc 'play <URI|FILE|DIR> [-r|--repeat] [-s|--shuffle]', 'Play video(URI or local video file path or video directory)'
+    method_option :repeat,  :aliases => '-r', :desc => 'Repeat play',  :type => :boolean
+    method_option :shuffle, :aliases => '-s', :desc => 'Shuffle play', :type => :boolean
     def play(target)
       controller = Controller.new
-      Playlist.new.add(target).entries(options.repeat) do |media|
+      Playlist.new(options).add(target).entries do |media|
         controller.play(media)
       end
     end

data/lib/airplayer/playlist.rb

@@ -1,23 +1,28 @@
 module AirPlayer
   class Playlist < Array
+    def initialize(options = {})
+      @shuffle = options['shuffle'] || false
+      @repeat  = options['repeat']  || false
+    end
+
     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)
+    def entries(&blk)
       loop do
+        shuffle! if @shuffle
         send(:each, &blk)
-        break unless repeat
+        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 Media.playable? media_path
+          Media.new(File.expand_path(node, path)) if Media.playable? node
         end.compact
       end
   end

data/lib/airplayer/version.rb

@@ -1,3 +1,3 @@
 module AirPlayer
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-07 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1446557728728225776
+      hash: -4077241967162441253
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1446557728728225776
+      hash: -4077241967162441253
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23