anyplayer 1.1.2 → 1.2.1

data/lib/anyplayer/selector.rb

@@ -1,4 +1,7 @@
-# The Selector is the tool that will find you the currently running player on your platform
+require "rbconfig"
+
+# The Selector is the tool that will find you the currently running player
+# on your platform.
 #
 # Example:
 #
@@ -7,62 +10,90 @@
 #   player = selector.player
 #
 # Needs the PLAYERS constant to contain a list of players.
+module Anyplayer
+  class Selector
+    attr_accessor :verbose
+    attr_reader :errors
 
-class Anyplayer::Selector
-  attr_accessor :verbose
-  attr_reader :errors
+    def initialize
+      @verbose = false
+      @errors = []
+    end
 
-  def initialize
-    @verbose = false
-    @errors = []
-  end
+    # Returns an instance of the first music player that's launched
+    def player
+      PLAYERS.each do |player|
+        player_load(player) || next
 
-  # Returns an instance of the first music player that's launched
-  def player
-    players_for_this_platform.each { |player|
-      player_load(player) or next
-      instance = player_class(player).new
-      return instance if player_launched(instance)
-    }
-    nil
-  end
+        instance = player_class(player).new
+        player_on_platform?(instance) || next
 
+        return instance if player_launched?(instance)
+      end
+      nil
+    end
 
-  private
+    private
 
-    def players_for_this_platform
-      players = Anyplayer::PLAYERS
-      players.reject! { |player| player =~ /_mac$/ } if RUBY_PLATFORM !~ /darwin/
-      players.reject! { |player| player =~ /_windows$/ } if RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
-      players
+    def platform
+      @platform ||= begin
+        host_os = RbConfig::CONFIG["host_os"]
+        case host_os
+        when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+          :windows
+        when /darwin|mac os/
+          :mac
+        when /linux/
+          :linux
+        when /solaris|bsd/
+          :unix
+        else
+          @errors << "Unknown operating system #{host_os.inspect}"
+          nil
+        end
+      end
     end
 
     def player_load(player)
+      log "#{player}:"
       begin
         require "anyplayer/players/#{player}"
-        $stderr.puts "Loaded #{player}" if verbose
+        log "  loaded"
         true
       rescue LoadError => e
-        $stderr.puts "Could not load #{player}" if verbose
+        log "  #{e.message}"
         @errors << "Error loading #{player}: #{e.message}"
         false
       end
     end
 
-    def player_class(player)
-      camelized = player.to_s.split(/_/).map{ |word| word.capitalize }.join
-      Anyplayer::const_get(camelized)
+    def player_on_platform?(player)
+      result = player.platforms.include?(platform)
+      log "  not on platform" unless result
+      result
     end
 
-    def player_launched(player)
-      $stderr.puts "#{player.name} launched?" if verbose
+    def player_class(player)
+      camelized = player.to_s.split(/_/).map(&:capitalize).join
+      Anyplayer.const_get(camelized)
+    end
 
+    def player_launched?(player)
       seconds = 5
       begin
-        Timeout::timeout(seconds) { player.launched? }
+        Timeout.timeout(seconds) do
+          launched = player.launched?
+          log launched ? "  launched" : "  not launched"
+          launched
+        end
       rescue Timeout::Error
-        $stderr.puts "Timed out after #{seconds} seconds" if verbose
+        log "  timed out after #{seconds} seconds"
         false
       end
     end
+
+    def log(text)
+      $stderr.puts text if verbose
+    end
+  end
 end

data/lib/anyplayer/version.rb

@@ -1,3 +1,3 @@
 module Anyplayer
-  VERSION = "1.1.2"
+  VERSION = "1.2.1"
 end

data/test/anyplayer_test.rb

@@ -1,9 +1,15 @@
 require "test_helper"
 
-class AnyplayerTest < MiniTest::Unit::TestCase
-  # def test_loading_all_players_does_not_explode
-  #   PLAYERS.each do |player|
-  #     require "anyplayer/players/#{player}"
-  #   end
-  # end
+class AnyplayerTest < Minitest::Test
+  def test_loading_all_players_does_not_explode
+    PLAYERS.each do |player|
+      require "anyplayer/players/#{player}"
+    end
+  rescue LoadError
+    # Allow LoadErrors that depend on Windows
+  end
+
+  def test_launched
+    assert_kind_of Anyplayer::Player, Anyplayer.launched
+  end
 end

data/test/command_line_test.rb

@@ -0,0 +1,150 @@
+require "test_helper"
+require "anyplayer/command_line"
+
+class CommandLineTest < Minitest::Test
+  USAGE = "Usage: anyplayer [-v] [command]
+
+Where command is one of: playpause, play, pause, next, prev, voldown, volup, volume, track, artist, album, vote, name, launched, paused, playing.
+
+Player connected: Fake Player.
+"
+
+  def setup
+    @player = flexmock(:player)
+    @selector = flexmock(:selector)
+    @selector.should_receive(:player).and_return(@player)
+    flexmock(Anyplayer::Selector).should_receive(:new).and_return(@selector)
+  end
+
+  def test_no_command
+    flexmock(@player).should_receive(:name).once.and_return("Fake Player")
+    flexmock($stderr).should_receive(:puts).once.with(USAGE)
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once.with(1)
+    Anyplayer::CommandLine.parse(%w())
+  end
+
+  def test_wrong_command
+    flexmock(@player).should_receive(:name).once.and_return("Fake Player")
+    flexmock($stderr).should_receive(:puts).once.with(USAGE)
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once.with(1)
+    Anyplayer::CommandLine.parse(%w(err))
+  end
+
+  def test_verbose
+    # flexmock(@player).should_receive(:name).once.and_return("Foo")
+    flexmock(@player).should_receive(:play).once
+    flexmock(@selector).should_receive(:verbose=).once.with(true)
+    flexmock($stderr).should_receive(:puts).once.with(/^anyplayer v[0-9.]+$/)
+    Anyplayer::CommandLine.parse(%w(-v play))
+  end
+
+  # Actions
+
+  def test_playpause
+    flexmock(@player).should_receive(:playpause).once
+    Anyplayer::CommandLine.parse(%w(playpause))
+  end
+
+  def test_play
+    flexmock(@player).should_receive(:play).once
+    Anyplayer::CommandLine.parse(%w(play))
+  end
+
+  def test_pause
+    flexmock(@player).should_receive(:pause).once
+    Anyplayer::CommandLine.parse(%w(pause))
+  end
+
+  def test_next
+    flexmock(@player).should_receive(:next).once
+    Anyplayer::CommandLine.parse(%w(next))
+  end
+
+  def test_prev
+    flexmock(@player).should_receive(:prev).once
+    Anyplayer::CommandLine.parse(%w(prev))
+  end
+
+  def test_voldown
+    flexmock(@player).should_receive(:voldown).once
+    Anyplayer::CommandLine.parse(%w(voldown))
+  end
+
+  def test_volup
+    flexmock(@player).should_receive(:volup).once
+    Anyplayer::CommandLine.parse(%w(volup))
+  end
+
+  def test_vote
+    flexmock(@player).should_receive(:vote).once
+    Anyplayer::CommandLine.parse(%w(vote))
+  end
+
+  def test_volume
+    flexmock(@player).should_receive(:volume).once.and_return(42)
+    flexmock($stdout).should_receive(:puts).once.with(42)
+    Anyplayer::CommandLine.parse(%w(volume))
+  end
+
+  def test_track
+    flexmock(@player).should_receive(:track).once.and_return("Foo")
+    flexmock($stdout).should_receive(:puts).once.with("Foo")
+    Anyplayer::CommandLine.parse(%w(track))
+  end
+
+  def test_artist
+    flexmock(@player).should_receive(:artist).once.and_return("Foo")
+    flexmock($stdout).should_receive(:puts).once.with("Foo")
+    Anyplayer::CommandLine.parse(%w(artist))
+  end
+
+  def test_album
+    flexmock(@player).should_receive(:album).once.and_return("Foo")
+    flexmock($stdout).should_receive(:puts).once.with("Foo")
+    Anyplayer::CommandLine.parse(%w(album))
+  end
+
+  def test_name
+    flexmock(@player).should_receive(:name).once.and_return("Foo")
+    flexmock($stdout).should_receive(:puts).once.with("Foo")
+    Anyplayer::CommandLine.parse(%w(name))
+  end
+
+  # Booleans
+
+  def test_launched_true
+    flexmock(Anyplayer::CommandLine).should_receive(:exit) # .with(1)
+    flexmock(@player).should_receive(:launched?).once.and_return(true)
+    Anyplayer::CommandLine.parse(%w(launched))
+  end
+
+  def test_launched_false
+    flexmock(Anyplayer::CommandLine).should_receive(:exit) # .with(0)
+    flexmock(@player).should_receive(:launched?).once.and_return(false)
+    Anyplayer::CommandLine.parse(%w(launched))
+  end
+
+  def test_playing_true
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once # .with(1)
+    flexmock(@player).should_receive(:playing?).once.and_return(true)
+    Anyplayer::CommandLine.parse(%w(playing))
+  end
+
+  def test_playing_false
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once # .with(0)
+    flexmock(@player).should_receive(:playing?).once.and_return(false)
+    Anyplayer::CommandLine.parse(%w(playing))
+  end
+
+  def test_paused_true
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once # .with(1)
+    flexmock(@player).should_receive(:paused?).once.and_return(true)
+    Anyplayer::CommandLine.parse(%w(paused))
+  end
+
+  def test_paused_false
+    flexmock(Anyplayer::CommandLine).should_receive(:exit).once # .with(0)
+    flexmock(@player).should_receive(:paused?).once.and_return(false)
+    Anyplayer::CommandLine.parse(%w(paused))
+  end
+end

