sonos 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af1c1b8f83305ffe42a1b10d381588515d48cbc9
-  data.tar.gz: 29057282b16426b582c13e3ad0e0f3bd2ced837b
+  metadata.gz: df9944fdb181f7e979b67372e6457be32ddb7995
+  data.tar.gz: b865559508e5b6ddf95a92b3d34a8935a659af3e
 SHA512:
-  metadata.gz: c82f4e8c4cc8f88dbf015c2b485c621998a8ef26619911f8963cb4e8903170f7d4b92ddfeb7a94f170bd3a6c2d0439fb32910cf677b4dc9057f8492fce299e43
-  data.tar.gz: 537ed42bad05889053b4969cd46292ee9e5e491581a4e04a4a4131fb79995eb81bd9f4e16cb7cdb9a5dd2e0d1611c4a9c2b88030e6607b8134fcc2c9b61d6063
+  metadata.gz: 23639b6d07de2b63b13ac2b7a4f40be1a22ffc421595cc781dcdcdb4150ec0d00f95586d48b8a13fed8f4929d864665e3d015be8b912d1921be788b31fa35028
+  data.tar.gz: ffc6f16907f7d7c2e010f193c5254cf4e7228cff3e37bb938f15981816ab6c88d50438df9c6686be87bab32bbe2c116991294e589112f1fcca9ec565c5799ae6

data/Readme.markdown

@@ -59,6 +59,14 @@ speaker.save_queue 'Jams'
 speaker.clear_queue
 ```
 
+Or go into what the official control from Sonos, Inc. calls "Party
+Mode": put all speakers into a single group
+
+``` ruby
+system.party_mode
+system.party_over
+```
+
 ### Topology
 
 `Sonos.discover` finds the first speaker it can. We can get all of the Sonos devices (including Bridges, etc) by calling `Sonos.system.devices`. To get the groups, call `Sonos.system.groups`.

data/lib/sonos/cli.rb

@@ -17,17 +17,27 @@ module Sonos
       end
     end
 
-    desc 'pause_all', 'Pauses all Sonos speaker groups'
+    desc 'pause_all', 'Pause all speaker groups.'
     def pause_all
     	system.pause_all
     end
 
-    desc 'play_all', 'Resumes playing all Sonos speaker groups'
+    desc 'play_all', 'Resume playing all speaker groups.'
     def play_all
       system.play_all
     end
 
-    desc 'groups', 'List all Sonos groups'
+    desc 'party_mode', 'Start a party! Put all speakers in the same group.'
+    def party_mode
+      system.party_mode
+    end
+
+    desc 'party_over', 'No more party :( Put all speakers in their own group.'
+    def party_over
+      system.party_over
+    end
+
+    desc 'groups', 'List all groups'
     def groups
       system.groups.each do |group|
         puts group.master_speaker.name.ljust(20) + group.master_speaker.ip
@@ -40,6 +50,14 @@ module Sonos
       end
     end
 
+    desc 'speaker [name] [command] [args]', 'Control a speaker'
+    def speaker(name, command, *args)
+      speakers = system.speakers.select { |s| s.name.downcase == name.downcase }
+      puts "Could not find speaker" and return if speakers.length == 0
+
+      speakers.each { |s| s.send command, *args }
+    end
+
   private
 
     def system

data/lib/sonos/system.rb

@@ -9,11 +9,7 @@ module Sonos
     # Initialize the system
     # @param [Array] the system topology. If this is nil, it will autodiscover.
     def initialize(topology = Discovery.new.topology)
-      @topology = topology
-      @groups = []
-      @devices = @topology.collect(&:device)
-
-      construct_groups
+      rescan topology
     end
 
     # Returns all speakers
@@ -35,15 +31,51 @@ module Sonos
       end
     end
 
-  private
+    # Party Mode!  Join all speakers into a single group.
+    def party_mode new_master = nil
+      return nil unless speakers.length > 1
+
+      new_master = find_party_master if new_master.nil?
+
+      party_over
+      speakers.each do |slave|
+        next if slave.uid == new_master.uid
+        slave.join new_master
+      end
+      rescan @topology
+    end
+
+    def find_party_master
+      # 1: If there are any pre-existing groups playing something, use
+      # the lowest-numbered group's master
+      groups.each do |group|
+        return group.master_speaker if group.master_speaker.has_music?
+      end
 
-    def send_to_all_speakers(action)
-      if self.groups.length > 0
-        self.groups.each { |group| group.send action }
-      else
-        self.speakers.each { |speaker| speaker.send action }
+      # 2: Lowest-number speaker that's playing something
+      speakers.each do |speaker|
+        return speaker if speaker.has_music?
       end
+
+      # 3: lowest-numbered speaker
+      speakers[0]
     end
+    
+    # Party's over :(
+    def party_over
+      groups.each { |g| g.disband }
+      rescan @topology
+    end
+    
+    def rescan(topology = Discovery.new.topology)
+      @topology = topology
+      @groups = []
+      @devices = @topology.collect(&:device)
+
+      construct_groups
+    end
+    
+  private
 
     def construct_groups
       # Loop through all of the unique groups

data/lib/sonos/version.rb

@@ -1,3 +1,3 @@
 module Sonos
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Sam Soffes
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-28 00:00:00.000000000 Z
+date: 2013-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon