mumbletune 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mumbletune (0.1.1)
+    mumbletune (0.1.2)
       eventmachine
       meta-spotify
       mumble-ruby
@@ -21,7 +21,14 @@ GEM
     blankslate (3.1.2)
     celt-ruby (0.0.1)
       ffi
+    columnize (0.3.6)
     daemons (1.1.9)
+    debugger (1.5.0)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.2.0)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.2.0)
     eventmachine (1.0.3)
     ffi (1.4.0)
     httparty (0.10.2)
@@ -62,5 +69,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.3)
+  debugger
   mumbletune!
   rake

data/README.md

@@ -11,15 +11,7 @@ First, install Hexxeh's [spotify-websocket-api](https://github.com/Hexxeh/spotif
     python setup.py build
     python setup.py install
 
-Then, add this line to your application's Gemfile:
-
-    gem 'mumbletune'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+Then, install the gem:
 
     $ gem install mumbletune
 

data/docs/commands.md

@@ -1,15 +1,24 @@
-Command									Action
-------									------
-play <track>					 	Queue this song.
-play <artist>						Queue 10 tracks by this artist.
-play <album>						Queue this entire album.
-play <something> now				Play this shit right now!
-what									Show what is playing, and what is queued.
-next									Jump to the next song in the queue.
-undo									Undo the last addition to the queue.
-clear									Clear the queue.
-volume?									Get the current volume level.
-volume [0-100]							Set the volume.
-------									------
+| Command                               | Action                                     |
+|---------------------------------------|--------------------------------------------|
+| play *track*                          | Queue this song.                           |
+| play *artist*                         | Queue 10 tracks by this artist.            |
+| play *album*                          | Queue this entire album.                   |
+| play *something now*                  | Play this shit right now!                  |
+| what                                  | Show what is playing, and what is queued.  |
+| next                                  | Jump to the next song in the queue.        |
+| undo                                  | Undo the last addition to the queue.       |
+| clear                                 | Clear the queue.                           |
+| pause                                 | Pause.                                     |
+| unpause                               | Unpause.                                   |
+| volume?                               | Get the current volume level.              |
+| volume *0-100*                        | Set the volume.                            |
+
+<br>
+For example:
+
+    play coldplay
+    play nicki minaj starships
+
+Mumbletune uses Spotify to find music.
 
 <!-- Generate HTML with: $ pandoc -f markdown -->

data/lib/mumbletune/messages.rb

@@ -79,15 +79,19 @@ module Mumbletune
 				when /^next$/i
 					Mumbletune.player.next
 					current = Mumbletune.player.current_song
-					message.respond "OK, now playing #{current.artist} - #{current.name}"
+					message.respond_all "#{message.sender.name} skipped to #{current.artist} - #{current.name}" if current
 
 				when /^clear$/i
 					Mumbletune.player.clear_queue
-					message.respond "#{message.sender.name} cleared the queue."
+					message.respond_all "#{message.sender.name} cleared the queue."
 
 				when /^undo$/i
 					removed = Mumbletune.player.undo
-					message.respond_all "#{message.sender.name} removed #{removed.description} that #{removed.user} added."
+					if message.sender.name == removed.user
+						message.respond_all "#{message.sender.name} removed #{removed.description}."
+					else 
+						message.respond_all "#{message.sender.name} removed #{removed.description} at #{removed.user} added."
+					end
 
 
 				when /^(what|queue)$/i

data/lib/mumbletune/mpd_client.rb

@@ -8,8 +8,8 @@ module Mumbletune
 
 		def initialize(host=Mumbletune.config['mpd']['host'], port=Mumbletune.config['mpd']['port'])
 			@mpd = MPD.new(host, port)
-			@mpd.connect true # 'true' enables callbacks
-			@mpd.clear
+			self.connect
+			self.clear_all
 
 			@history = Array.new
 			@prev_id = 0
@@ -18,6 +18,17 @@ module Mumbletune
 			self.establish_callbacks
 		end
 
+		def connect
+			@disconnecting = false
+			@mpd.connect true # 'true' enables callbacks
+		end
+
+		def disconnect
+			@disconnecting = true
+			@mpd.disconnect
+			puts ">> Disconnected from MPD"
+		end
+
 		# Setup
 
 		def defaults
@@ -27,8 +38,8 @@ module Mumbletune
 
 		def establish_callbacks
 			@mpd.on :connection do |status|
-				if status == false
-					@mpd.connect true
+				if status == false && !@disconnecting
+					self.connect
 				else
 					puts ">> MPD happens to be connected."
 				end
@@ -95,7 +106,10 @@ module Mumbletune
 			# 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 = @mpd.queue
+			queue.unshift @mpd.current_song if @mpd.current_song
+
+			# Delete index 0 if first queue position and current song are duplicates.
 			queue.delete_at(0) if queue[1] && queue[0] == queue[1]
 
 			# Associate known Tracks with Queue items.

data/lib/mumbletune/mumble_client.rb

@@ -17,7 +17,7 @@ module Mumbletune
 			end
 
 			@cli.on_text_message do |data|
-				if data[:session].include?(@cli.me[:actor]) # if message was sent to us
+				if data[:session].include?(@cli.me[:session]) # if message was sent to us
 					# interpret the message in a separate thread
 					Thread.new { Message.parse(@cli, data) }
 				end
@@ -41,7 +41,10 @@ module Mumbletune
 			@cli.stream_raw_audio(input)
 		end
 
-
+		def disconnect
+			@cli.disconnect
+			puts ">> Disconnected from Mumble"
+		end
 	end
 
 end

data/lib/mumbletune/templates/commands.mustache

@@ -13,19 +13,19 @@
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left">play &lt;track&gt;</td>
+<td align="left">play <em>track</em></td>
 <td align="left">Queue this song.</td>
 </tr>
 <tr class="even">
-<td align="left">play &lt;artist&gt;</td>
+<td align="left">play <em>artist</em></td>
 <td align="left">Queue 10 tracks by this artist.</td>
 </tr>
 <tr class="odd">
-<td align="left">play &lt;album&gt;</td>
+<td align="left">play <em>album</em></td>
 <td align="left">Queue this entire album.</td>
 </tr>
 <tr class="even">
-<td align="left">play &lt;something&gt; now</td>
+<td align="left">play <em>something now</em></td>
 <td align="left">Play this shit right now!</td>
 </tr>
 <tr class="odd">
@@ -45,12 +45,24 @@
 <td align="left">Clear the queue.</td>
 </tr>
 <tr class="odd">
+<td align="left">pause</td>
+<td align="left">Pause.</td>
+</tr>
+<tr class="even">
+<td align="left">unpause</td>
+<td align="left">Unpause.</td>
+</tr>
+<tr class="odd">
 <td align="left">volume?</td>
 <td align="left">Get the current volume level.</td>
 </tr>
 <tr class="even">
-<td align="left">volume [0-100]</td>
+<td align="left">volume <em>0-100</em></td>
 <td align="left">Set the volume.</td>
 </tr>
 </tbody>
 </table>
+<p><br> For example:</p>
+<pre><code>play coldplay
+play nicki minaj starships</code></pre>
+<p>Mumbletune uses Spotify to find music.</p>

data/lib/mumbletune/version.rb

@@ -1,3 +1,3 @@
 module Mumbletune
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/mumbletune.rb

@@ -59,6 +59,8 @@ module Mumbletune
 
 	# shutdown code
 	def self.shutdown
+		self.mumble.disconnect
+		self.player.disconnect
 		puts "\nGoodbye forever. Exiting..."
 	 	exit
 	end

data/mumbletune.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "eventmachine"
   spec.add_runtime_dependency "text"
   spec.add_runtime_dependency "mustache"
+  spec.add_development_dependency "debugger"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mumbletune
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,6 +187,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: debugger
+  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'
 description: Mumbletune connects to a mumble server and allows users to interact with
   and play a queue of music. Currently plays from Spotify alone.
 email: