ruby-mpd 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49bd6de309c1177f46f4ab1c1f049cf5139bebe4
-  data.tar.gz: 718d011451c59c356bf32260fd2c512dc444e68b
+  metadata.gz: 3d1c4e3976d91cea9da096a4d4c16c3c0cc6a5e4
+  data.tar.gz: 632f1d4b4928a249c28446b8202aa930dbbce9f5
 SHA512:
-  metadata.gz: 4c78a607aa4a0242dae9535c9404800352579c9566bb8a6b4e19445fc32183e524a194fd57bcf7c9d7ca83a2cbbb5167ab19621bee7072d056372002cc801dea
-  data.tar.gz: d7484a6502644919540a4148782b39e67d85cc4ac78f3cab32b525e52cf5168639273f45b2162202e08195c37377fc183066a45409924a0edb3df673b063800e
+  metadata.gz: d30486b01ba069e82431f03b66743f48a6d8c3c943a1a2794c9dcc3543f2d17da5c939717101ccc3595982ebe15850e4011b56cffdd00c01c10e5dec5e13915e
+  data.tar.gz: 70d07b44d2c8b10d41f249822135d8f74ae638143ab2294affe08ed54db6127b2563f5bb300482e24f1fe31a8ba0d3d8927c6a077eee0d8351390a548a5ae315

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.2.2
+cache: bundler
+before_install:
+  - gem install bundler

data/Gemfile

@@ -3,4 +3,6 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ruby-mpd.gemspec
 gemspec
 
-gem 'pry'
+gem 'pry-byebug'
+gem 'pry-stack_explorer'
+gem 'simplecov', :require => false, :group => :tes

data/README.md

@@ -1,5 +1,8 @@
 # ruby-mpd
 
