mumbletune 0.1.0 → 0.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mumbletune (0.1.0)
+    mumbletune (0.1.1)
       eventmachine
       meta-spotify
       mumble-ruby

data/README.md

@@ -4,12 +4,12 @@ MUMBLETUNE is an amiable bot that connects to a mumble server and allows users t
 
 ## Installation
 
-First, install Hexxeh's (spotify-websocket-api)[https://github.com/Hexxeh/spotify-websocket-api].
+First, install Hexxeh's [spotify-websocket-api](https://github.com/Hexxeh/spotify-websocket-api).
 
     git clone git://github.com/Hexxeh/spotify-websocket-api.git
     cd spotify-websocket-api
     python setup.py build
-    puthon setup.py install
+    python setup.py install
 
 Then, add this line to your application's Gemfile:
 

data/conf.example.yaml

@@ -0,0 +1,15 @@
+spotify:
+        username: "sp_username"
+        password: "sp_password"
+        region: "us"
+mumble:
+        host: "mumble-server.example.com"
+        port: 64738
+        username: "mumbletune"
+        password: "server_password"
+        channel: "Music Room"
+mpd:
+        host: "localhost"
+        port: 6600
+        fifo_out: "/tmp/mumble.fifo"
+        default_volume: 60

data/lib/mumbletune/mpd_client.rb

@@ -14,14 +14,15 @@ module Mumbletune
 			@history = Array.new
 			@prev_id = 0
 
-			self.default_volume
+			self.defaults
 			self.establish_callbacks
 		end
 
 		# Setup
 
-		def default_volume
+		def defaults
 			@mpd.volume = Mumbletune.config["mpd"]["default_volume"] || 100
+			@mpd.consume = true
 		end
 
 		def establish_callbacks
@@ -91,13 +92,20 @@ module Mumbletune
 		end
 
 		def queue
-			# associate known Tracks with Queue items
-			mapped_queue = @mpd.queue.map do |mpd_song|
+			# Combine the future queue with the current track.
+			#   MPD puts the current track in its queue only if
+			#   other tracks are queued to play. Account for this.
+			queue = @mpd.queue.unshift @mpd.current_song
+			queue.delete_at(0) if queue[1] && queue[0] == queue[1]
+
+			# Associate known Tracks with Queue items.
+			mapped_queue = queue.map do |mpd_song|
 				t = Track.retreive_from_mpd_id(mpd_song.id)
-				t.queue_pos = mpd_song.pos
-				t
+				if t
+					t.queue_pos = mpd_song.pos
+					t
+				end
 			end
-			# mapped_queue.delete_if { |t| t == current_song }
 			mapped_queue
 		end
 
@@ -126,37 +134,6 @@ module Mumbletune
 			end
 		end
 
-		
-=begin 
-		# Deprecated add methods. Time to remove?
-
-		def add(track)
-			id = @mpd.addid track.url
-			track.mpd_id = id
-		end
-
-		def add_batch(tracks)
-			tracks.each do |t|
-				id = @mpd.addid t.url
-				t.mpd_id = id
-			end
-		end
-
-		def add_now(track)
-			id = @mpd.addid track.url, 1
-			track.mpd_id = id
-			@mpd.next
-		end
-
-		def add_now_batch(tracks)
-			tracks.each do |t|
-				id = @mpd.addid t.url, tracks.index(t)+1
-				t.mpd_id = id
-			end
-			@mpd.next
-		end
-=end
-
 		# Playback commands
 
 		def play

data/lib/mumbletune/version.rb

@@ -1,3 +1,3 @@
 module Mumbletune
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumbletune
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -203,6 +203,7 @@ files:
 - README.md
 - Rakefile
 - bin/mumbletune
+- conf.example.yaml
 - docs/commands.md
 - lib/mumbletune.rb
 - lib/mumbletune/collection.rb