anyplayer 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    anyplayer (1.1.0)
+    anyplayer (1.1.1)
+      ruby-mpd (~> 0.3.0)
 
 GEM
   remote: http://rubygems.org/
@@ -9,6 +10,7 @@ GEM
     flexmock (0.9.0)
     minitest (4.1.0)
     rake (0.9.2.2)
+    ruby-mpd (0.3.0)
 
 PLATFORMS
   ruby

data/Rakefile

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

data/anyplayer.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
+  s.add_runtime_dependency 'ruby-mpd', '~> 0.3.0'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'flexmock'
 end

data/lib/anyplayer/players/mpd.rb

@@ -1,54 +1,69 @@
+# encoding: utf-8
+begin
+  require 'ruby-mpd'
+rescue LoadError => e
+  raise LoadError.new "#{e.message} — please install ruby-mpd gem"
+end
+
+
 class Anyplayer::Mpd < Anyplayer::Player
+  def initialize
+    @mpc = false
+    super
+  end
+
   def playpause
-    mpc 'toggle'
+    mpc.paused? &&
+      mpc.send_command(:play) ||
+      mpc.send_command(:pause)
   end
 
   def play
-    mpc 'play'
+    mpc.play
   end
 
   def pause
-    mpc 'pause'
+    # ruby-mpd tries to send an additional argument to the MPD server
+    # which at least doesn't work with Mopidy.
+    mpc.send_command :pause
   end
 
   def prev
-    mpc 'prev'
+    mpc.previous
     super
   end
 
   def next
-    mpc 'next'
+    mpc.next
     super
   end
 
   def voldown
-    mpc 'volume -10'
+    mpc.volume -= 10
   end
 
   def volup
-    mpc 'volume +10'
+    mpc.volume += 10
   end
 
   def volume
-    mpc('volume').grep(/([0-9]+)/)
-    $1
+    mpc.volume
   end
 
   def track
-    mpc '-f "%title%" current'
+    mpc.current_song && mpc.current_song.title
   end
 
   def artist
-    mpc '-f "%artist%" current'
+    mpc.current_song && mpc.current_song.artist
   end
 
   def album
-    mpc '-f "%album%" current'
+    mpc.current_song && mpc.current_song.album
   end
 
   def launched?
-    %x(mpc 2> /dev/null)
-    $? == 0
+    !!(@mpc && @mpc.connected? || connect)
   end
 
   def host
@@ -56,8 +71,16 @@ class Anyplayer::Mpd < Anyplayer::Player
   end
 
   private
-    def mpc(command)
-      %x(mpc #{command}).split("\n").first
-    end
+  def connect
+    @mpc ||= MPD.new
+    @mpc.connect
+  rescue
+    false
+  end
+
+  def mpc
+    @mpc || connect
+    @mpc
+  end
 end
 

data/lib/anyplayer/version.rb

@@ -1,3 +1,3 @@
 module Anyplayer
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/players/mpd_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+require "ruby-mpd"
+require "anyplayer/players/mpd"
+
+class MpdTest < MiniTest::Unit::TestCase
+  include FlexMock::TestCase
+
+  def setup
+    @mpd_instance_mock = flexmock("mpd")
+    flexmock(MPD, "MPD", :new => @mpd_instance_mock)
+  end
+
+  def test_uses_ruby_mpd_gem
+    @mpd_instance_mock.should_receive :connect
+    Mpd.new
+  end
+
+  def test_works_around_toggle_bug
+    player = Mpd.new
+    @mpd_instance_mock.should_receive(:paused?).once.and_return(false)
+    @mpd_instance_mock.should_receive(:send_command).with(:pause).once
+
+    player.playpause
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyplayer
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,8 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-27 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-mpd
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +94,7 @@ files:
 - lib/anyplayer/version.rb
 - test/anyplayer_test.rb
 - test/player_test.rb
+- test/players/mpd_test.rb
 - test/selector_test.rb
 - test/test_helper.rb
 homepage: http://github.com/sunny/anyplayer
@@ -92,18 +109,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2566882971026617068
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2566882971026617068
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -113,5 +124,6 @@ summary: Interact with the running music player
 test_files:
 - test/anyplayer_test.rb
 - test/player_test.rb
+- test/players/mpd_test.rb
 - test/selector_test.rb
 - test/test_helper.rb