spotilocal 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8677fecab24399ca755cef8fa65e9de8fe06f254
-  data.tar.gz: a88c87355e6f4541c1eed871fbe08967ba2ea411
+  metadata.gz: dc6be62298a581fa787e3a2c1f5ab941366880a3
+  data.tar.gz: f0ac2a9b8cfd577c3c949de7503490b1f179e2e9
 SHA512:
-  metadata.gz: cc333f1c1494ce737d57b91aec8a6c7c89a21087810b0b02ad9d56d23bdc5cf21601d3f17c5f1a29b522bec69b506e03c082cc5ff4a6c3323a9f5647ad9d41ae
-  data.tar.gz: fba68e4521b10ffc02d1d2f8d6dffad6d9b6ce38a27967ac1527c235db23d04a90bce33e5502960000e906823d1484b30db774f32d7aa7183f8f115ae124fa16
+  metadata.gz: '097ce07a68dc51b39ebac7498f31dfb018f178953796a0945d61ff8e0d5ad6cbb5077d54255553b7bd7dedd4b5681819380c0e2a6f9d63768868182034e80a4c'
+  data.tar.gz: f655daa036cc768c16da4389030bbd5d98efca2e1431f5fca0012f079f0e759494fc796d54addedbe37aebd2d781ec6441907c86b8963a1f8351138fb338fe97

data/lib/spotilocal/cli.rb

@@ -14,5 +14,20 @@ module Spotilocal
     def unpause
       Spotilocal::Client.new.unpause
     end
+
+    desc 'status', 'display current client status (verbose)'
+    def status
+      puts Spotilocal::Client.new.status.to_json
+    end
+
+    desc 'current RESOURCE', 'display information about playing resource'
+    method_option :only, aliases: '-o', desc: 'Display only given key'
+    def current(resource)
+      if options[:only]
+        puts Spotilocal::Client.new.current[resource][options[:only]]
+      else
+        puts Spotilocal::Client.new.current[resource].to_json
+      end
+    end
   end
 end

data/lib/spotilocal/client.rb

@@ -15,25 +15,48 @@ module Spotilocal
       lcall(:status)
     end
 
+    def current
+      current = {}
+      current['track'] = track_from_status status
+      current['album'] = album_from_status status
+      current['artist'] = artist_from_status status
+
+      current
+    end
+
     def play(uri)
       r = lcall(:play, params: { uri: uri })
-      r.playing && r.track.track_resource.uri == uri
+      r['playing'] && r['track']['track_resource']['uri'] == uri
     end
 
     def pause
-      !lcall(:pause, params: { pause: 'true' }).playing
+      !lcall(:pause, params: { pause: 'true' })['playing']
     end
 
     def unpause
-      lcall(:pause, params: { pause: 'false' }).playing
+      lcall(:pause, params: { pause: 'false' })['playing']
     end
 
     private
 
+    %w(artist album track).each do |res|
+      define_method("#{res}_from_status") do |stat|
+        h = {}
+        h['name'] = stat['track']["#{res}_resource"]['name']
+        h['uri'] = stat['track']["#{res}_resource"]['uri']
+        if res == 'track'
+          h['length'] = stat['track']['length']
+          h['type'] = stat['track']['track_type']
+        end
+
+        h
+      end
+    end
+
     def lcall(loc, params: {}, resource: :remote)
       req = Typhoeus.get("#{url}/#{resource}/#{loc}.json",
                          params: params.merge(csrf: csrf, oauth: oauth))
-      JSON.parse(req.response_body, object_class: OpenStruct)
+      JSON.parse(req.response_body)
     end
 
     def oauth_token

data/lib/spotilocal/version.rb

@@ -1,3 +1,3 @@
 module Spotilocal
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spotilocal
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Flipez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-25 00:00:00.000000000 Z
+date: 2016-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus