anyplayer 0.0.2 → 0.0.3

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/Gemfile.lock

@@ -1,11 +1,12 @@
 PATH
   remote: .
   specs:
-    anyplayer (0.0.2)
+    anyplayer (0.0.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
+    flexmock (0.9.0)
     minitest (4.1.0)
     rake (0.9.2.2)
 
@@ -14,5 +15,6 @@ PLATFORMS
 
 DEPENDENCIES
   anyplayer!
+  flexmock
   minitest
   rake

data/Rakefile

@@ -6,6 +6,7 @@ Bundler::GemHelper.install_tasks
 task :default => :test
 
 Rake::TestTask.new do |t|
+  t.libs << "test"
   t.pattern = "test/*_test.rb"
   t.verbose = true
 end

data/Readme.markdown

@@ -42,7 +42,7 @@ Or in Ruby
 
 ```ruby
 require 'anyplayer'
-player = Anyplayer::launched
+player = Anyplayer::Selector.new.player
 
 player.launched? # => true
 player.name # => Rythmbox
@@ -58,14 +58,26 @@ With the [So Nice](https://github.com/sunny/so-nice/) Web interface:
 
 ![So Nice Screenshot](https://github.com/sunny/so-nice/raw/gh-pages/screenshot.png)
 
+
 Development
 -----------
 
-Launch from source:
+Depending on your configuration you may need to add `bundle exec` to the following commands.
+
+Terminal binary from source:
+
+```sh
+$ ruby -Ilib bin/anyplayer
+```
+
+Tests:
 
-    ruby -Ilib bin/anyplayer
+```sh
+$ rake test
+```
 
 Install from source:
 
-    gem build anyplayer.gemspec
-    gem install anyplayer-*.gem
+```sh
+$ rake install
+```

data/anyplayer.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'flexmock'
 end

data/bin/anyplayer

@@ -1,14 +1,19 @@
 #!/usr/bin/env ruby
-# -*- encoding: utf-8 -*-
-require 'anyplayer'
 
-player = Anyplayer::launched
+require 'anyplayer'
 
-if !player
-  puts "Error: no player connected."
-  exit 1
+# Create a selector
+selector = Anyplayer::Selector.new
+if ARGV.first == "-v"
+  selector.verbose = true
+  ARGV.pop
 end
 
+# Find the current player
+player = selector.player
+abort "Error: no player connected.\n" + selector.errors.join("\n") if !player
+
+# Call it
 case ARGV.first
   when "playpause" then player.playpause
   when "play"      then player.play
@@ -28,7 +33,7 @@ case ARGV.first
   when "paused"    then exit(player.playing? ? 0 : 1)
   else
     puts <<USAGE
-Usage: #{$0} [command]
+Usage: #{$0} [-v] [command]
 
 Where command is one of: playpause, play, pause, next, prev, voldown, volup,
 volume, track, artist, album, vote, name, launched.
@@ -36,4 +41,4 @@ volume, track, artist, album, vote, name, launched.
 Player connected: #{player.name}.
 USAGE
     exit(1)
-end
+end

data/lib/anyplayer.rb

@@ -1,24 +1,23 @@
 require "timeout"
-require "anyplayer/player"
 
 module Anyplayer
-  PLAYERS = [:itunes, :rhythmbox, :ituneswindows, :mpd, :xmms2, :amarok]
-  for player in PLAYERS
-    require "anyplayer/players/#{player}"
-  end
+  PLAYERS = %w(
+    rhythmbox
+    mpd
+    xmms2
+    amarok
+    itunes_mac
+    itunes_windows
+    spotify_mac
+  )
 
-  # Return the first music player that's launched
-  def self::launched(verbose = false)
-    PLAYERS.each { |player|
-      player = const_get(player.to_s.capitalize).new
-      puts "Trying #{player.name}..." if verbose
-
-      begin
-        Timeout::timeout(5) { return player if player.launched? }
-      rescue Timeout::Error
-        puts "Timed out" if verbose
-      end
-    }
-    nil
+  def self.launched
+    $stderr.puts "Anyplayer.launched is deprecated: please initialize a new Selector and call player"
+    Selector.new.player
   end
 end
+
+require "anyplayer/player"
+require "anyplayer/selector"
+
+

data/lib/anyplayer/player.rb

@@ -15,55 +15,61 @@
 #   volume    (return int)
 #   playing?  (return bool)
 #   paused?   (return bool)
-module Anyplayer
-  class Player
-    DEFAULT_VOTES_TO_SKIP = 5
+class Anyplayer::Player
+  DEFAULT_VOTES_TO_SKIP = 5
 
-    def initialize
-      @votes = 0
-    end
-
-    def launched?
-      false
-    end
-
-    # Player name is the classe's, feel free to override it
-    def name
-      self.class.to_s.gsub(/^.*::/, '')
-    end
+  def initialize
+    @votes = 0
+  end
 
-    def playpause
-      paused? ? play : pause
-    end
+  # Return true if the player is currently launched
+  def launched?
+    false
+  end
 
-    # Vote to skip song
-    def vote(votes_to_skip = DEFAULT_VOTES_TO_SKIP)
-      @votes += 1
-      if @votes >= votes_to_skip
-        self.next
-        reset_votes
-      end
-    end
+  # Player name defaults to the classe's, feel free to override it
+  # Example:
+  #     player.name # => iTunes
+  def name
+    self.class.to_s.gsub(/^.*::/, '')
+  end
 
-    def votes
-      @votes
-    end
+  # Tells the player to toggle the pause state
+  def playpause
+    paused? ? play : pause
+  end
 
-    # Root next and prev reset the votes, so be sure to call super
-    # in children
-    def next
+  # Vote to skip this song
+  def vote(votes_to_skip = DEFAULT_VOTES_TO_SKIP)
+    @votes += 1
+    if @votes >= votes_to_skip
+      self.next
       reset_votes
     end
+  end
 
-    def prev
-      reset_votes
-    end
+  # Returns the number of votes to skip this song
+  def votes
+    @votes
+  end
 
-    private
-      def reset_votes
-        @votes = 0
-      end
+  # Tell the player to go the the next song
+  # This resets the votes, so be sure to call super in children
+  def next
+    reset_votes
+  end
 
+  # Tell the player to go to the previous song
+  # This resets the votes, so be sur eto call super in children
+  def prev
+    reset_votes
   end
+
+  private
+
+    def reset_votes
+      @votes = 0
+    end
+
 end
 

data/lib/anyplayer/players/amarok.rb

@@ -1,63 +1,61 @@
-module Anyplayer
-  class Amarok < Player
-    def playpause
-      tell_to 'PlayPause'
-    end
+class Anyplayer::Amarok < Anyplayer::Player
+  def playpause
+    amarok 'PlayPause'
+  end
 
-    def play
-      tell_to 'Play'
-    end
+  def play
+    amarok 'Play'
+  end
 
-    def pause
-      tell_to 'Pause'
-    end
+  def pause
+    amarok 'Pause'
+  end
 
-    def prev
-      tell_to 'Prev'
-      super
-    end
+  def prev
+    amarok 'Prev'
+    super
+  end
 
-    def next
-      tell_to 'Next'
-      super
-    end
+  def next
+    amarok 'Next'
+    super
+  end
 
-    def voldown
-      tell_to 'VolumeDown 5'
-    end
+  def voldown
+    amarok 'VolumeDown 5'
+  end
 
-    def volup
-      tell_to 'VolumeUp 5'
-    end
+  def volup
+    amarok 'VolumeUp 5'
+  end
 
-    def volume
-      tell_to 'VolumeGet'
-    end
+  def volume
+    amarok 'VolumeGet'
+  end
 
-    def track
-      get_metadata('title')
-    end
+  def track
+    amarok_get_meta 'title'
+  end
 
-    def artist
-      get_metadata('artist')
-    end
+  def artist
+    amarok_get_meta 'artist'
+  end
 
-    def album
-      get_metadata('album')
-    end
+  def album
+    amarok_get_meta 'album'
+  end
 
-    def launched?
-      not %x(qdbus org.kde.amarok 2>&1).match(/does not exist|command not found/)
-    end
+  def launched?
+    not %x(qdbus org.kde.amarok 2>&1).match(/does not exist|command not found/)
+  end
 
-    private
-    def tell_to(command)
+  private
+    def amarok(command)
       %x(qdbus org.kde.amarok /Player org.freedesktop.MediaPlayer.#{command}).rstrip
     end
 
-    def get_metadata(name)
-      tell_to('GetMetadata').match(/#{name}: (\S.*)/)[1] rescue nil
+    def amarok_get_meta(name)
+      amarok('GetMetadata').match(/#{name}: (\S.*)/)[1] rescue nil
     end
-  end
 end
 

data/lib/anyplayer/players/itunes_mac.rb

@@ -0,0 +1,53 @@
+class Anyplayer::ItunesMac < Anyplayer::Player
+  def playpause
+    itunes 'playpause'
+  end
+
+  def prev
+    itunes 'previous track'
+    super
+  end
+
+  def next
+    itunes 'next track'
+    super
+  end
+
+  def voldown
+    itunes 'set sound volume to sound volume - 10'
+  end
+
+  def volup
+    itunes 'set sound volume to sound volume + 10'
+  end
+
+  def volume
+    itunes 'return sound volume'
+  end
+
+  def track
+    itunes 'return name of current track'
+  end
+
+  def artist
+    itunes 'return artist of current track'
+  end
+
+  def album
+    itunes 'return album of current track'
+  end
+
+  def launched?
+    nb = %x(osascript -e 'tell app "System Events" to count (every process whose name is "iTunes")' 2>/dev/null).rstrip
+    nb.match(/^\d+/) and nb.to_i > 0 ? true : false
+  end
+
+  def name
+    "iTunes Mac"
+  end
+
+  private
+    def itunes(command)
+      %x(osascript -e 'tell app "iTunes" to #{command}').rstrip
+    end
+end

data/lib/anyplayer/players/itunes_windows.rb

@@ -0,0 +1,68 @@
+begin
+  require 'win32ole'
+rescue LoadError => e
+  raise LoadError.new("#{e.message} -- You probably aren't on Windows")
+end
+
+class Anyplayer::ItunesWindows < Anyplayer::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?
+    itunes
+  end
+
+  def name
+    "iTunes Windows"
+  end
+
+  private
+
+    def itunes
+      itunes ||= WIN32OLE.new("iTunes.Application")
+    end
+end
+