easy_upnp 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff03da48709a543a35dbfe13a1ece864d9337db6
-  data.tar.gz: 61517d04933afc34e2465de2400c577d001b63fb
+  metadata.gz: ba225151d956a041aaadd246678194bb56d0dbf3
+  data.tar.gz: c75a1966c29b922dd79ec0e64f971f1504f77390
 SHA512:
-  metadata.gz: 4dbf1e5b113b33fe94db16655421b17f22f72eb57f5deb80521a2f5d6c83e4b097384495370ace08124fdce9da5e1fef228d8b960fefa408a3cc15c0aefb83ff
-  data.tar.gz: 50a3d09bd2a1d2fb00f8afab09fca6a95db15c1118a424fdde175e5ab2ddecd537109ef789dc163effac4e1708490c8667342c2c2088a3824dc6474b3c973f75
+  metadata.gz: 18148d3f3aacad599e4c618cfafdb3381c27a2fd1e079042f29c0975c0e04de0c408d634beee1b94b93f8db326d8256dfa72fbf854f5ae4fd6ce2462cfaa7dfc
+  data.tar.gz: fb9a6f08c5350ed95170705aa662cd638de2fe94b0698b7bea2f07c259ad1b337a33a1cca30cf72cddae434333c029ac3925c94e56cc2e3b9dcfce7dd3997b4a

data/bin/upnp-list

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'easy_upnp/ssdp_searcher'
+
+DEFAULT_ST = 'ssdp:all'
+
+search_option_keys = [:timeout, :repeat_queries]
+options = {search_target: DEFAULT_ST}
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: upnp-list [options]"
+
+  opts.on("-t", "--timeout [SECONDS]") do |v|
+    options[:timeout] = v.to_i
+  end
+
+  opts.on("-r", "--repeat-queries [N]") do |v|
+    options[:repeat_queries] = v.to_i
+  end
+
+  opts.on("-s", "--search-target [STRING]", String,
+          "Specify UPnP search target (default \"ssdp:all\")") do |v|
+    options[:search_target] = v
+  end
+end.parse!
+
+puts "Starting SSDP search..."
+
+search_options = options.select { |k, v| search_option_keys.include?(k) }
+devices = EasyUpnp::SsdpSearcher.new(search_options).search(options[:search_target])
+
+if devices.any?
+  puts "Found #{devices.count} devices:"
+  printf "%30s %45s %s\n", "Name", "UUID", "Services"
+
+  devices.each do |device|
+    printf "%30s %45s ", device.device_name, device.uuid
+
+    services = device.all_services
+    if services.any?
+      printf "%s\n", services.first
+
+      services[1..-1].each do |s|
+        printf "%30s %45s %s\n", "", "", s
+      end
+    else
+      puts "( None )"
+    end
+
+    puts
+  end
+elsif options[:search_target] == DEFAULT_ST
+  puts "Couldn't find any UPnP devices."
+else
+  puts "Couldn't find any UPnP devices with search target: \"#{options[:search_target]}\""
+end

data/easy_upnp.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.email    = 'chris@sidoh.org'
   gem.homepage = 'http://github.com/sidoh/easy_upnp'
 
-  gem.add_dependency 'rake' 
+  gem.add_dependency 'rake'
   gem.add_dependency 'savon', '~> 2.11.1'
   gem.add_dependency 'nori', '~> 2.6.0'
   gem.add_dependency 'nokogiri', '~> 1.6.6.2'
@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   }
 
   gem.files = (all_files_without_ignores + dotfiles).sort
+  gem.executables = ["upnp-list"]
 
-  gem.require_path = "lib" 
+  gem.require_path = "lib"
 end

data/lib/easy_upnp/upnp_device.rb

@@ -33,6 +33,18 @@ module EasyUpnp
       UpnpDevice.new(uuid, service_definitions)
     end
 
+    def device_name
+      if all_services.empty?
+        raise RuntimeError, "Couldn't resolve device name because no endpoints are defined"
+      end
+
+      document = open(service_definition(all_services.first)[:location]) { |f| f.read }
+      xml = Nokogiri::XML(document)
+      xml.remove_namespaces!
+
+      xml.xpath("//device/friendlyName").text
+    end
+
     def all_services
       @service_definitions.map { |x| x[:st] }
     end

data/lib/easy_upnp/version.rb

@@ -1,3 +1,3 @@
 module EasyUpnp
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_upnp
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Christopher Mullins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,8 @@ dependencies:
         version: 2.0.0
 description: 
 email: chris@sidoh.org
-executables: []
+executables:
+- upnp-list
 extensions: []
 extra_rdoc_files: []
 files:
@@ -91,6 +92,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/upnp-list
 - easy_upnp.gemspec
 - lib/easy_upnp/device_control_point.rb
 - lib/easy_upnp/ssdp_searcher.rb