data/test/player_test.rb

@@ -1,12 +1,51 @@
 require "test_helper"
 
-class PlayerTest < MiniTest::Unit::TestCase
-  include FlexMock::TestCase
-
+class PlayerTest < Minitest::Test
   def setup
     @player = Noplayer.new
   end
 
+  # Default name
+
+  def test_default_name
+    assert_equal "Noplayer", @player.name
+  end
+
+  def test_default_name_should_remove_namespace
+    flexmock(@player).should_receive(:class).and_return("Foo::Bar")
+    assert_equal "Bar", @player.name
+  end
+
+  # Default paused?
+
+  def test_paused_is_false_if_not_playing
+    flexmock(@player).should_receive(:playing?).once.and_return(false)
+    assert @player.paused?
+  end
+
+  def test_paused_is_true_if_not_paused
+    flexmock(@player).should_receive(:playing?).once.and_return(true)
+    assert !@player.paused?
+  end
+
+  # Default playpause
+
+  def test_playpause_toggles_play
+    flexmock(@player).should_receive(:paused?).once.and_return(true)
+    flexmock(@player).should_receive(:play).once
+
+    @player.playpause
+  end
+
+  def test_playpause_toggles_pause
+    flexmock(@player).should_receive(:paused?).once.and_return(false)
+    flexmock(@player).should_receive(:pause).once
+
+    @player.playpause
+  end
+
+  # Votes
+
   def test_votes
     Player::DEFAULT_VOTES_TO_SKIP.times do |i|
       @player.vote
@@ -16,7 +55,7 @@ class PlayerTest < MiniTest::Unit::TestCase
         assert_equal @player.votes, 0
       else
         assert_equal @player.votes, i + 1
-     end
+      end
     end
   end
 
@@ -45,9 +84,7 @@ class PlayerTest < MiniTest::Unit::TestCase
         assert_equal @player.votes, 0
       else
         assert_equal @player.votes, i + 1
-     end
+      end
     end
   end
-
-
 end

data/test/players/mpd_test.rb

@@ -2,12 +2,10 @@ require "test_helper"
 require "ruby-mpd"
 require "anyplayer/players/mpd"
 
-class MpdTest < MiniTest::Unit::TestCase
-  include FlexMock::TestCase
-
+class MpdTest < Minitest::Test
   def setup
     @mpd_instance_mock = flexmock("mpd")
-    flexmock(MPD, "MPD", :new => @mpd_instance_mock)
+    flexmock(MPD, "MPD", new: @mpd_instance_mock)
   end
 
   def test_uses_ruby_mpd_gem

data/test/selector_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-class AnyplayerTest < MiniTest::Unit::TestCase
+class AnyplayerTest < Minitest::Test
   def test_player
     selector = Selector.new
     player = selector.player
@@ -19,7 +19,7 @@ class AnyplayerTest < MiniTest::Unit::TestCase
     selector = Selector.new
     selector.verbose = true
 
-    assert_output nil, "Loaded noplayer\nNoplayer launched?\n" do
+    assert_output nil, "noplayer:\n  loaded\n  launched\n" do
       selector.player
     end
   end

data/test/test_helper.rb

@@ -1,6 +1,5 @@
-require "minitest/unit"
 require "minitest/autorun"
-require "flexmock/test_unit"
+require "flexmock/minitest"
 require "anyplayer"
 
 require "anyplayer/players/noplayer"

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyplayer
 version: !ruby/object:Gem::Version
-  version: 1.1.2
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - Sunny Ripert
@@ -10,54 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2020-12-19 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
-    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'
 - !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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Play/pause/skip songs in iTunes Mac, iTunes Windows, Spotify Mac, Rdio
@@ -70,16 +77,18 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .envrc
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
 - anyplayer.gemspec
 - bin/anyplayer
+- bin/rake
 - lib/anyplayer.rb
 - lib/anyplayer/command_line.rb
 - lib/anyplayer/player.rb
@@ -95,6 +104,7 @@ files:
 - lib/anyplayer/selector.rb
 - lib/anyplayer/version.rb
 - test/anyplayer_test.rb
+- test/command_line_test.rb
 - test/player_test.rb
 - test/players/mpd_test.rb
 - test/selector_test.rb
@@ -102,36 +112,29 @@ files:
 homepage: http://github.com/sunny/anyplayer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4308262987889258544
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4308262987889258544
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Interact with the running music player
 test_files:
 - test/anyplayer_test.rb
+- test/command_line_test.rb
 - test/player_test.rb
 - test/players/mpd_test.rb
 - test/selector_test.rb