anyplayer 0.0.2 → 0.0.3

data/lib/anyplayer/version.rb

@@ -1,3 +1,3 @@
 module Anyplayer
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/anyplayer_test.rb

@@ -1,75 +1,16 @@
-require "minitest/unit"
-require "minitest/autorun"
-require "anyplayer"
+require "test_helper"
 
 class AnyplayerTest < MiniTest::Unit::TestCase
-  def setup
-    @player = Anyplayer::launched
-    refute_nil @player, "Make sure you have launched a player for tests to run"
-  end
-
-  def test_music_player_running
-    assert_kind_of Anyplayer::Player, @player
-  end
-
-
-  def test_voting
-    assert_equal @player.votes, 0
-
-    first_track = @player.track
-
-    Anyplayer::Player::DEFAULT_VOTES_TO_SKIP.times do |i|
-     @player.vote
-
-     # votes should be 0 if we've voted enough times
-     if i == Anyplayer::Player::DEFAULT_VOTES_TO_SKIP-1
-       assert_equal @player.votes, 0
-     else
-       assert_equal @player.votes, i+1
-     end
+  def test_deprecated_launched
+    assert_output nil, "Anyplayer.launched is deprecated: please initialize a new Selector and call player\n" do
+      deprecated_player = Anyplayer::launched
+      assert_kind_of Player, deprecated_player
     end
-
-    # make sure we actually changed tracks
-    refute_equal @player.track, first_track
-
-    # rewind test
-    @player.prev
-    @player.play
-  end
-
-  def test_vote_resets
-    assert_equal @player.votes, 0
-
-    @player.next
-    assert_equal @player.votes, 0
-
-    @player.prev
-    assert_equal @player.votes, 0
   end
 
-  def test_custom_voting_quota
-    assert_equal @player.votes, 0
-
-    num_votes = 10
-
-    first_track = @player.track
-
-    num_votes.times do |i|
-      @player.vote(num_votes)
-
-      # votes should be 0 if we've voted enough times
-      if i == num_votes-1
-        assert_equal @player.votes, 0
-      else
-        assert_equal @player.votes, i+1
-      end
-    end
-
-    # make sure we actually changed tracks
-    refute_equal @player.track, first_track
-
-    # rewind test
-    @player.prev
-    @player.play
-  end
+  # def test_loading_all_players
+  #   PLAYERS.each do |player|
+  #     require "anyplayer/players/#{player}"
+  #   end
+  # end
 end

data/test/player_test.rb

@@ -0,0 +1,53 @@
+require "test_helper"
+
+class PlayerTest < MiniTest::Unit::TestCase
+  include FlexMock::TestCase
+
+  def setup
+    @player = Noplayer.new
+  end
+
+  def test_votes
+    Player::DEFAULT_VOTES_TO_SKIP.times do |i|
+      @player.vote
+
+      # votes should be 0 if we've voted enough times
+      if i == Player::DEFAULT_VOTES_TO_SKIP - 1
+        assert_equal @player.votes, 0
+      else
+        assert_equal @player.votes, i + 1
+     end
+    end
+  end
+
+  def test_voting_changes_track
+    flexmock(@player).should_receive(:next).once
+    Player::DEFAULT_VOTES_TO_SKIP.times { @player.vote }
+  end
+
+  def test_vote_resets
+    assert_equal @player.votes, 0
+
+    @player.vote
+    @player.next
+    assert_equal @player.votes, 0
+
+    @player.vote
+    @player.prev
+    assert_equal @player.votes, 0
+  end
+
+  def test_custom_voting_quota
+    10.times do |i|
+      @player.vote(10)
+
+      if i == 9
+        assert_equal @player.votes, 0
+      else
+        assert_equal @player.votes, i + 1
+     end
+    end
+  end
+
+
+end

data/test/selector_test.rb

