rdio-cli 0.0.1 → 1.0.0

data/README.md

@@ -1,6 +1,7 @@
 # Rdio CLI
 
-A simple command line interface for [Rdio][].
+A simple command line interface for [Rdio][]. Requires the desktop app to be
+installed since playback controls talk to the app via AppleScript.
 
 ## Installation
 
@@ -22,12 +23,48 @@ $ rdio current "♫ %{track} ♫"
 ♫ All The Roadrunning ♫
 ```
 
-### Full usage help
+### Lyrics
 
-```shell
+Plain text, terminal-friendly lyrics are served up via [makeitpersonal.co][]:
 
-$ rdio help
+```
+~ rdio current
+Now playing: That Old Time Feeling / Rodney Crowell / This One's for Him: A Tribute to Guy Clark
+
+~ rdio lyrics
+Sorry, We don't have lyrics for this song yet.
+
+~ rdio lyrics --artist="Guy Clark"
+
+And that old time feeling goes sneakin' down the hall
+Like an old gray cat in winter, keepin' close to the wall
+And that old time feeling comes stumblin' up the street
+Like an old salesman kickin' the papers from his feet
+
+And that old time feeling draws circles around the block
+Like old women with no children, holdin' hands with the clock
+And that old time feeling falls on its face in the park
+Like an old wino prayin' he can make it till it's dark
+
+And that old time feeling comes and goes in the rain
+Like an old man with his checkers, dyin' to find a game
+And that old time feeling plays for beer in bars
+Like an old blues-time picker who don't recall who you are
 
+And that old time feeling limps through the night on a crutch
+Like an old soldier wonderin' if he's paid too much
+And that old time feeling rocks and spits and cries
+Like an old lover rememberin' the girl with the clear blue eyes
+
+And that old time feeling goes sneakin' down the hall
+Like an old gray cat in winter, keepin' close to the wall
+
+```
+
+### Full usage help
+
+```
+$ rdio help
 NAME
     rdio - Simple CLI for Rdio
 
@@ -38,10 +75,10 @@ VERSION
     0.0.1
 
 GLOBAL OPTIONS
-    --access_secret=arg   - (default: none)
-    --access_token=arg    - (default: none)
-    --consumer_key=arg    - (default: none)
-    --consumer_secret=arg - (default: none)
+    --access_secret=arg   - (default: )
+    --access_token=arg    - (default: )
+    --consumer_key=arg    - (default: )
+    --consumer_secret=arg - (default: )
     --help                - Show this message
     --version             -
 
@@ -52,12 +89,14 @@ COMMANDS
     help            - Shows a list of commands or help for one command
     initconfig      - Initialize the config file using current global options
     link            - Get a shareable link for the current track
+    lyrics          - Show lyrics for a track
     mute            - Mute the Rdio player
     next            - Skip to next track
     pause           - Pause the player
     play            - Plays the current track
     previous, prev  - Play previous track
     quit, q         - Quit Rdio
+    snag            - Add the current track or album to your collection
     toggle          - Toggle playback
     user            - Show the current Rdio user
     version, v      - Get CLI and application version info
@@ -66,7 +105,7 @@ COMMANDS
 
 ## TODO
 * `[✓]` <del>Snag current track to collection</del>
-* `[ ]` Snag current album to collection
+* `[✓]` <del>Snag current album to collection</del>
 * `[ ]` Create a playlist
 * `[ ]` Follow a user
 * `[ ]` Tail a user?
@@ -85,3 +124,4 @@ Copyright (c) 2012 Wynn Netherland. See [LICENSE][] for details.
 [Drew Stokes]: https://github.com/dstokes
 [node-rdio]: https://github.com/dstokes/rdio-cli
 [GLI]: https://github.com/davetron5000/gli
+[makeitpersonal.co]: http://makeitpersonal.co

data/lib/rdio.rb

@@ -4,6 +4,7 @@ require 'launchy'
 
 require 'api'
 require 'rdio/version'
+require 'rdio/desktop_bridge'
 require 'highline/import'
 
 module Rdio
@@ -13,6 +14,10 @@ module Rdio
 
   version Rdio::VERSION
 
+  def self.bridge
+    @bridge ||= Rdio::DesktopBridge.new
+  end
+
   def self.api
     token = @access_token ? [@access_token, @access_secret] : nil
     @api = Api.new \
@@ -32,6 +37,15 @@ module Rdio
     say "You're all set. see `rdio help` for usage"
   end
 
+  def self.lyrics_for(artist, title)
+    uri = URI('http://makeitpersonal.co/lyrics')
+    params = { :artist => artist, :title => title }
+    uri.query = URI.encode_www_form(params)
+
+    res = Net::HTTP.get_response(uri)
+    return res.body
+  end
+
   def self.rdio_config
     {
      :consumer_key    => @consumer_key,
@@ -48,48 +62,21 @@ module Rdio
     end
   end
 
-  def self.apple_script(cmd)
-    `osascript -e '#{cmd}'`
-  end
-
-  def self.tell_rdio(cmd)
-    apple_script "tell app \"Rdio\" to #{cmd}"
-  end
-
-  def self.current_track
-    tell_rdio('name of the current track').gsub(/\n/, '')
-  end
-
-  def self.current_artist
-    tell_rdio('artist of the current track').gsub(/\n/, '')
-  end
-
-  def self.current_album
-    tell_rdio('album of the current track').gsub(/\n/, '')
+  def self.current_user
+    @current_user ||= api.call('currentUser', :extras => 'lastSongPlayed')['result']
   end
 
-  def self.display_track(text)
-    text = "Now playing: %{track} / %{artist} / %{album}" if text.nil?
-    say (text % {
-      :artist => current_artist,
-      :track  => current_track,
-      :album  => current_album
-    })
-  end
-
-  def self.set_volume(pct = 30)
-    tell_rdio "set the sound volume to #{pct}"
-  end
+  def self.current_track_key
+    data = api.call 'getObjectFromUrl', { :url => bridge.current_url }
 
-  def self.rdio_url
-    path = tell_rdio 'rdio url of the current track'
-    "http://www.rdio.com#{path}"
+    data['result']['key']
   end
 
-  def self.current_track_key
-    data = api.call 'getObjectFromUrl', { :url => rdio_url }
+  def self.current_album_track_keys
+    current_album_url = current_user['lastSongPlayed']['albumUrl']
+    data = api.call 'getObjectFromUrl', { :url => current_album_url }
 
-    data['result']['key']
+    data['result']['trackKeys']
   end
 
   def self.add_to_collection(tracks)
@@ -100,34 +87,40 @@ module Rdio
 
   config_file '.rdio'
 
-  flag :consumer_key
-  flag :consumer_secret
-  flag :access_token
-  flag :access_secret
+  desc 'Rdio API consumer key'
+  flag :consumer_key, :mask => true
+  desc 'Rdio API consumer secret'
+  flag :consumer_secret, :mask => true
+  desc 'Rdio API access token'
+  flag :access_token, :mask => true
+  desc 'Rdio API access secret'
+  flag :access_secret, :mask => true
 
+  skips_pre
   desc 'Plays the current track'
   command :play do |c|
     c.action do |global_options,options,args|
-      tell_rdio "play"
+      bridge.play
     end
   end
 
-  desc 'Pause the player'
   skips_pre
+  desc 'Pause the player'
   command :pause do |c|
     c.action do |global_options,options,args|
-      tell_rdio "pause"
+      bridge.pause
     end
   end
 
-  desc 'Toggle playback'
   skips_pre
+  desc 'Toggle playback'
   command :toggle do |c|
     c.action do |global_options,options,args|
-      tell_rdio "playpause"
+      bridge.toggle
     end
   end
 
+  skips_pre
   desc 'Display the current track info'
   long_desc %(
     Display current track, artist, and album info. Pass
@@ -135,81 +128,81 @@ module Rdio
     %{track}, %{artist}, and %{album} placeholders.
   )
   arg_name 'format'
-  skips_pre
   command :current do |c|
     c.action do |global_options,options,args|
-      display_track args.first
+      say bridge.now_playing(args.first)
     end
   end
 
-  desc 'Skip to next track'
   skips_pre
+  desc 'Skip to next track'
   command :next do |c|
     c.action do |global_options,options,args|
-      tell_rdio "next track"
+      bridge.next_track
     end
   end
 
-  desc 'Play previous track'
   skips_pre
+  desc 'Play previous track'
   command :previous, :prev do |c|
     c.action do |global_options,options,args|
-      tell_rdio "previous track"
+      bridge.previous_track
     end
   end
 
-  desc 'Open the current track in Rdio player'
   skips_pre
+  desc 'Open the current track in Rdio player'
   command :browse do |c|
     c.action do |global_options,options,args|
-      exec "open '#{rdio_url}'"
+      protocol = args.first == 'app' ? 'rdio' : 'http'
+      exec "open '#{bridge.current_url protocol}'"
     end
   end
 
-  desc 'Set volume for player'
   skips_pre
+  desc 'Set volume for player'
   arg_name 'level'
   command :volume, :vol do |c|
     c.action do |global_options,options,args|
       level = args.shift.to_i
-      set_volume level
+      bridge.set_volume level
     end
   end
 
-  desc 'Mute the Rdio player'
   skips_pre
+  desc 'Mute the Rdio player'
   command :mute do |c|
     c.action do |global_options,options,args|
-      set_volume 0
+      brdige.set_volume 0
     end
   end
 
-  desc 'Get a shareable link for the current track'
   skips_pre
+  desc 'Get a shareable link for the current track'
   command :link do |c|
     c.action do |global_options,options,args|
-      say rdio_url
+      say bridge.current_url
     end
   end
 
-  desc "Get CLI and application version info"
   skips_pre
+  desc "Get CLI and application version info"
   command :version, :v do |c|
     c.action do |global_options,options,args|
       say "rdio-cli #{Rdio::VERSION} / Rdio #{apple_script('get version of application "Rdio"')}"
     end
   end
 
-  desc "Quit Rdio"
   skips_pre
+  desc "Quit Rdio"
   command :quit, :q do |c|
     c.action do |global_options,options,args|
-      apple_script "tell application \"Rdio\" to quit"
+      bridge.quit
     end
   end
 
-  desc "Authorize Rdio account"
   skips_pre
+  desc "Authorize Rdio account"
   command :authorize, :auth do |c|
     c.action do |global_options,options,args|
       require 'highline/import'
@@ -224,12 +217,24 @@ module Rdio
     end
   end
 
+  skips_pre
+  desc 'Show lyrics for a track'
+  command :lyrics do |c|
+    c.flag :artist
+    c.flag :title
+    c.action do |global_options,options,args|
+      artist = options[:artist] || bridge.current_artist
+      title = options[:title] || bridge.current_track
+      say lyrics_for(artist, title)
+    end
+  end
+
   ### Authenticated methods
 
   desc 'Show the current Rdio user'
   command :user do |c|
     c.action do |global_options,options,args|
-      user = api.call('currentUser')['result']
+      user = current_user
       say "#{user['firstName']} #{user['lastName']}"
     end
   end
@@ -239,7 +244,7 @@ module Rdio
     c.action do |global_options,options,args|
       case args.shift
       when 'album'
-        say 'Not implemented'
+        add_to_collection current_album_track_keys
       when nil
         add_to_collection current_track_key
       end
@@ -256,7 +261,7 @@ module Rdio
     @consumer_secret = global[:consumer_secret]
     @access_token    = global[:access_token]
     @access_secret   = global[:access_secret]
-    if api.token.compact.empty?
+    if api.token.nil? || api.token.compact.empty?
       say 'Rdio credentials not found. Please run: rdio authorize'
 
       false

data/lib/rdio/desktop_bridge.rb

@@ -0,0 +1,71 @@
+module Rdio
+  class DesktopBridge
+
+    def apple_script(cmd)
+      `osascript -e '#{cmd}'`
+    end
+
+    def tell_rdio(cmd)
+      apple_script "tell app \"Rdio\" to #{cmd}"
+    end
+
+    def quit
+      # apple_script "tell application \"Rdio\" to quit"
+      tell_rdio "quit"
+    end
+
+    def play
+      tell_rdio "play"
+    end
+
+    def pause
+      tell_rdio "pause"
+    end
+
+    def toggle
+      tell_rdio "playpause"
+    end
+
+    def next_track
+      tell_rdio "next track"
+    end
+
+    def previous_track
+      tell_rdio "previous track"
+    end
+
+    def current_track
+      tell_rdio('name of the current track').chomp
+    end
+
+    def current_artist
+      tell_rdio('artist of the current track').chomp
+    end
+
+    def current_album
+      tell_rdio('album of the current track').chomp
+    end
+
+    def now_playing(text=nil)
+      return "Nothing playing" if current_track.empty?
+
+      text ||= "Now playing: %{track} / %{artist} / %{album}"
+      text % {
+        :artist => current_artist,
+        :track  => current_track,
+        :album  => current_album
+      }
+    end
+
+    def set_volume(pct = 30)
+      tell_rdio "set the sound volume to #{pct}"
+    end
+
+    def current_url(protocol = 'http')
+      path = tell_rdio('rdio url of the current track').chomp
+
+      path.empty? ? nil : "#{protocol}://www.rdio.com#{path}"
+    end
+
+  end
+end

data/lib/rdio/version.rb

@@ -1,3 +1,3 @@
 module Rdio
-  VERSION = '0.0.1'
+  VERSION = '1.0.0'
 end

data/rdio-cli.gemspec

@@ -23,5 +23,6 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rdoc')
   s.add_development_dependency('rspec', '~> 2.12.0')
   s.add_development_dependency('rspec-mocks', '~> 2.12.0')
+  s.add_development_dependency 'webmock'
   s.add_runtime_dependency('gli','2.5.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdio-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2013-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.12.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +153,7 @@ files:
 - rdio-cli.gemspec
 - lib/api.rb
 - lib/om.rb
+- lib/rdio/desktop_bridge.rb
 - lib/rdio/version.rb
 - lib/rdio.rb
 - bin/rdio
@@ -171,4 +188,3 @@ signing_key:
 specification_version: 3
 summary: CLI for Rdio for Mac
 test_files: []
-has_rdoc: false