dacpclient 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0168ee84709980d66f477982404c0d5cddbb2f92
-  data.tar.gz: e105474bc17e7127c0d0f9427219152df7a83d0f
+  metadata.gz: 66c56df86793fd1624160851a47545719c55b087
+  data.tar.gz: a62913732101151597a1f8d3d3243e545c7c375a
 SHA512:
-  metadata.gz: 508242daaf50dacc3c003d4e0d033ea0ed06df405dae77ce27d2ab34e3d0199e10a77143a1ab7b0fb1214b210873f5b1c29708616dcba7562109c984142064cc
-  data.tar.gz: f2f2dfd1c2238ae09d217ce4128032bbb174ef2e027042d687c5b8a6c8869ac1493002ee42f6df3dde07274f747fc450064f83da8b43155295d5c725c36e77ae
+  metadata.gz: 0ec5d69af7e39d2ed18dd4ba99c8104c5943aa79e5dc5e4210242a049719b8c2c60cf5c1503437d161426fa238f664f96c05de37996198d129e1655733f61239
+  data.tar.gz: 87c00eeb87f5e09919fe4a4c3bd3e964e2e916cf34c4320ec0f145dfe18a274a401dc2632523aec05ca2d4a45ceffd43c614e5111b6756e85b965f708e3f834d

data/Gemfile

@@ -2,5 +2,5 @@ gemspec
 
 source 'https://rubygems.org'
 
-gem 'minitest', '~> 5.3.1'
-gem 'rubocop', '~> 0.21.0'
+gem 'minitest', '~> 5.4.0'
+gem 'rubocop', '~> 0.24.1'

data/Rakefile

@@ -8,7 +8,7 @@ YARD::Rake::YardocTask.new
 task test: :rubocop do
 end
 
-Rubocop::RakeTask.new(:rubocop) do |task|
+RuboCop::RakeTask.new(:rubocop) do |task|
   task.patterns = ['**/*.rb', 'Rakefile', 'dacpclient.gemspec', 'bin/*']
   task.options = ['-a']
   task.fail_on_error = true

data/bin/dacpclient

@@ -18,7 +18,7 @@ class CLIClient < Thor
     @config = {}
     @config['client_name'] ||= "DACPClient (#{Socket.gethostname})"
     @config['host'] ||= 'localhost'
-    @config['known_databases'] ||= ['']
+    @config['known_databases'] ||= []
 
     load_config
 
@@ -29,9 +29,16 @@ class CLIClient < Thor
     end
 
     browser = DACPClient::Browser.new
-    browser.browse(false)
-    database = browser.devices.find do |device|
-      @config['known_databases'].include? device.database_id
+
+    database = nil
+
+    3.times do
+      browser.browse
+      database = browser.devices.find do |device|
+        @config['known_databases'].include? device.database_id
+      end
+      break if database
+      sleep 0.5
     end
 
     unless database
@@ -291,7 +298,13 @@ class CLIClient < Thor
     end
   end
 
+  def clean_config
+    @config['known_databases'].delete('')
+    @config['known_databases'].uniq!
+  end
+
   def save_config
+    clean_config
     File.open(File.join(config_dir, 'config.yml'), 'w') do |out|
       YAML.dump(@config, out)
     end

data/dacpclient.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'plist', '~> 3.1.0'
   spec.add_runtime_dependency 'dmapparser', '~> 0.1.0'
   spec.add_runtime_dependency 'thor', '~> 0.19.1'
-  spec.add_runtime_dependency 'fuzzy_match', '~> 2.0.4'
+  spec.add_runtime_dependency 'fuzzy_match', '~> 2.1.0'
 
   spec.add_development_dependency 'yard'
   spec.add_development_dependency 'redcarpet'

data/lib/dacpclient/browser.rb

@@ -23,11 +23,10 @@ module DACPClient
       @devices = []
     end
 
-    def browse(new_service = true)
-      service_name = new_service ? DAAP_SERVICE : TOUCHABLE_SERVICE
+    def browse
       @devices = []
-      timeout(2) do
-        DNSSD.browse!(service_name) do |node|
+      timeout(5) do
+        DNSSD.browse!(TOUCHABLE_SERVICE) do |node|
           resolve(node)
           break unless node.flags.more_coming?
         end

data/lib/dacpclient/pairingserver.rb

@@ -26,6 +26,8 @@ module DACPClient
       @pairing_string = generate_pairing_string(@pair, @name, @device_type)
       @expected = PairingServer.generate_pin_challenge(@pair, @pin)
       @service = DNSSD.register!(@name, MDNS_TYPE, 'local', @port, text_record)
+      @browser = DACPClient::Browser.new
+      @browser.browse
 
       PairInfo.new(DMAPParser::Parser.parse(@pairing_string))
       super
@@ -45,9 +47,7 @@ module DACPClient
     def serve(client)
       data = client.gets
       peer_addr = client.peeraddr[2]
-      browser = DACPClient::Browser.new
-      browser.browse
-      @peer = browser.devices.find do |device|
+      @peer = @browser.devices.find do |device|
         device.host == peer_addr
       end
       if data =~ /pairingcode=#{@expected}/i && @peer

data/lib/dacpclient/version.rb

@@ -1,4 +1,4 @@
 # The DACPClient module
 module DACPClient
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dacpclient
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement