anyplayer 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7c0e8833c889429188b5c5ff92bd15ce9d97986
-  data.tar.gz: 7db1340983fa012cb778bad3ccb86975d0be6ebb
+  metadata.gz: 7ce9982f42d4ae01c721cf82f4fc09a4fc61740c
+  data.tar.gz: ea519d8ba4bde8f84b3e2ad253ce6e276c98673e
 SHA512:
-  metadata.gz: 0723be193d651281e960aa660bf0fa58a732470866225b5cccb578d9ef469549c2fc3d9ad4f1fc3eab50db825df9e08bb27efad5b89d98cdc6c03ae2d78f6cb9
-  data.tar.gz: 72929df7fd5b6e422174a97377261531dd99a0f5ce65a595e08b5fedbc1f3b5d886fa98d63e9b4344798678e78a304bd331b6b016bc8cc222dbd01ec52e7c127
+  metadata.gz: e488e5dca3e611699ffea03d075cd25a6c5376325974e2be1eabdc714cdc4e18b77f612dcbb2e0465e1508498d83f9b9b3e06c35a8f38de40c7c5926e526f619
+  data.tar.gz: 73788384a220e2b6434c7f966f3475ac281408c054af4de10e13e98f96b98e547dbb4aebfbfbf1d4c03bcdc4e8d3b3b9e0ddc2e005829d7fabc71a71c9d7a227

data/CHANGELOG.md

@@ -3,6 +3,13 @@ Changelog
 
 Anyplayer tries its best to follow Semantic Versioning.
 
+## v1.1.5 (2014-07-07)
+
+Bugfixes:
+
+- Better platform detection by letting players list the platforms
+  they are intended to work on.
+
 ## v1.1.4 (2014-07-07)
 
 Bugfixes:

data/CONTRIBUTING.md

@@ -0,0 +1,22 @@
+Contributing
+============
+
+All contributions are welcome! Head to the [Github issues](https://github.com/sunny/anyplayer/issues) to report bugs, questions or code.
+
+
+Submit code
+-----------
+
+1. Fork the repository on Github
+1. Create a topic branch
+1. Implement your feature and the accompanying tests
+1. Run `rake test` to make sure the tests are passing
+1. Add documentation for your feature or bug fix
+1. Add, commit, and push your changes
+1. Submit a pull request
+
+
+Versionning
+-----------
+
+This library aims to adhere to [Semantic Versioning 2.0](http://semver.org/).

data/Gemfile

@@ -1,7 +1,5 @@
 source "http://rubygems.org"
 
-gem "rake"
-
 # Gem dependencies in anyplayer.gemspec
 gemspec
 

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    anyplayer (1.1.3)
+    anyplayer (1.1.5)
       ruby-mpd (~> 0.3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     flexmock (1.3.3)
-    minitest (5.3.1)
-    rake (0.9.2.2)
-    ruby-mpd (0.3.1)
+    minitest (5.4.1)
+    rake (10.3.2)
+    ruby-mpd (0.3.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -62,9 +62,13 @@ 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
+Contribute!
 -----------
 
+All contributions are welcome! Head to the [Github issues](https://github.com/sunny/anyplayer/issues) to report bugs, questions or code. Also, check out `CONTRIBUTING.md`.
+
+Here a few useful commands while developping:
+
 ```sh
 $ ruby -Ilib bin/anyplayer  # Use the anyplayer command-line from source
 $ bundle exec rake test     # Launch tests
@@ -72,7 +76,6 @@ $ bundle exec rake install  # Install from source
 $ bundle exec rake console  # Launch console
 ```
 
-All contributions are welcome! Head to the [Github issues](https://github.com/sunny/anyplayer/issues) to report bugs, questions or code.
 
 License
 -------

data/anyplayer.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'ruby-mpd', '~> 0.3.0'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'flexmock'
+  s.add_development_dependency 'rake'
 end

data/lib/anyplayer/player.rb

@@ -1,4 +1,4 @@
-# Default Player class that is inherrited by all players.
+# Default Player class that is inherited by all players.
 #
 # All players should override these methods:
 #   launched? (return bool)
@@ -70,6 +70,11 @@ class Anyplayer::Player
     reset_votes
   end
 
+  # Operating systems where this player should work
+  def platforms
+    [:mac, :windows, :linux, :unix]
+  end
+
 
   private
 

data/lib/anyplayer/players/amarok.rb

@@ -46,7 +46,13 @@ class Anyplayer::Amarok < Anyplayer::Player
   end
 
   def launched?
-    not %x(qdbus org.kde.amarok 2>&1).match(/does not exist|command not found|cannot find the path specified/)
+    not %x(qdbus org.kde.amarok 2>&1).match(
+      /does not exist|not found|cannot find the path specified/
+    )
+  end
+
+  def platforms
+    [:unix, :linux]
   end
 
 

data/lib/anyplayer/players/itunes_mac.rb

@@ -51,14 +51,18 @@ class Anyplayer::ItunesMac < Anyplayer::Player
   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
+    %x(osascript -e 'app "iTunes" is running').rstrip == "true"
   end
 
   def name
     "iTunes Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
+
   private
 
   def itunes(command)

data/lib/anyplayer/players/itunes_windows.rb

@@ -1,7 +1,7 @@
 begin
   require 'win32ole'
 rescue LoadError => e
-  raise LoadError.new("#{e.message} -- You probably aren't on Windows")
+  raise LoadError.new("#{e.message} - You probably aren't on Windows")
 end
 
 class Anyplayer::ItunesWindows < Anyplayer::Player
@@ -59,6 +59,10 @@ class Anyplayer::ItunesWindows < Anyplayer::Player
     "iTunes Windows"
   end
 
+  def platforms
+    [:windows]
+  end
+
 
   private
 

data/lib/anyplayer/players/mpd.rb

@@ -2,10 +2,9 @@
 begin
   require 'ruby-mpd'
 rescue LoadError => e
-  raise LoadError.new "#{e.message} — please install ruby-mpd gem"
+  raise LoadError.new "#{e.message} — Please install the ruby-mpd gem"
 end
 
-
 class Anyplayer::Mpd < Anyplayer::Player
   def initialize
     @mpc = false

data/lib/anyplayer/players/rdio_mac.rb

@@ -51,14 +51,17 @@ class Anyplayer::RdioMac < Anyplayer::Player
   end
 
   def launched?
-    nb = %x(osascript -e 'tell app "System Events" to count (every process whose name is "rdio")' 2>/dev/null).rstrip
-    nb.match(/^\d+/) and nb.to_i > 0 ? true : false
+    %x(osascript -e 'app "rdio" is running').rstrip == "true"
   end
 
   def name
     "Rdio Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
 
   private
 

data/lib/anyplayer/players/rhythmbox.rb

@@ -49,6 +49,7 @@ class Anyplayer::Rhythmbox < Anyplayer::Player
     %x(rhythmbox-client --no-start --print-playing 2>/dev/null).rstrip != ""
   end
 
+
   private
 
   def rhythmbox(command)

data/lib/anyplayer/players/spotify_mac.rb

@@ -51,18 +51,21 @@ class Anyplayer::SpotifyMac < Anyplayer::Player
   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
+    %x(osascript -e 'app "Spotify" is running').rstrip == "true"
   end
 
   def name
     "Spotify Mac"
   end
 
+  def platforms
+    [:mac]
+  end
+
 
   private
 
   def spotify(command)
-    %x(osascript -e 'tell app "spotify" to #{command}').rstrip
+    %x(osascript -e 'tell app "Spotify" to #{command}').rstrip
   end
 end

data/lib/anyplayer/players/xmms2.rb

@@ -64,6 +64,10 @@ class Anyplayer::Xmms2 < Anyplayer::Player
     ENV['XMMS_PATH'] || super
   end
 
+  def platforms
+    [:unix, :linux]
+  end
+
 
   private
 

data/lib/anyplayer/selector.rb

@@ -1,3 +1,5 @@
+require "rbconfig"
+
 # The Selector is the tool that will find you the currently running player on your platform
 #
 # Example:
@@ -7,62 +9,93 @@
 #   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) or 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) or next
 
+        if player_launched?(instance)
+          return instance
+        end
+      end
+      nil
+    end
 
-  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
-  end
+    private
 
-  def player_load(player)
-    begin
-      require "anyplayer/players/#{player}"
-      $stderr.puts "Loaded #{player}" if verbose
-      true
-    rescue LoadError => e
-      $stderr.puts "Could not load #{player}" if verbose
-      @errors << "Error loading #{player}: #{e.message}"
-      false
+    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
-  end
 
-  def player_class(player)
-    camelized = player.to_s.split(/_/).map{ |word| word.capitalize }.join
-    Anyplayer::const_get(camelized)
-  end
+    def player_load(player)
+      log "#{player}:"
+      begin
+        require "anyplayer/players/#{player}"
+        log "  loaded"
+        true
+      rescue LoadError => e
+        log "  #{e.message}"
+        @errors << "Error loading #{player}: #{e.message}"
+        false
+      end
+    end
+
+    def player_on_platform?(player)
+      result = player.platforms.include?(platform)
+      log "  not on platform" if !result
+      result
+    end
 
-  def player_launched(player)
-    $stderr.puts "#{player.name} launched?" if verbose
+    def player_class(player)
+      camelized = player.to_s.split(/_/).map{ |word| word.capitalize }.join
+      Anyplayer::const_get(camelized)
+    end
+
+    def player_launched?(player)
+      seconds = 5
+      begin
+        Timeout::timeout(seconds) do
+          launched = player.launched?
+          log launched ? "  launched" : "  not launched"
+          launched
+        end
+      rescue Timeout::Error
+        log "  timed out after #{seconds} seconds"
+        false
+      end
+    end
 
-    seconds = 5
-    begin
-      Timeout::timeout(seconds) { player.launched? }
-    rescue Timeout::Error
-      $stderr.puts "Timed out after #{seconds} seconds" if verbose
-      false
+    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.4"
+  VERSION = "1.1.5"
 end

data/test/selector_test.rb

@@ -19,7 +19,7 @@ class AnyplayerTest < Minitest::Test
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: anyplayer
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Sunny Ripert
@@ -9,48 +9,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-mpd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 - !ruby/object:Gem::Dependency
   name: flexmock
   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'
+- !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
@@ -63,10 +77,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".envrc"
-- ".gitignore"
-- ".travis.yml"
+- .envrc
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -104,17 +119,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Interact with the running music player