@@ -0,0 +1,26 @@
+require "test_helper"
+
+class AnyplayerTest < MiniTest::Unit::TestCase
+  def test_player
+    selector = Selector.new
+    player = selector.player
+    assert_kind_of Player, player
+  end
+
+  def test_verbose_accessor
+    selector = Selector.new
+    assert !selector.verbose
+
+    selector.verbose = true
+    assert selector.verbose
+  end
+
+  def test_verbose_flag_messages
+    selector = Selector.new
+    selector.verbose = true
+
+    assert_output nil, "Loaded noplayer\nNoplayer launched?\n" do
+      selector.player
+    end
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,9 @@
+require "minitest/unit"
+require "minitest/autorun"
+require "flexmock/test_unit"
+require "anyplayer"
+
+require "anyplayer/players/noplayer"
+Anyplayer::PLAYERS.unshift "noplayer"
+
+include Anyplayer

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  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: Play/pause/skip songs in iTunes, Rythmbox, MPD, XMMS
 email:
 - sunny@sunfox.org
@@ -48,13 +64,18 @@ files:
 - lib/anyplayer.rb
 - lib/anyplayer/player.rb
 - lib/anyplayer/players/amarok.rb
-- lib/anyplayer/players/itunes.rb
-- lib/anyplayer/players/ituneswindows.rb
+- lib/anyplayer/players/itunes_mac.rb
+- lib/anyplayer/players/itunes_windows.rb
 - lib/anyplayer/players/mpd.rb
+- lib/anyplayer/players/noplayer.rb
 - lib/anyplayer/players/rhythmbox.rb
 - lib/anyplayer/players/xmms2.rb
+- lib/anyplayer/selector.rb
 - lib/anyplayer/version.rb
 - test/anyplayer_test.rb
+- test/player_test.rb
+- test/selector_test.rb
+- test/test_helper.rb
 homepage: http://github.com/sunny/anyplayer
 licenses: []
 post_install_message: 
@@ -67,12 +88,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3141794029494105960
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3141794029494105960
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -81,3 +108,6 @@ specification_version: 3
 summary: Interact with the running music player
 test_files:
 - test/anyplayer_test.rb
+- test/player_test.rb
+- test/selector_test.rb
+- test/test_helper.rb

data/lib/anyplayer/players/itunes.rb

@@ -1,66 +0,0 @@
-if RUBY_PLATFORM =~ /darwin/
-  require 'appscript'
-  include Appscript
-end
-
-module Anyplayer
-  class Itunes < Player
-    def playpause
-      @app.playpause
-    end
-
-    def play
-      @app.play
-    end
-
-    def pause
-      @app.pause
-    end
-
-    def prev
-      @app.previous_track
-      super
-    end
-
-    def next
-      @app.next_track
-      super
-    end
-
-    def voldown
-      @app.sound_volume.set(volume + 10)
-    end
-
-    def volup
-      @app.sound_volume.set(volume + 10)
-    end
-
-    def volume
-      @app.sound_volume.get
-    end
-
-    def track
-      @app.current_track.name.get
-    end
-
-    def artist
-      @app.current_track.artist.get
-    end
-
-    def album
-      @app.current_track.album.get
-    end
-
-    def launched?
-      return false unless RUBY_PLATFORM =~ /darwin/
-      return false unless app('System Events').processes.name.get.include? "iTunes"
-      @app = app('iTunes')
-      true
-    end
-
-    def name
-      "iTunes"
-    end
-  end
-end
-

data/lib/anyplayer/players/ituneswindows.rb

@@ -1,66 +0,0 @@
-module Anyplayer
-  class Ituneswindows < Player
-    def playpause
-      @itunes.PlayPause()
-    end
-
-    def play
-      @itunes.Play()
-    end
-
-    def pause
-      @itunes.Pause()
-    end
-
-    def prev
-      @itunes.PreviousTrack()
-      super
-    end
-
-    def next
-      @itunes.NextTrack()
-      super
-    end
-
-    def voldown
-      @itunes.SoundVolume=@itunes.SoundVolume - 10
-    end
-
-    def volup
-      @itunes.SoundVolume=@itunes.SoundVolume + 10
-    end
-
-    def volume
-      @itunes.SoundVolume
-    end
-
-    def track
-      @itunes.CurrentTrack.name
-    end
-
-    def artist
-      @itunes.CurrentTrack.Artist
-    end
-
-    def album
-      @itunes.CurrentTrack.Album
-    end
-
-    def launched?
-      return false if RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
-
-      begin
-        require 'win32ole'
-        @itunes = WIN32OLE.new("iTunes.Application")
-        return true
-      rescue LoadError
-        return false
-      end
-    end
-
-    def name
-      "iTunes Windows"
-    end
-  end
-end
-