+[![Build Status](https://travis-ci.org/archSeer/ruby-mpd.svg?branch=master)](https://travis-ci.org/archSeer/ruby-mpd)
+[![Code Climate](https://codeclimate.com/github/archSeer/ruby-mpd/badges/gpa.svg)](https://codeclimate.com/github/archSeer/ruby-mpd)
+
 ruby-mpd is a powerful object-oriented client for the  [Music Player Daemon](http://www.musicpd.org), forked from librmpd. librmpd is as of writing outdated by 6 years! This library tries to act as a successor, originally using librmpd as a base, however almost all of the codebase was rewritten. ruby-mpd supports all "modern" MPD features as well as callbacks.
 
 ## MPD Protocol
@@ -45,7 +48,7 @@ mpd.disconnect
 Once connected, you can issue commands to talk to the server.
 
 ```ruby
-mpd.connect    
+mpd.connect
 mpd.play if mpd.stopped?
 song = mpd.current_song
 puts "Current Song: #{song.artist} - #{song.title}"
@@ -178,7 +181,7 @@ end
 ```
 
 One can also use separate methods or Procs and whatnot, just pass them in as a parameter.
-  
+
 ```ruby
 # Using a Proc
 proc = Proc.new { |volume| puts “Volume was set to #{volume}.” }
@@ -207,7 +210,7 @@ ruby-mpd supports callbacks for any of the keys returned by `MPD#status`, as wel
 * *songid*: playlist songid of the current song stopped on or playing.
 * *nextsong*: playlist song number of the next song to be played.
 * *nextsongid*: playlist songid of the next song to be played.
-* *time*: Returns two variables, `total` and `elapsed`, Integers representing seconds.
+* *time*: Returns two integers, `elapsed` and `total`, Integers representing seconds.
 * *elapsed*: Float, representing total time elapsed within the current song, but with higher accuracy.
 * *bitrate*: instantaneous bitrate in kbps.
 * *xfade*: crossfade in seconds
@@ -218,7 +221,7 @@ ruby-mpd supports callbacks for any of the keys returned by `MPD#status`, as wel
 * *error*: if there is an error, returns message here
 
 * *connection*: Are we connected to the daemon? true or false
- 
+
 Note that if the callback returns more than one value, the callback needs more arguments in order to recieve those values:
 
 ```ruby
@@ -266,7 +269,13 @@ Idle seems like a possible way to reimplement callbacks; make a separate connect
 
 ### Tests
 
-Tests fail at the moment, as they are 6 years old. The entire MPD server mock class either needs to be rewritten, or a `mpd.conf` along with a sample database and instructions for a controlled environment needs to be written.
+There is the beginings of a test suite, that can be ran with:
+
+```
+$ bin/rspec spec/
+```
+
+The entire MPD server mock class either needs to be rewritten, or a `mpd.conf` along with a sample database and instructions for a controlled environment needs to be written.
 
 ## TODO list
 

data/Rakefile

@@ -5,6 +5,12 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
+begin
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
+rescue LoadError
+end
+
 desc "Open an irb session preloaded with this API"
 task :console do
   require 'ruby-mpd'
@@ -13,4 +19,4 @@ task :console do
   IRB.start
 end
 
-task :default => :test
+task :default => [:test, :spec]

data/bin/rspec

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/lib/ruby-mpd.rb

@@ -186,11 +186,11 @@ class MPD
   # @return (see #handle_server_response)
   # @raise [MPDError] if the command failed.
   def send_command(command, *args)
-    raise ConnectionError, "Not connected to the server!" unless @socket
+    raise ConnectionError, "Not connected to the server!" unless socket
 
     @mutex.synchronize do
       begin
-        @socket.puts convert_command(command, *args)
+        socket.puts convert_command(command, *args)
         response = handle_server_response
         return parse_response(command, response)
       rescue Errno::EPIPE
@@ -253,7 +253,7 @@ private
   def handle_server_response
     msg = ''
     while true
-      case line = @socket.gets
+      case line = socket.gets
       when "OK\n", nil
         break
       when /^ACK/

data/lib/ruby-mpd/parser.rb

@@ -4,7 +4,7 @@ class MPD
   # Parser module, being able to parse messages to and from the MPD daemon format.
   # @todo There are several parser hacks. Time is an array in status and a normal
   #   string in MPD::Song, so we do`@time = options.delete(:time) { [nil] }.first`
-  #   to hack the array return. Playlist names are strings, whilst in status it's 
+  #   to hack the array return. Playlist names are strings, whilst in status it's
   #   and int, so we parse it as an int if it's parsed as non-zero (if it's 0 it's a string)
   #   and to fix numeric name playlists (123.m3u), we convert the name to_s inside
   #   MPD::Playlist too.
@@ -73,7 +73,13 @@ class MPD
         Time.at(value.to_i)
       elsif key == :"last-modified"
         Time.iso8601(value)
-      elsif [:time, :audio].include? key
+      elsif key == :time
+        if value.include?(':')
+          value.split(':').map(&:to_i)
+        else
+          [nil, value.to_i]
+        end
+      elsif key == :audio
         value.split(':').map(&:to_i)
       else
         value.force_encoding('UTF-8')
@@ -114,7 +120,7 @@ class MPD
 
     # Remove lines which we don't want.
     def filter_lines(string, filter)
-      string.lines.reject {|line| line =~ /(#{filter.join('|')}):/}.join
+      string.lines.reject {|line| line =~ /(#{filter.join('|')}):/i}.join
     end
 
     # Make chunks from string.

data/lib/ruby-mpd/playlist.rb

@@ -25,14 +25,16 @@ class MPD
     # @return [Array<MPD::Song>] songs in the playlist.
     def songs
       result = @mpd.send_command(:listplaylistinfo, @name)
-      if result.to_s =~ URI::regexp
-        Song.new(@mpd, {:file => result, :time => 0})
-      else
-        result.map {|hash| Song.new(@mpd, hash) }
+      result.map do |hash|
+        if hash[:file] && !hash[:file].match(/^(https?:\/\/)?/)[0].empty?
+          Song.new(@mpd, {:file => hash[:file], :time => [0]})
+        else
+          Song.new(@mpd, hash)
+        end
       end
     rescue TypeError
       puts "Files inside Playlist '#{@name}' do not exist!"
-      return nil
+      return []
     rescue NotFound
       return [] # we rescue in the case the playlist doesn't exist.
     end

data/lib/ruby-mpd/plugins/controls.rb

@@ -21,7 +21,7 @@ class MPD
       def play(pos = nil)
         if pos.is_a?(Hash)
           if pos[:id]
-            send_command :playid, priority, pos[:id]
+            send_command :playid, pos[:id]
           else
             raise ArgumentError, 'Only :id key is allowed!'
           end

data/lib/ruby-mpd/plugins/database.rb

@@ -91,7 +91,7 @@ class MPD
         else
           command = options[:strict] ? :find : :search
         end
-      
+
         response = send_command(command, params)
         if response == true
           return true

data/lib/ruby-mpd/song.rb

@@ -10,7 +10,7 @@ class MPD::Song
   def initialize(mpd, options)
     @mpd = mpd
     @data = {} # allowed fields are @types + :file
-    @time = options.delete(:time) { [nil] }.first # HAXX for array return
+    @time = options.delete(:time) # an array of 2 items where last is time
     @file = options.delete(:file)
     @title = options.delete(:title)
     @artist = options.delete(:artist)
@@ -19,23 +19,42 @@ class MPD::Song
     @data.merge! options
   end
 
-  # Two songs are the same when they are the same file.
+  # Two songs are the same when they share the same hash.
   def ==(another)
-    self.class == another.class && self.file == another.file
+    to_h == another.to_h
+  end
+
+  def to_h
+    {
+      time: @time,
+      file: @file,
+      title: @title,
+      artist: @artist,
+      album: @album,
+      albumartist: @albumartist
+    }.merge(@data)
+  end
+
+  def elapsed
+    @time.first
+  end
+
+  def track_length
+    @time.last
   end
 
   # @return [String] A formatted representation of the song length ("1:02")
   def length
-    return '--:--' if @time.nil?
-    "#{@time / 60}:#{"%02d" % (@time % 60)}"
+    return '--:--' if track_length.nil?
+    "#{track_length / 60}:#{"%02d" % (track_length % 60)}"
   end
- 
+
   # Retrieve "comments" metadata from a file and cache it in the object.
   #
   # @return [Hash] Key value pairs from "comments" metadata on a file.
   # @return [Boolean] True if comments are empty
   def comments
-      @comments ||= @mpd.send_command :readcomments, @file
+    @comments ||= @mpd.send_command :readcomments, @file
   end
 
   # Pass any unknown calls over to the data hash.
@@ -49,4 +68,6 @@ class MPD::Song
       raise NoMethodError, "#{m}"
     end
   end
+
+  alias :eql? :==
 end

data/lib/ruby-mpd/version.rb

@@ -1,3 +1,3 @@
 class MPD
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

data/ruby-mpd.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "ruby-mpd"
   spec.version       = MPD::VERSION
   spec.authors       = ["Blaž Hrastnik"]
-  spec.email         = ["speed.the.bboy@gmail.com"]
+  spec.email         = ["blaz@mxxn.io"]
 
   spec.summary       = "Modern client library for MPD"
   spec.description   = "A powerful, modern and feature complete library for the Music Player Daemon"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Blaž Hrastnik
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,18 +69,21 @@ dependencies:
 description: A powerful, modern and feature complete library for the Music Player
   Daemon
 email:
-- speed.the.bboy@gmail.com
+- blaz@mxxn.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - COPYING
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - lib/ruby-mpd.rb
 - lib/ruby-mpd/exceptions.rb