drum 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 744d7de8c05fe7f7dc8f843b04b2ccd1a77a2688228369706fa4fca79ddf6c07
-  data.tar.gz: c72fc4a18d59cb12017692e1a6fad3cb73cbec24ea73a64adf68279331c3eafb
+  metadata.gz: 0515ca290089497d8667ed64575eb60dc604ba793812b77437ced8d27f70e6bb
+  data.tar.gz: 1da960b8dc5e79ce85328e918c43d214898824e51d544b613b58ede726666f97
 SHA512:
-  metadata.gz: 9cd77d6cf666ef8cd90709b357b59994da0eb20f2a7afaea68f5a60c3aae909d4acf49b407426dd21af4e56caf542e2906dabae73e9270e8221272d543a02e5a
-  data.tar.gz: 488848553a20609b7f72bbd11431c46ba03e8d20db4ad428cca5d34df434a061a1ae55a668ee3a304836f42eb84ba5af84bf84e3a5ab0168271f1b86fd3e8f71
+  metadata.gz: db118818875e8c9d0d5281697e033bcaeebb3bc204355e41ab4436ed2da1738297c703ed8aa813f32456f968851729794f3e209c0510ca1ddbf218b93af75ab0
+  data.tar.gz: 24ce2b4be59b259617cc50ba66fc35c48aeeeb89faa716a5ad457a959364ccb39cb37b7fa86c4e4f4da6593b7c753bc9eebcde02226d24a6a65402f5d2e7eca8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    drum (0.2.0)
+    drum (0.2.1)
       highline (~> 2.0)
       jwt (~> 2.2)
       launchy (~> 2.4)

data/lib/drum/service/applemusic.rb

@@ -167,8 +167,6 @@ module Drum
         server.shutdown
       end
 
-      trap 'INT' do server.shutdown end
-
       log.info "Launching callback HTTP server on port #{port}, waiting for auth code..."
       server.start
 
@@ -186,6 +184,8 @@ module Drum
       }
 
       user_token
+    ensure
+      server&.shutdown
     end
 
     def authenticate

data/lib/drum/service/spotify.rb

@@ -137,8 +137,6 @@ module Drum
       authorize_url = "https://accounts.spotify.com/authorize?client_id=#{client_id}&response_type=code&redirect_uri=http%3A%2F%2Flocalhost:#{port}%2Fcallback&scope=#{scopes.join('%20')}&state=#{csrf_state}"
       Launchy.open(authorize_url)
 
-      trap 'INT' do server.shutdown end
-      
       log.info "Launching callback HTTP server on port #{port}, waiting for auth code..."
       server.start
       
@@ -155,6 +153,8 @@ module Drum
       })
       
       self.consume_authentication_response(auth_response)
+    ensure
+      server&.shutdown
     end
 
     def authenticate_user_via_refresh(client_id, client_secret, refresh_token)

data/lib/drum/version.rb

@@ -1,3 +1,3 @@
 module Drum
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drum
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - fwcd