moc 2.5.0.4 → 2.5.0.5

data/lib/moc/controller.rb

@@ -33,8 +33,8 @@ class Controller
 	def initialize (path = '~/.moc/socket2')
 		@path   = File.expand_path(path)
 		@socket = UNIXSocket.new(@path)
-		
-		@events = Hash.new { |h, k| h[k] = [] }
+
+		@queue = []
 	end
 
 	def respond_to_missing? (id, include_private = false)
@@ -170,37 +170,35 @@ class Controller
 		end
 	}
 
-	def on (event = nil, &block)
-		@events[event ? nil : event.to_sym.upcase] << block
+	def looping?; !!@looping; end
 
-		self
-	end
+	def loop (&block)
+		raise ArgumentError, 'no block given' unless block
 
-	def fire (event)
-		name = event.to_sym
+		raise 'already looping' if looping?
 
-		@events[nil].each {|block|
-			block.call(event)
-		}
+		@looping = true
 
-		@events[name].each {|block|
-			block.call(event)
-		}
+		send_command :send_events
 
-		self
-	end
-
-	def loop
 		while event = read_event
-			fire event
+			block.call event
+
+			until @queue.empty?
+				block.call @queue.first
+
+				@queue.shift
+			end
 		end
 
 		self
+	ensure
+		@looping = false
 	end
 
 	def wait_for (name)
 		while (event = read_event) != name
-			fire event
+			@queue << event if looping?
 		end
 
 		event
@@ -220,6 +218,22 @@ class Controller
 		self
 	end
 
+	def lock
+		send_command :lock
+	end
+
+	def unlock
+		send_command :unlock
+	end
+
+	def synchronize (&block)
+		lock
+
+		block.call
+	ensure
+		unlock
+	end
+
 	def toggle
 		@toggle ||= Toggle.new(self)
 	end

data/lib/moc/controller/status.rb

@@ -73,11 +73,11 @@ class Status
 			}
 
 			def duration
-				tags.time
+				tags.time if tags
 			end
 
 			def inspect
-				"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration}>"
+				"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration || ??}>"
 			end
 		end
 
@@ -137,11 +137,11 @@ class Status
 		}
 
 		def duration
-			tags.time
+			tags.time if tags
 		end
 
 		def inspect
-			"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration}>"
+			"#<#{self.class.name}: track=#{track} title=#{title.inspect} artist=#{artist.inspect} album=#{album.inspect} channels=#{channels} bitrate=#{bitrate}(#{average_bitrate}) position=#{position}/#{duration || ??}>"
 		end
 	end
 

data/lib/moc/protocol/symbol.rb

@@ -25,7 +25,7 @@ class Symbol
 		@internal = value.respond_to?(:to_i) ? self.class.codes.key(value.to_i) : value.to_sym.upcase
 
 		unless @internal && self.class.codes.member?(@internal)
-			raise ArgumentError, 'invalid symbol'
+			raise ArgumentError, "invalid symbol #{value}"
 		end
 	end
 

data/lib/moc/version.rb

@@ -10,6 +10,6 @@
 
 module Moc
 	def self.version
-		'2.5.0.4'
+		'2.5.0.5'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moc
 version: !ruby/object:Gem::Version
-  version: 2.5.0.4
+  version: 2.5.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-23 00:00:00.000000000 Z
+date: 2012-06-24 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org