mplayer-ruby 0.1.0 → 0.2.0

data/mplayer-ruby.gemspec

@@ -1,75 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-Gem::Specification.new do |s|
-  s.name = %q{mplayer-ruby}
-  s.version = "0.1.0"
+Gem::Specification.new do |gem|
+  gem.name             = "mplayer-ruby"
+  gem.version          = "0.2.0"
+  gem.date             = %q{2010-02-01}
+  gem.authors          = ["Arthur Chiu"]
+  gem.email            = %q{mr.arthur.chiu@gmail.com}
+  gem.description      = %q{A Ruby wrapper for MPlayer}
+  gem.summary          = %q{Ruby wrapper for MPlayer}
+  gem.homepage         = %q{http://github.com/achiu/mplayer-ruby}
+  gem.rdoc_options     = ["--charset=UTF-8"]
+  gem.extra_rdoc_files = Dir["*.rdoc"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Arthur Chiu"]
-  s.date = %q{2010-02-01}
-  s.description = %q{A Ruby wrapper for MPlayer}
-  s.email = %q{mr.arthur.chiu@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc",
-     "TODO"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "TODO",
-     "VERSION",
-     "examples/general_playback.rb",
-     "lib/mplayer-ruby.rb",
-     "lib/mplayer-ruby/slave.rb",
-     "lib/mplayer-ruby/slave_commands.rb",
-     "lib/mplayer-ruby/slave_video_commands.rb",
-     "mplayer-ruby.gemspec",
-     "test.watchr",
-     "test/mplayer-ruby_test.rb",
-     "test/slave_commands_test.rb",
-     "test/slave_test.rb",
-     "test/slave_video_commands_test.rb",
-     "test/test.mp3",
-     "test/teststrap.rb"
-  ]
-  s.homepage = %q{http://github.com/achiu/mplayer-ruby}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Ruby wrapper for MPlayer}
-  s.test_files = [
-    "test/mplayer-ruby_test.rb",
-     "test/slave_commands_test.rb",
-     "test/slave_test.rb",
-     "test/slave_video_commands_test.rb",
-     "test/teststrap.rb",
-     "examples/general_playback.rb"
-  ]
+  gem.files            = `git ls-files`.split($/)
+  gem.executables      = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files       = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths    = ["lib"]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  gem.add_dependency "open4", "~> 1.3.0"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<riot>, [">= 0.10.11"])
-      s.add_development_dependency(%q<rr>, [">= 0.10.5"])
-      s.add_runtime_dependency(%q<open4>, [">= 1.0.1"])
-    else
-      s.add_dependency(%q<riot>, [">= 0.10.11"])
-      s.add_dependency(%q<rr>, [">= 0.10.5"])
-      s.add_dependency(%q<open4>, [">= 1.0.1"])
-    end
-  else
-    s.add_dependency(%q<riot>, [">= 0.10.11"])
-    s.add_dependency(%q<rr>, [">= 0.10.5"])
-    s.add_dependency(%q<open4>, [">= 1.0.1"])
-  end
-end
+  gem.add_development_dependency "rake", "~> 10.1.0"
+  gem.add_development_dependency "riot", "~> 0.12.6"
+  gem.add_development_dependency "rr", "~> 1.1.2"
 
+end

data/test/slave_commands_test.rb

@@ -1,84 +1,80 @@
 require File.expand_path("teststrap", File.dirname(__FILE__))
 
-context "MPlayer::Player" do
-  setup do
-    mock(Open4).popen4("/usr/bin/mplayer -slave -quiet test/test.mp3") { [true,true,true,true] }
-    stub(true).gets { "playback" }
-    @player = MPlayer::Slave.new('test/test.mp3')
-  end
+context "MPlayer::SlaveCommands" do
+  setup_player
 
   context "pause" do
-    setup { mock_send @player, "pause" }
+    setup { mock_command @player, "pause" }
     asserts("returns true") { @player.pause }
   end
 
   context "quit" do
     setup do
-      mock_send @player, "quit"
-      mock(@player.stdin).close { true }
+      mock_command @player, "quit"
+      mock(@player.stdin).close { true } ; @player
     end
     asserts("returns true") { @player.quit }
   end
 
   context "volume" do
+    asserts("incorrect action") { @player.volume :boo }.equals false
 
     context "increases" do
-      setup { mock_send @player, "volume 1","Volume: 10 %\n",/Volume/ }
+      setup { mock_command @player, "volume 1","Volume: 10 %\n",/Volume/ }
       asserts("returns true") { @player.volume :up }.equals "10"
     end
 
     context "decreases" do
-      setup { mock_send @player, "volume 0","Volume: 10 %\n",/Volume/ }
+      setup { mock_command @player, "volume 0","Volume: 10 %\n",/Volume/ }
       asserts("returns true") { @player.volume :down }.equals "10"
     end
 
     context "sets volume" do
-      setup { mock_send @player, "volume 40 1","Volume: 10 %\n",/Volume/ }
+      setup { mock_command @player, "volume 40 1","Volume: 10 %\n",/Volume/ }
       asserts("returns true") { @player.volume :set,40 }.equals "10"
     end
-
-    context "incorrect action" do
-      setup { @player.volume :boo }
-      asserts("returns false").equals false
-    end
   end
 
   context "seek" do
 
     context "by relative" do
-      setup { mock_send @player, "seek 5 0","Position: 10 %\n",/Position/ }
+      setup { mock_command @player, "seek 5 0","Position: 10 %\n",/Position/ }
       asserts("seek 5") { @player.seek 5 }
+    end
+
+    context "explicit relative" do
+      setup { mock_command @player, "seek 5 0","Position: 10 %\n",/Position/ }
       asserts("seek 5,:relative") { @player.seek 5,:relative }.equals "10"
     end
 
     context "by percentage" do
-      setup { mock_send @player, "seek 5 1","Position: 10 %\n",/Position/ }
+      setup { mock_command @player, "seek 5 1","Position: 10 %\n",/Position/ }
       asserts("seek 5,:percent") { @player.seek 5,:percent }.equals "10"
     end
 
     context "by absolute" do
-      setup { mock_send @player, "seek 5 2","Position: 10 %\n",/Position/ }
+      setup { mock_command @player, "seek 5 2","Position: 10 %\n",/Position/ }
       asserts("seek 5,:absolute") { @player.seek 5,:absolute }.equals "10"
     end
   end
 
   context "edl_mark" do
-    setup { mock_send @player, "edl_mark"}
+    setup { mock_command @player, "edl_mark"}
     asserts("returns true") { @player.edl_mark }
   end
 
   context "speed_incr" do
-    setup { mock_send @player, "speed_incr 5","Speed: x   10",/Speed/ }
+    setup { mock_command @player, "speed_incr 5","Speed: x   10",/Speed/ }
     asserts("speed_incr 5") { @player.speed_incr 5 }.equals "10"
   end
 
   context "speed_mult" do
-    setup { mock_send @player, "speed_mult 5","Speed: x   10",/Speed/ }
+    setup { mock_command @player, "speed_mult 5","Speed: x   10",/Speed/ }
     asserts("speed_mult 5") { @player.speed_mult 5 }.equals "10"
   end
 
   context "speed_set" do
-    setup { mock_send @player, "speed_set 5","Speed: x   10",/Speed/ }
+    setup { mock_command @player, "speed_set 5","Speed: x   10",/Speed/ }
     asserts("speed_set 5") { @player.speed_set 5 }.equals "10"
   end
 
@@ -103,25 +99,33 @@ context "MPlayer::Player" do
     context "set" do
       setup { mock(@player).speed_set(5) { true } }
       asserts("speed 5") {  @player.speed 5 }
+    end
+
+    context "explicit set" do
+      setup { mock(@player).speed_set(5) { true } }
       asserts("speed 5, :set") {  @player.speed 5,:set }
     end
   end
 
   context "frame_step" do
-    setup { mock_send @player, "frame_step" }
+    setup { mock_command @player, "frame_step" }
     asserts("returns true") { @player.frame_step }
   end
 
   context "pt_step" do
 
     context "forced" do
-      setup { mock_send @player, "pt_step 5 1" }
+      setup { mock_command @player, "pt_step 5 1" }
       asserts("pt_step 5, :force") { @player.pt_step 5, :force }
     end
 
     context "not forced" do
-      setup { mock_send @player, "pt_step 5 0"  }
+      setup { mock_command @player, "pt_step 5 0"  }
       asserts("pt_step 5") {  @player.pt_step 5 }
+    end
+
+    context "explicit not forced" do
+      setup { mock_command @player, "pt_step 5 0"  }
       asserts("pt_step 5, :no_force") { @player.pt_step 5, :no_force }
     end
   end
@@ -129,60 +133,68 @@ context "MPlayer::Player" do
   context "pt_up_step" do
 
     context "forced" do
-      setup { mock_send @player, "pt_up_step 5 1"}
+      setup { mock_command @player, "pt_up_step 5 1"}
       asserts("pt_up_step 5, :force") { @player.pt_up_step 5, :force }
     end
 
     context "not forced" do
-      setup { mock_send @player, "pt_up_step 5 0" }
+      setup { mock_command @player, "pt_up_step 5 0" }
       asserts("pt_up_step 5") { @player.pt_up_step 5 }
+    end
+
+    context "explicit not forced" do
+      setup { mock_command @player, "pt_up_step 5 0" }
       asserts("pt_up_step 5, :no_force") { @player.pt_up_step 5, :no_force }
     end
   end
 
   context "alt_src_step" do
-    setup { mock_send @player, "alt_src_step 5" }
+    setup { mock_command @player, "alt_src_step 5" }
     asserts("returns true") { @player.alt_src_step 5 }
   end
 
   context "loop" do
 
     context "none" do
-      setup { mock_send @player,"loop -1" }
+      setup { mock_command @player,"loop -1" }
       asserts("loop :none") { @player.loop :none }
     end
 
     context "forever" do
-      setup { mock_send @player, "loop 0" }
+      setup { mock_command @player, "loop 0" }
       asserts("loop") { @player.loop }
+    end
+
+    context "explicit forever" do
+      setup { mock_command @player, "loop 0" }
       asserts("loop :forever") { @player.loop :forever }
     end
 
     context "set value" do
-      setup { mock_send @player,"loop 5" }
+      setup { mock_command @player,"loop 5" }
       asserts("loop :set, 5") { @player.loop :set, 5 }
     end
   end
 
   context "use_master" do
-    setup { mock_send @player, "use_master" }
+    setup { mock_command @player, "use_master" }
     asserts("returns true") { @player.use_master }
   end
 
   context "mute" do
 
     context "toggle" do
-      setup { mock_send @player, "mute", "Mute: enabled",/Mute/}
+      setup { mock_command @player, "mute", "Mute: enabled",/Mute/}
       asserts("returns true") { @player.mute }.equals "enabled"
     end
 
     context "set on" do
-      setup { mock_send @player, "mute 1","Mute: enabled",/Mute/}
+      setup { mock_command @player, "mute 1","Mute: enabled",/Mute/}
       asserts("mute :on") { @player.mute :on }.equals "enabled"
     end
 
     context "set off" do
-      setup { mock_send @player, "mute 0","Mute: enabled",/Mute/}
+      setup { mock_command @player, "mute 0","Mute: enabled",/Mute/}
       asserts("mute :off") { @player.mute :off }.equals "enabled"
     end
   end
@@ -199,7 +211,7 @@ context "MPlayer::Player" do
         when "file_name" then "ANS_FILENAME"
         else "ANS_#{info.upcase}"
         end
-        setup { mock_send @player, "get_#{info}","#{resp}='100'",/#{resp}/ }
+        setup { mock_command @player, "get_#{info}","#{resp}='100'",/#{resp}/ }
         asserts("get :#{info}") { @player.get info.to_sym }
       end
     end
@@ -208,32 +220,59 @@ context "MPlayer::Player" do
   context "load_file" do
 
     asserts("invalid file") { @player.load_file 'booger' }.raises ArgumentError,"Invalid File"
-    context "append" do
-      setup { mock_send @player, "loadfile test/test.mp3 1" }
-      asserts("load_file test/test.mp3, :append") { @player.load_file 'test/test.mp3', :append }
-    end
+    [
+      ["url", "http://www.example.com/test.mp3"],
+      ["file", "test/test.mp3"]
+    ].each do |kind, location|
+      context kind do
+        context "append" do
+          setup { mock_command @player, "loadfile \"#{location}\" 1" }
+          asserts("load_file #{location}, :append") { @player.load_file location, :append }
+        end
+
+        context "no append" do
+          setup { mock_command @player, "loadfile \"#{location}\" 0" }
+          asserts("load_file #{location}") { @player.load_file location }
+        end
 
-    context "no append" do
-      setup { mock_send @player, "loadfile test/test.mp3 0" }
-      asserts("load_file test/test.mp3") { @player.load_file 'test/test.mp3' }
-      asserts("load_file test/test.mp3, :no_append") { @player.load_file 'test/test.mp3', :no_append }
+        context "explicit no append" do
+          setup { mock_command @player, "loadfile \"#{location}\" 0" }
+          asserts("load_file #{location}, :no_append") { @player.load_file location, :no_append }
+        end
+      end
     end
   end
 
   context "load_list" do
 
     asserts("invalid playlist") { @player.load_list 'booger' }.raises ArgumentError,"Invalid File"
-    context "append" do
-      setup { mock_send @player, "loadlist test/test.mp3 1" }
-      asserts("load_list test/test.mp3, :append") { @player.load_list 'test/test.mp3', :append }
-    end
+    [
+      ["url", "http://www.example.com/test.mp3"],
+      ["file", "test/test.mp3"]
+    ].each do |kind, location|
+      context kind do
+        context "append" do
+          setup { mock_command @player, "loadlist \"#{location}\" 1" }
+          asserts("load_list #{location}, :append") { @player.load_list location, :append }
+        end
+
+        context "no append" do
+          setup { mock_command @player, "loadlist \"#{location}\" 0" }
+          asserts("load_list #{location}") { @player.load_list location }
+          #asserts("load_list #{location}, :no_append") { @player.load_list location, :no_append }
+        end
 
-    context "no append" do
-      setup { mock_send @player, "loadlist test/test.mp3 0" }
-      asserts("load_list test/test.mp3") { @player.load_list 'test/test.mp3' }
-      asserts("load_list test/test.mp3, :no_append") { @player.load_list 'test/test.mp3', :no_append }
+        context "explicit no append" do
+          setup { mock_command @player, "loadlist \"#{location}\" 0" }
+          asserts("load_list #{location}, :no_append") { @player.load_list location, :no_append }
+        end
+      end
     end
   end
 
+  context "balance" do
+    setup { mock_command @player, "balance 2.1" }
+    asserts("blance 2.1") { @player.balance 2.1 }
+  end
 
 end

data/test/slave_sub_commands_test.rb

@@ -0,0 +1,243 @@
+require File.expand_path("teststrap", File.dirname(__FILE__))
+
+context "MPlayer::SlaveSubCommands" do
+  setup_player
+
+  context "sub_delay" do
+
+    context "absolute" do
+      setup { mock_stdin @player, "sub_delay 5 1" }
+      asserts("sub_delay 5") {  @player.sub_delay 5 }
+    end
+
+    context "explicit absolute" do
+      setup { mock_stdin @player, "sub_delay 5 1" }
+      asserts("sub_delay 5, :absolute") { @player.sub_delay 5,:absolute }
+    end
+
+    context "relative" do
+      setup { mock_stdin @player, "sub_delay 5 0" }
+      asserts("sub_delay 5, :relative") { @player.sub_delay 5, :relative }
+    end
+  end
+
+  context "sub_step" do
+
+    context "next" do
+      setup { mock_stdin @player, "sub_step 5" }
+      asserts("sub_step 5") { @player.sub_step 5 }
+    end
+
+    context "explicit next" do
+      setup { mock_stdin @player, "sub_step 5" }
+      asserts("sub_step 5,:next") { @player.sub_step 5, :next }
+    end
+
+    context "prev" do
+      setup { mock_stdin @player, "sub_step -5" }
+      asserts("sub_step -5") { @player.sub_step -5 }
+    end
+
+    context "explicit prev" do
+      setup { mock_stdin @player, "sub_step -5" }
+      asserts("sub_step 5,:backward") { @player.sub_step 5,:prev }
+    end
+  end
+
+  context "sub_pos" do
+    context "by relative" do
+      setup { mock_stdin @player, "sub_pos 5 0"  }
+      asserts("sub_pos 5") { @player.sub_pos 5 }
+    end
+
+    context "by explicit relative" do
+      setup { mock_stdin @player, "sub_pos 5 0"  }
+      asserts("sub_pos 5,:relative") {  @player.sub_pos 5,:relative }
+    end
+
+    context "by absolute" do
+      setup { mock_stdin @player, "sub_pos 5 1" }
+      asserts("sub_pos 5,:absolute") {  @player.sub_pos 5,:absolute }
+    end
+  end
+
+  context "sub_alignment" do
+
+    context "toggle" do
+      setup { mock_stdin @player, "sub_alignment" }
+      asserts("returns true") { @player.sub_alignment }
+    end
+
+    context "top" do
+      setup { mock_stdin @player, "sub_alignment 0" }
+      asserts("sub_alignment :top") { @player.sub_alignment :top }
+    end
+
+    context "center" do
+      setup { mock_stdin @player, "sub_alignment 1" }
+      asserts("sub_alignment :top") { @player.sub_alignment :center }
+    end
+
+    context "bottom" do
+      setup { mock_stdin @player, "sub_alignment 2" }
+      asserts("sub_alignment :top") { @player.sub_alignment :bottom }
+    end
+  end
+
+  context "sub_visibility" do
+
+    context "toggle" do
+      setup { mock_stdin @player, "sub_visibility" }
+      asserts("sub_visiblity") { @player.sub_visibility }
+    end
+
+    context "on" do
+      setup { mock_stdin @player, "sub_visibility 1" }
+      asserts("sub_visibility :on") { @player.sub_visibility :on }
+    end
+
+    context "off" do
+      setup { mock_stdin @player, "sub_visibility 0" }
+      asserts("sub_visibility :off") { @player.sub_visibility :off }
+    end
+  end
+
+  context "sub_load" do
+
+    asserts("invalid file") { @player.sub_load "booger" }.raises ArgumentError,"Invalid File"
+    context "valid file" do
+      setup { mock_stdin @player, "sub_load test/test.mp3" }
+      asserts("sub_load 'test/test.mp3'") { @player.sub_load "test/test.mp3" }
+    end
+  end
+
+  context "sub_remove" do
+
+    context "all" do
+      setup { mock_stdin @player, "sub_remove -1" }
+      asserts("sub_remove") { @player.sub_remove }
+    end
+
+    context "explicit all" do
+      setup { mock_stdin @player, "sub_remove -1" }
+      asserts("sub_remove :all") { @player.sub_remove :all }
+    end
+
+    context "index" do
+      setup { mock_stdin @player, "sub_remove 1" }
+      asserts("sub_remove 1") { @player.sub_remove 1 }
+    end
+  end
+
+  context "sub_select" do
+
+    context "select" do
+      setup { mock_stdin @player, "sub_select 1" }
+      asserts("sub_select 1") { @player.sub_select 1 }
+    end
+
+    context "cycle" do
+      setup { mock_stdin @player, "sub_select -2" }
+      asserts("sub_select") { @player.sub_select }
+    end
+
+    context "explicit cycle" do
+      setup { mock_stdin @player, "sub_select -2" }
+      asserts("sub_select :cycle") { @player.sub_select :cycle }
+    end
+  end
+
+  context "sub_source" do
+
+    context "sub" do
+      setup { mock_stdin @player, "sub_source 0" }
+      asserts("sub_source :sub") { @player.sub_source :sub }
+    end
+
+    context "vobsub" do
+      setup { mock_stdin @player, "sub_source 1"}
+      asserts("sub_source :vobsub") { @player.sub_source :vobsub }
+    end
+
+    context "demux" do
+      setup { mock_stdin @player, "sub_source 2" }
+      asserts("sub_source :demux") { @player.sub_source :demux }
+    end
+
+    context "off" do
+      setup { mock_stdin @player, "sub_source -1" }
+      asserts("sub_source :off") { @player.sub_source :off }
+    end
+
+    context "cycle" do
+      setup { mock_stdin @player, "sub_source -2" }
+      asserts("sub_source :cycle") { @player.sub_source :cycle }
+    end
+
+    context "explicit cycle" do
+      setup { mock_stdin @player, "sub_source -2" }
+      asserts("sub_source") { @player.sub_source }
+    end
+  end
+
+  %w[sub_file sub_vob sub_demux].each do |sub|
+
+    context sub do
+
+      context "index" do
+        setup { mock_stdin @player, "#{sub} 1" }
+        asserts("#{sub} 1") { @player.method(sub).call 1 }
+      end
+
+      context "off" do
+        setup { mock_stdin @player, "#{sub} -1" }
+        asserts("#{sub} :off") { @player.method(sub).call :off}
+      end
+
+      context "cycle" do
+        setup { mock_stdin @player, "#{sub} -2" }
+        asserts("#{sub} :cycle") { @player.method(sub).call :cycle }
+      end
+
+      context "explicit cycle" do
+        setup { mock_stdin @player, "#{sub} -2" }
+        asserts("#{sub}") { @player.method(sub).call }
+      end
+    end
+  end
+
+  context "sub_scale" do
+    context "by relative" do
+      setup { mock_stdin @player, "sub_scale 5 0" }
+      asserts("sub_scale 5") { @player.sub_scale 5 }
+    end
+
+    context "explicitly by relative" do
+      setup { mock_stdin @player, "sub_scale 5 0" }
+      asserts("sub_scale 5,:relative") {  @player.sub_scale 5,:relative }
+    end
+
+    context "by absolute" do
+      setup { mock_stdin @player, "sub_scale 5 1" }
+      asserts("sub_scale 5,:absolute") {  @player.sub_scale 5,:absolute }
+    end
+  end
+
+  context "forced_subs_only" do
+    context "toggle" do
+      setup { mock_stdin @player, "forced_subs_only" }
+      asserts("forced_subs_only") { @player.forced_subs_only }
+    end
+
+    context "on" do
+      setup { mock_stdin @player, "forced_subs_only 1" }
+      asserts("forced_subs_only :on") { @player.forced_subs_only :on }
+    end
+
+    context "off" do
+      setup { mock_stdin @player, "forced_subs_only 0" }
+      asserts("forced_subs_only :off") { @player.forced_subs_only :off }
+    end
+  end
+
+end