ruby-mpd 0.3.1 → 0.3.2

data/Rakefile

@@ -1,3 +1,4 @@
+require "bundler/gem_tasks"
 require 'rake/testtask'
 
 Rake::TestTask.new(:test) do |test|
@@ -6,7 +7,6 @@ end
 
 desc "Open an irb session preloaded with this API"
 task :console do
-  $:.unshift(File.expand_path('../lib', __FILE__))
   require 'ruby-mpd'
   require 'irb'
   ARGV.clear

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "ruby/mpd"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,7 @@
+#!/bin/bash
+set -euo pipefail
+IFS=$'\n\t'
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/ruby-mpd.rb

@@ -54,20 +54,13 @@ class MPD
     @hostname = hostname
     @port = port
     @options = {callbacks: false}.merge(opts)
+    @password = opts.delete(:password) || nil
     reset_vars
 
     @mutex = Mutex.new
     @callbacks = {}
   end
 
-  # Initialize instance variables on new object, or on disconnect.
-  def reset_vars
-    @socket = nil
-    @version = nil
-    @tags = nil
-  end
-  private :reset_vars
-
   # This will register a block callback that will trigger whenever
   # that specific event happens.
   #
@@ -93,44 +86,9 @@ class MPD
   # @return [void]
   def emit(event, *args)
     return unless @callbacks[event]
-    @callbacks[event].each { |handle| handle.call *args }
+    @callbacks[event].each { |handle| handle.call(*args) }
   end
 
-  # Constructs a callback loop thread and/or resumes it.
-  # @return [Thread]
-  def callback_thread
-    @cb_thread ||= Thread.new(self) do |mpd|
-      old_status = {}
-      while true
-        status = mpd.status rescue {}
-
-        status[:connection] = mpd.connected?
-
-        status[:time] ||= [nil, nil] # elapsed, total
-        status[:audio] ||= [nil, nil, nil] # samp, bits, chans
-        status[:song] = mpd.current_song
-
-        status.each do |key, val|
-          next if val == old_status[key] # skip unchanged keys
-          emit key, *val # splat arrays
-        end
-
-        old_status = status
-        sleep 0.1
-
-        unless status[:connection] || Thread.current[:stop]
-          sleep 2
-          mpd.connect rescue nil
-        end
-
-        Thread.stop if Thread.current[:stop]
-      end
-    end
-    @cb_thread[:stop] = false
-    @cb_thread.run if @cb_thread.stop?
-  end
-  private :callback_thread
-
   # Connect to the daemon.
   #
   # When called without any arguments, this will just connect to the server
@@ -139,16 +97,16 @@ class MPD
   # @return [true] Successfully connected.
   # @raise [MPDError] If connect is called on an already connected instance.
   def connect(callbacks = nil)
-    raise ConnectionError, 'Already connected!' if self.connected?
-
-    @socket = File.exists?(@hostname) ? UNIXSocket.new(@hostname) : TCPSocket.new(@hostname, @port)
+    raise ConnectionError, 'Already connected!' if connected?
 
     # by protocol, we need to get a 'OK MPD <version>' reply
     # should we fail to do so, the connection was unsuccessful
-    unless response = @socket.gets
+    unless response = socket.gets
       reset_vars
       raise ConnectionError, 'Unable to connect (possibly too many connections open)'
     end
+
+    authenticate
     @version = response.chomp.gsub('OK MPD ', '') # Read the version
 
     if callbacks
@@ -208,6 +166,10 @@ class MPD
     send_command :password, pass
   end
 
+  def authenticate
+    send_command(:password, @password) if @password
+  end
+
   # Ping the server.
   # @macro returnraise
   def ping
@@ -224,7 +186,7 @@ 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!" if !@socket
+    raise ConnectionError, "Not connected to the server!" unless @socket
 
     @mutex.synchronize do
       begin
@@ -238,7 +200,49 @@ class MPD
     end
   end
 
-  private
+private
+
+  # Initialize instance variables on new object, or on disconnect.
+  def reset_vars
+    @socket = nil
+    @version = nil
+    @tags = nil
+  end
+
+  # Constructs a callback loop thread and/or resumes it.
+  # @return [Thread]
+  def callback_thread
+    @cb_thread ||= Thread.new(self) do |mpd|
+      old_status = {}
+      while true
+        status = mpd.status rescue {}
+
+        status[:connection] = mpd.connected?
+
+        status[:time] ||= [nil, nil] # elapsed, total
+        status[:audio] ||= [nil, nil, nil] # samp, bits, chans
+        status[:song] = mpd.current_song rescue nil
+        status[:updating_db] ||= nil
+
+        status.each do |key, val|
+          next if val == old_status[key] # skip unchanged keys
+          emit key, *val # splat arrays
+        end
+
+        old_status = status
+        sleep 0.1
+
+        unless status[:connection] || Thread.current[:stop]
+          sleep 2
+          mpd.connect rescue nil
+        end
+
+        Thread.stop if Thread.current[:stop]
+      end
+    end
+    @cb_thread[:stop] = false
+    @cb_thread.run if @cb_thread.stop?
+  end
 
   # Handles the server's response (called inside {#send_command}).
   # Repeatedly reads the server's response from the socket.
@@ -265,6 +269,10 @@ class MPD
     raise SERVER_ERRORS[err[:code].to_i], "[#{err[:command]}] #{err[:message]}"
   end
 
+  def socket
+    @socket ||= File.exists?(@hostname) ? UNIXSocket.new(@hostname) : TCPSocket.new(@hostname, @port)
+  end
+
   SERVER_ERRORS = {
     1 => NotListError,
     2 => ServerArgumentError,

data/lib/ruby-mpd/parser.rb

@@ -94,7 +94,7 @@ class MPD
     def build_hash(string)
       return {} if string.nil?
 
-      string.split("\n").each_with_object({}) do |line, hash|
+      string.lines.each_with_object({}) do |line, hash|
         key, object = parse_line(line)
 
         # if val appears more than once, make an array of vals.
@@ -109,19 +109,19 @@ class MPD
     # Converts the response to MPD::Song objects.
     # @return [Array<MPD::Song>] An array of songs.
     def build_songs_list(array)
-      return array.map { |hash| Song.new(hash) }
+      return array.map { |hash| Song.new(self, hash) }
     end
 
     # Remove lines which we don't want.
     def filter_lines(string, filter)
-      string.split("\n").reject {|line| line =~ /(#{filter.join('|')}):/}.join("\n")
+      string.lines.reject {|line| line =~ /(#{filter.join('|')}):/}.join
     end
 
     # Make chunks from string.
     # @return [Array<String>]
     def make_chunks(string)
       first_key = string.match(/\A(.+?):\s?/)[1]
-      chunks = string.split(/\n(?=#{first_key})/).map(&:strip)
+      string.split(/\n(?=#{first_key})/).map(&:strip)
     end
 
     # Parses the response, determining per-command on what parsing logic

data/lib/ruby-mpd/playlist.rb

@@ -26,9 +26,9 @@ class MPD
     def songs
       result = @mpd.send_command(:listplaylistinfo, @name)
       if result.to_s =~ URI::regexp
-        Song.new({:file => result, :time => 0})
+        Song.new(@mpd, {:file => result, :time => 0})
       else
-        result.map {|hash| Song.new(hash) }
+        result.map {|hash| Song.new(@mpd, hash) }
       end
     rescue TypeError
       puts "Files inside Playlist '#{@name}' do not exist!"
@@ -78,7 +78,7 @@ class MPD
     # Moves song with SONGID in the playlist to the position SONGPOS.
     # @macro returnraise
     def move(songid, songpos)
-      @mpd.send_command :playlistmove, @name
+      @mpd.send_command :playlistmove, @name, songid, songpos
     end
 
     # Renames the playlist to +new_name+.

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

@@ -91,8 +91,13 @@ class MPD
         else
           command = options[:strict] ? :find : :search
         end
-
-        build_songs_list send_command(command, params)
+      
+        response = send_command(command, params)
+        if response == true
+          return true
+        else
+          build_songs_list response
+        end
       end
 
       # Tell the server to update the database. Optionally,
@@ -117,7 +122,7 @@ class MPD
       #
       # @return [Array<String>] Array of directory names
       def directories(path = nil)
-        return files[:directory]
+        return files(path)[:directory]
       end
 
       # Lists all of the albums in the database.

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

@@ -18,7 +18,7 @@ class MPD
       def current_song
         hash = send_command :currentsong
         # if there is no current song (we get true, then return nil)
-        hash.is_a?(TrueClass) ? nil : Song.new(hash)
+        hash.is_a?(TrueClass) ? nil : Song.new(self, hash)
       end
 
       # Waits until there is a noteworthy change in one or more of MPD's subsystems.

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

@@ -21,6 +21,13 @@ class MPD
       def disableoutput(num)
         send_command :disableoutput, num
       end
+
+      # Toggles specified output.
+      # @param [Integer] num Number of the output to enable.
+      # @macro returnraise
+      def toggleoutput(num)
+        send_command :toggleoutput, num
+      end
     end
   end
 end

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

@@ -78,7 +78,7 @@ class MPD
       # Returns the song with the +songid+ in the playlist,
       # @return [MPD::Song]
       def song_with_id(songid)
-        Song.new send_command(:playlistid, songid)
+        Song.new(self, send_command(:playlistid, songid))
       end
 
       # Searches for songs in the queue matched by the what

data/lib/ruby-mpd/song.rb

@@ -7,7 +7,8 @@ class MPD::Song
   # length in seconds
   attr_reader :file, :title, :time, :artist, :album, :albumartist
 
-  def initialize(options)
+  def initialize(mpd, options)
+    @mpd = mpd
     @data = {} # allowed fields are @types + :file
     @time = options.delete(:time) { [nil] }.first # HAXX for array return
     @file = options.delete(:file)
@@ -28,6 +29,14 @@ class MPD::Song
     return '--:--' if @time.nil?
     "#{@time / 60}:#{"%02d" % (@time % 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
+  end
 
   # Pass any unknown calls over to the data hash.
   def method_missing(m, *a)

data/lib/ruby-mpd/version.rb

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

data/ruby-mpd.gemspec

@@ -1,20 +1,26 @@
-# -*- encoding: utf-8 -*-
-$:.unshift File.expand_path("../lib", __FILE__)
-require "ruby-mpd/version"
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'ruby-mpd/version'
 
-Gem::Specification.new do |s|
-  s.platform      = Gem::Platform::RUBY
-  s.name          = 'ruby-mpd'
-  s.version       = MPD::VERSION
-  s.homepage      = 'https://github.com/archSeer/ruby-mpd'
-  s.license       = 'GPL-2'
-  s.authors       = ["Blaž Hrastnik"]
-  s.email         = ['speed.the.bboy@gmail.com']
-  s.summary       = "Modern client library for MPD"
-  s.description   = "A powerful, modern and feature complete library for the Music Player Daemon."
+Gem::Specification.new do |spec|
+  spec.name          = "ruby-mpd"
+  spec.version       = MPD::VERSION
+  spec.authors       = ["Blaž Hrastnik"]
+  spec.email         = ["speed.the.bboy@gmail.com"]
 
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  spec.summary       = "Modern client library for MPD"
+  spec.description   = "A powerful, modern and feature complete library for the Music Player Daemon"
+  spec.homepage      = "https://github.com/archSeer/ruby-mpd"
+  spec.license       = "GPL-2"
+
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  spec.add_development_dependency "bundler", "~> 1.9"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest", "~> 5.5"
+  spec.add_development_dependency "rspec", "~> 3.1"
 end

metadata

@@ -1,17 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: ruby-mpd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Blaž Hrastnik
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-01-27 00:00:00.000000000 Z
-dependencies: []
+date: 2015-05-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.5'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 description: A powerful, modern and feature complete library for the Music Player
-  Daemon.
+  Daemon
 email:
 - speed.the.bboy@gmail.com
 executables: []
@@ -20,8 +76,12 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - COPYING
-- README.rdoc
+- Gemfile
+- LICENSE.txt
+- README.md
 - Rakefile
+- bin/console
+- bin/setup
 - lib/ruby-mpd.rb
 - lib/ruby-mpd/exceptions.rb
 - lib/ruby-mpd/parser.rb
@@ -39,7 +99,6 @@ files:
 - lib/ruby-mpd/song.rb
 - lib/ruby-mpd/version.rb
 - ruby-mpd.gemspec
-- test/test_parser.rb
 homepage: https://github.com/archSeer/ruby-mpd
 licenses:
 - GPL-2
@@ -60,9 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Modern client library for MPD
-test_files:
-- test/test_parser.rb
+test_files: []
+has_rdoc: