partygoer-client 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c5ca57411c87212b06b0fce0dce5c0fabeb1697
-  data.tar.gz: 440a7c124eb0a86a40f40fc7897391fadd3aca52
+  metadata.gz: 4385f1fb04460ff257152c2cf070efe9cd1d39c8
+  data.tar.gz: 2e4be4a61f1c3bc50eb3331ca0930873d0b1cd77
 SHA512:
-  metadata.gz: e239d5fea16aba03102fbaebdc38d82e51975497d607e56268011ca780f2bfc685792848bdc2912f6f2be2e690deed43ca2685305f5e43491e8392c090200963
-  data.tar.gz: 149d555a84676292857b871182f4d8c2ff9fed89f483830df56f2295fd64e479d43e673901a60017e54cef4504087491af8a116a37bbcec5e15b6ff92eb5b2e5
+  metadata.gz: d0ef5c08bb3ec6e07fe926d213fbcd8f479233abcf52748f9af4bf5be6495f65ce5ab2cf5eb4acad2a0290856f5ff940179807f26ab516f35ebca0c2bd29931f
+  data.tar.gz: 9c0cd207d129bd4e6aaf3a04f8bef32debb9b6a4a6020e7117f48c9a28e21d719cc9530033cbb9fae08fc65ad247db527781eea894c8ccbb155bbdcbf7a5adb6

data/lib/partygoer-client.rb

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 require 'faye'
 require 'eventmachine'
-require 'json'
 require 'rest-client'
+
+require 'json'
 require 'logger'
 
 # Connects to a partygoer instance, performs an initial poll, and then polls
@@ -15,7 +16,7 @@ class PartyGoerClient
   @@logger.formatter = proc do |severity, datetime, _progname, msg|
     "\n\n#{datetime} #{severity}:\n\t#{msg}"
   end
-  @@logger.level = Logger::DEBUG
+  @@logger.level = Logger::INFO
 
   def initialize(server)
     @server = server
@@ -33,7 +34,7 @@ class PartyGoerClient
     @api = RestClient::Resource.new("#{@server}/api/queue", headers:
                { content_type: 'application/json', accept: 'application/json' })
     @client = Faye::Client.new("#{@server}:9292/faye")
-    @@logger.info { "Client initialized with server: #{server}" }
+    logger.info { "Client initialized with server: #{server}" }
     @is_playing = false
     start
   end
@@ -41,9 +42,9 @@ class PartyGoerClient
   def playing=(track)
     payload = { track: track }
     @api['/playing'].put(payload)
-    @@logger.info { "Set now playing to #{track['name']}" }
+    logger.info { "Set now playing to #{track['name']}" }
   rescue
