anyplayer 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    anyplayer (0.0.3)
+    anyplayer (0.0.4)
 
 GEM
   remote: http://rubygems.org/

data/{Readme.markdown → README.md}

@@ -1,8 +1,11 @@
 Anyplayer
 =========
 
-Interacts with the currently running music player. Supports iTunes OS X, iTunes Windows,
-Rythmbox, MPD & XMMS2.
+[![Gem Version](https://badge.fury.io/rb/anyplayer.png)](http://badge.fury.io/rb/anyplayer)
+[![Build Status](https://travis-ci.org/sunny/anyplayer.png)](https://travis-ci.org/sunny/anyplayer)
+
+Interacts with the currently running music player. Supports iTunes Mac, iTunes Windows, MPD,
+Rythmbox, Spotify Mac and XMMS2.
 
 Install
 -------

data/bin/anyplayer

@@ -1,44 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'anyplayer'
+require "anyplayer/command_line"
 
-# 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
-  when "pause"     then palyer.pause
-  when "next"      then player.next
-  when "prev"      then player.next
-  when "voldown"   then player.voldown
-  when "volup"     then player.volup
-  when "volume"    then puts player.volume
-  when "track"     then puts player.track
-  when "artist"    then puts player.artist
-  when "album"     then puts player.album
-  when "vote"      then player.vote
-  when "name"      then puts player.name
-  when "launched"  then exit(player.launched? ? 0 : 1)
-  when "playing"   then exit(player.playing? ? 0 : 1)
-  when "paused"    then exit(player.playing? ? 0 : 1)
-  else
-    puts <<USAGE
-Usage: #{$0} [-v] [command]
-
-Where command is one of: playpause, play, pause, next, prev, voldown, volup,
-volume, track, artist, album, vote, name, launched.
-
-Player connected: #{player.name}.
-USAGE
-    exit(1)
-end
+Anyplayer::CommandLine.parse(ARGV)

data/lib/anyplayer.rb

@@ -12,12 +12,11 @@ module Anyplayer
   )
 
   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"
-
+require "anyplayer/version"
 

data/lib/anyplayer/command_line.rb

@@ -0,0 +1,53 @@
+
+require "anyplayer"
+
+module Anyplayer::CommandLine
+  extend self
+
+  def parse(argv)
+    # Create a selector
+    selector = Anyplayer::Selector.new
+    if argv.first == "-v"
+      selector.verbose = true
+      argv.pop
+
+      $stderr.puts "anyplayer v#{Anyplayer::VERSION}"
+    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
+    when "pause"     then player.pause
+    when "next"      then player.next
+    when "prev"      then player.next
+    when "voldown"   then player.voldown
+    when "volup"     then player.volup
+    when "volume"    then puts player.volume
+    when "track"     then puts player.track
+    when "artist"    then puts player.artist
+    when "album"     then puts player.album
+    when "vote"      then player.vote
+    when "name"      then puts player.name
+    when "launched"  then exit(player.launched? ? 0 : 1)
+    when "playing"   then exit(player.playing? ? 0 : 1)
+    when "paused"    then exit(player.playing? ? 0 : 1)
+    else
+      puts <<USAGE
+Usage: anyplayer [-v] [command]
+
+Where command is one of: playpause, play, pause, next, prev, voldown, volup,
+volume, track, artist, album, vote, name, launched.
+
+Player connected: #{player.name}.
+USAGE
+      exit(1)
+    end
+
+  end
+
+end

data/lib/anyplayer/players/itunes_mac.rb

@@ -1,4 +1,12 @@
 class Anyplayer::ItunesMac < Anyplayer::Player
+  def play
+    itunes 'play'
+  end
+
+  def pause
+    itunes 'pause'
+  end
+
   def playpause
     itunes 'playpause'
   end

data/lib/anyplayer/players/spotify_mac.rb

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

data/lib/anyplayer/selector.rb

@@ -3,9 +3,11 @@
 # Example:
 #
 #   selector = Anyplayer::Selector.new
+#   selector.verbose = true
 #   player = selector.player
 #
 # Needs the PLAYERS constant to contain a list of players.
+
 class Anyplayer::Selector
   attr_accessor :verbose
   attr_reader :errors

data/lib/anyplayer/version.rb

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

data/test/anyplayer_test.rb

@@ -1,14 +1,7 @@
 require "test_helper"
 
 class AnyplayerTest < MiniTest::Unit::TestCase
-  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
-  end
-
-  # def test_loading_all_players
+  # def test_loading_all_players_does_not_explode
   #   PLAYERS.each do |player|
   #     require "anyplayer/players/#{player}"
   #   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyplayer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -57,11 +57,12 @@ files:
 - .travis.yml
 - Gemfile
 - Gemfile.lock
+- README.md
 - Rakefile
-- Readme.markdown
 - anyplayer.gemspec
 - bin/anyplayer
 - lib/anyplayer.rb
+- lib/anyplayer/command_line.rb
 - lib/anyplayer/player.rb
 - lib/anyplayer/players/amarok.rb
 - lib/anyplayer/players/itunes_mac.rb
@@ -69,6 +70,7 @@ files:
 - lib/anyplayer/players/mpd.rb
 - lib/anyplayer/players/noplayer.rb
 - lib/anyplayer/players/rhythmbox.rb
+- lib/anyplayer/players/spotify_mac.rb
 - lib/anyplayer/players/xmms2.rb
 - lib/anyplayer/selector.rb
 - lib/anyplayer/version.rb
@@ -90,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3141794029494105960
+      hash: 1339688103094380844
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -99,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3141794029494105960
+      hash: 1339688103094380844
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23