sonos 0.3.0 → 0.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ded5809db9b6874541a783058f58e2675f042092
+  data.tar.gz: 16b0167e929a9d328f1420ef41bd38576a34bf85
+SHA512:
+  metadata.gz: 7ccf9e8e83d533d33205b57620a0ec7d1de4d81f69faeff100469fe75a9cfed7d56f3ea6093a6f50bfb6c2c803ccf86f88b5e99684fe2ad2c35a00605056f32f
+  data.tar.gz: cdeaed6716f84e1a399c9d8e9049d8f482d717b5e801d14df9feeb71f85b04960116c4aa5dadc8b1d76265c821caa39a7bff607723a0e9da6d74e7dbbfa7ea24

data/.ruby-version

@@ -0,0 +1 @@
+2.0.0-p195

data/Readme.markdown

@@ -53,6 +53,8 @@ speaker.volume
 speaker.volume = 70
 speaker.volume -= 10
 speaker.queue
+speaker.add_to_queue 'http://assets.samsoff.es/music/Airports.mp3'
+speaker.remove_from_queue(speaker.queue[:items].last[:queue_id])
 speaker.save_queue 'Jams'
 speaker.clear_queue
 ```
@@ -91,7 +93,6 @@ You can also run `sonos pause_all` to pause all your Sonos groups.
 * Set repeat mode
 * Search music library
 * Browse music library
-* Add songs to queue
 * Skip to song in queue
 * Alarm clock
 * Sleep timer

data/lib/sonos/cli.rb

@@ -22,6 +22,24 @@ module Sonos
     	system.pause_all
     end
 
+    desc 'play_all', 'Resumes playing all Sonos speaker groups'
+    def play_all
+      system.play_all
+    end
+
+    desc 'groups', 'List all Sonos groups'
+    def groups
+      system.groups.each do |group|
+        puts group.master_speaker.name.ljust(20) + group.master_speaker.ip
+
+        group.slave_speakers.each do |speaker|
+          puts speaker.name.rjust(10).ljust(20) + speaker.ip
+        end
+
+        puts "\n"
+      end
+    end
+
   private
 
     def system

data/lib/sonos/device/base.rb

@@ -14,7 +14,7 @@ module Sonos::Device
       elsif Speaker.model_numbers.include?(model_number)
         Speaker.new(ip, data)
       else
-        raise ArgumentError.new("#{self.data[:model_number]} not supported")
+        raise ArgumentError.new("#{data[:model_number]} not supported")
       end
     end
 

data/lib/sonos/device/bridge.rb

@@ -6,7 +6,7 @@ module Sonos::Device
   # Used for Zone Bridge
   class Bridge < Base
 
-    MODEL_NUMBERS = ['ZB100']
+    MODEL_NUMBERS = ['ZB100','ZP80']
 
     attr_reader :icon
 

data/lib/sonos/discovery.rb

@@ -17,12 +17,15 @@ module Sonos
     MULTICAST_ADDR = '239.255.255.250'
     MULTICAST_PORT = 1900
     DEFAULT_TIMEOUT = 1
+    DEFAULT_IP = nil
 
     attr_reader :timeout
     attr_reader :first_device_ip
+    attr_reader :default_ip
 
-    def initialize(timeout = DEFAULT_TIMEOUT)
+    def initialize(timeout = DEFAULT_TIMEOUT,default_ip = DEFAULT_IP)
       @timeout = timeout
+      @default_ip = default_ip
       initialize_socket
     end
 
@@ -61,7 +64,8 @@ module Sonos
           end
         end
       rescue Timeout::Error => ex
-        nil
+        puts "Timeout error; switching to the default IP"
+        return @default_ip
       end
     end
 

data/lib/sonos/endpoint/a_v_transport.rb

@@ -11,6 +11,9 @@ module Sonos::Endpoint::AVTransport
     body = response.body[:get_position_info_response]
     doc = Nokogiri::XML(body[:track_meta_data])
 
+    # No music
+    return nil if doc.children.length == 0
+
     art_path = doc.xpath('//upnp:albumArtURI').inner_text
 
     # TODO: No idea why this is necessary. Maybe its a Nokogiri thing
@@ -20,6 +23,7 @@ module Sonos::Endpoint::AVTransport
       title: doc.xpath('//dc:title').inner_text,
       artist: doc.xpath('//dc:creator').inner_text,
       album: doc.xpath('//upnp:album').inner_text,
+      info: doc.xpath('//r:streamContent').inner_text,
       queue_position: body[:track],
       track_duration: body[:track_duration],
       current_position: body[:rel_time],
@@ -28,13 +32,17 @@ module Sonos::Endpoint::AVTransport
     }
   end
 
+  def has_music?
+    !now_playing.nil?
+  end
+
   # Pause the currently playing track.
   def pause
     send_transport_message('Pause')
   end
 
   # Play the currently selected track or play a stream.
-  # @param [String] optional uri of the track to play. Leaving this blank, plays the current track.
+  # @param [String] uri Optional uri of the track to play. Leaving this blank, plays the current track.
   def play(uri = nil)
     # Play a song from the uri
     set_av_transport_uri(uri) and return if uri
@@ -78,6 +86,24 @@ module Sonos::Endpoint::AVTransport
     send_transport_message('SaveQueue', "<Title>#{title}</Title><ObjectID></ObjectID>")
   end
 
+  # Adds a track to the queue
+  # @param[String] uri Uri of track
+  # @return[Integer] Queue position of the added track
+  def add_to_queue(uri)
+    response = send_transport_message('AddURIToQueue', "<EnqueuedURI>#{uri}</EnqueuedURI><EnqueuedURIMetaData></EnqueuedURIMetaData><DesiredFirstTrackNumberEnqueued>0</DesiredFirstTrackNumberEnqueued><EnqueueAsNext>1</EnqueueAsNext>")
+    # TODO yeah, this error handling is a bit soft. For consistency's sake :)
+    pos = response.xpath('.//FirstTrackNumberEnqueued').text
+    if pos.length != 0
+      pos.to_i
+    end
+  end
+
+  # Removes a track from the queue
+  # @param[String] object_id Track's queue ID
+  def remove_from_queue(object_id)
+    send_transport_message('RemoveTrackFromQueue', "<ObjectID>#{object_id}</ObjectID><UpdateID>0</UpdateID></u:RemoveTrackFromQueue>")
+  end
+
   # Join another speaker's group.
   # Trying to call this on a stereo pair slave will fail.
   def join(master)
@@ -96,7 +122,7 @@ module Sonos::Endpoint::AVTransport
     send_transport_message('BecomeCoordinatorOfStandaloneGroup')
   end
 
-private
+  private
 
   # Play a stream.
   def set_av_transport_uri(uri)

data/lib/sonos/endpoint/content_directory.rb

@@ -28,7 +28,7 @@ module Sonos::Endpoint::ContentDirectory
     hash
   end
 
-private
+  private
 
   def content_directory_client
     @content_directory_client ||= Savon.client endpoint: "http://#{self.ip}:#{Sonos::PORT}#{CONTENT_DIRECTORY_ENDPOINT}", namespace: Sonos::NAMESPACE
@@ -40,10 +40,11 @@ private
     doc.css('item').each do |item|
       res = item.css('res').first
       result << {
+        queue_id: item['id'],
         title: item.xpath('dc:title').inner_text,
         artist: item.xpath('dc:creator').inner_text,
         album: item.xpath('upnp:album').inner_text,
-        album_art: "http://#{self.ip}:#{PORT}#{item.xpath('upnp:albumArtURI').inner_text}",
+        album_art: "http://#{self.ip}:#{Sonos::PORT}#{item.xpath('upnp:albumArtURI').inner_text}",
         duration: res['duration'],
         id: res.inner_text
       }

data/lib/sonos/system.rb

@@ -23,13 +23,28 @@ module Sonos
 
     # Pause all speakers
     def pause_all
-      self.groups.each do |group|
-        group.pause
+      speakers.each do |speaker|
+        speaker.pause if speaker.has_music?
+      end
+    end
+
+    # Play all speakers
+    def play_all
+      speakers.each do |speaker|
+        speaker.play if speaker.has_music?
       end
     end
 
   private
 
+    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 }
+      end
+    end
+
     def construct_groups
       # Loop through all of the unique groups
       @topology.collect(&:group).uniq.each do |group_uid|

data/lib/sonos/version.rb

@@ -1,3 +1,3 @@
 module Sonos
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sonos
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.3.1
 platform: ruby
 authors:
 - Sam Soffes
@@ -10,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -23,7 +21,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -31,33 +28,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Control Sonos speakers with Ruby
@@ -70,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .ruby-version
 - .travis.yml
 - Changelog.markdown
 - Gemfile
@@ -102,30 +96,26 @@ files:
 homepage: https://github.com/soffes/sonos
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1378351241916050478
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Control Sonos speakers with Ruby
 test_files:
 - test/cassettes/topology.yml