-    @@logger.error {
+    logger.error {
       "Could not set now playing to #{track.inspect}:\n\t#{$!}\n\t#{$@.join("\n\t")}"
     }
   end
@@ -56,9 +57,9 @@ class PartyGoerClient
       payload = { track: track }
     end
     EM.defer(proc { @api['/tracks'].post(payload) })
-    @@logger.info { "Suggested #{track.inspect}" }
+    logger.info { "Suggested #{track.inspect}" }
   rescue
-    @@logger.error("Failed to suggest track: #{track.inspect}\n#{$!}\n#{$@.join("\n\t")}")
+    logger.error("Failed to suggest track: #{track.inspect}\n#{$!}\n#{$@.join("\n\t")}")
   end
 
   def skip?
@@ -68,19 +69,19 @@ class PartyGoerClient
       @playing['num_downvotes'] >= (2 * @playing['num_upvotes'])
     end
   rescue
-    @@logger.error("Failed to check skip criteria:\n#{$!}\n#{$@.join("\n\t")}")
+    logger.error("Failed to check skip criteria:\n#{$!}\n#{$@.join("\n\t")}")
   end
 
   def up_next
     @queued[1]
   rescue
-    @@logger.error("Failed to check up next:\n#{$!}\n#{$@.join("\n\t")}")
+    logger.error("Failed to check up next:\n#{$!}\n#{$@.join("\n\t")}")
   end
 
   def start
     pull_update
     return if @event_loop
-    @@logger.info { 'Starting event loop' }
+    logger.info { 'Starting event loop' }
     start_event_loop
 
     at_exit do
@@ -90,13 +91,13 @@ class PartyGoerClient
 
   def stop
     return unless @event_loop
-    @@logger.info { 'Stopping event loop' }
+    logger.info { 'Stopping event loop' }
     EM.stop_event_loop
     @event_loop.kill
     @event_loop = nil
   end
 
-  # aliases
+  # Aliases
   def now_playing
     playing
   end
@@ -109,6 +110,10 @@ class PartyGoerClient
     played
   end
 
+  def logger
+    @@logger
+  end
+
   private
     def start_event_loop
       @event_loop = Thread.new do
@@ -129,13 +134,13 @@ class PartyGoerClient
             end
           end
         rescue
-          @@logger.critical { "Could not start event loop:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+          logger.critical { "Could not start event loop:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
           stop
           raise $!
         end
       end
     rescue
-      @@logger.critical { "Could not start event loop:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+      logger.critical { "Could not start event loop:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       stop
       raise $!
     end
@@ -143,7 +148,7 @@ class PartyGoerClient
 
     def on_voted(track)
       proc {
-        @@logger.debug { "Track voted on: #{track.inspect}" }
+        logger.debug { "Track voted on: #{track.inspect}" }
         begin
           @queued_lock.synchronize{
             index = @queued.find_index {
@@ -152,7 +157,7 @@ class PartyGoerClient
             @queued[index] = track
           }
         rescue
-          @@logger.error { "Error in on_voted:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+          logger.error { "Error in on_voted:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
         ensure
           sort!
         end
@@ -161,13 +166,13 @@ class PartyGoerClient
 
     def on_created(track)
       proc {
-        @@logger.debug { "Track created: #{track.inspect}" }
+        logger.debug { "Track created: #{track.inspect}" }
         begin
           @queued_lock.synchronize{
             @queued << track
           }
         rescue
-          @@logger.error { "Error in on_created:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+          logger.error { "Error in on_created:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
         ensure
           sort!
         end
@@ -176,7 +181,7 @@ class PartyGoerClient
 
     def on_next(track)
       proc {
-        @@logger.debug { "Next track called: #{track.inspect}" }
+        logger.debug { "Next track called: #{track.inspect}" }
         begin
           @playing_lock.synchronize {
             @playing['playing'] = false
@@ -193,7 +198,7 @@ class PartyGoerClient
             @playing = track
           }
         rescue
-          @@logger.error { "Error in on_next:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+          logger.error { "Error in on_next:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
         ensure
           sort!
         end
@@ -201,24 +206,24 @@ class PartyGoerClient
     end
 
     def pull_update
-      @@logger.info { "Polling for update" }
+      logger.info { "Polling for update" }
       begin
         body = JSON.parse(@api['/recently_played'].get.body)
         @played_lock.synchronize { @played = body }
       rescue
-        @@logger.error { "Could not fetch recently played:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not fetch recently played:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
       begin
         body = JSON.parse(@api['/tracks'].get.body)
         @queued_lock.synchronize { @queued = body }
       rescue
-        @@logger.error { "Could not fetch queue:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not fetch queue:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
       begin
         body = JSON.parse(@api['/playing'].get.body)
         @playing_lock.synchronize { @playing = body }
       rescue
-        @@logger.error { "Could not fetch now playing:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not fetch now playing:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
       sort!
     end
@@ -228,9 +233,9 @@ class PartyGoerClient
         @played_lock.synchronize{
           @played.sort_by! { |track| track['id'] }
         }
-        @@logger.debug { 'Sorted recently played' }
+        logger.debug { 'Sorted recently played' }
       rescue
-        @@logger.error { "Could not sort recently played:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not sort recently played:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
       begin
         @queued_lock.synchronize{
@@ -239,17 +244,17 @@ class PartyGoerClient
             [i, -1 * track['score'], track['id']]
           }
         }
-        @@logger.debug { 'Sorted queued' }
+        logger.debug { 'Sorted queued' }
       rescue
-        @@logger.error { "Could not sort the queue:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not sort the queue:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
       begin
         @playing_lock.synchronize{
           @playing = @queued.select { |track| track['playing'] }.first
         }
-        @@logger.debug { 'Updated now playing' }
+        logger.debug { 'Updated now playing' }
       rescue
-        @@logger.error { "Could not update now playing:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
+        logger.error { "Could not update now playing:\n\t#{$!}\n\t#{$@.join("\n\t")}" }
       end
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: partygoer-client
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Andrew Hamon