rdio-cli 1.2.1 → 1.2.2

data/CONTRIBUTING.md

@@ -6,9 +6,9 @@ improve this project.
 1. [Fork the repository.][fork]
 2. [Create a topic branch.][branch]
 3. Add specs for your unimplemented feature or bug fix.
-4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
+4. Run `script/test`. If your specs pass, return to step 3.
 5. Implement your feature or bug fix.
-6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
+6. Run `script/test`. If your specs fail, return to step 5.
 7. Add, commit, and push your changes.
 8. [Submit a pull request.][pr]
 

data/bin/rdio

@@ -1,4 +1,26 @@
 #!/usr/bin/env ruby
 require 'rdio'
 
-exit Rdio.run(ARGV)
+trap "SIGINT" do
+  exit 0
+end
+
+trap "INT" do
+  exit 0
+end
+
+if ARGV[0] == 'console'
+  loop do
+    print '> '
+    input = $stdin.gets.chomp
+
+    if input == 'exit'
+      exit
+    else
+      args = input.split(' ')
+      Rdio.run(args)
+    end
+  end
+else
+  Rdio.run(ARGV)
+end

data/lib/rdio.rb

@@ -21,7 +21,7 @@ module Rdio
 
   def self.api
     token = @access_token ? [@access_token, @access_secret] : nil
-    @api = Api.new \
+    @api ||= Api.new \
       [@consumer_key, @consumer_secret],
       token
   end
@@ -40,7 +40,7 @@ module Rdio
 
   def self.lyrics_for(artist, title)
     uri = URI('http://makeitpersonal.co/lyrics')
-    params = { :artist => artist, :title => title }
+    params = { :artist => artist.gsub(/[<>]/, ' '), :title => title.gsub(/[<>]/, ' ') }
     uri.query = URI.encode_www_form(params)
 
     res = Net::HTTP.get_response(uri)
@@ -126,6 +126,22 @@ module Rdio
     api.call 'addToCollection', { :keys => tracks.join(',') }
   end
 
+  def self.add_friend(vanity_or_email)
+    if vanity_or_email.include? "@"
+      data = api.call 'findUser', { :email => vanity_or_email }
+    else
+      data = api.call 'findUser', { :vanityName => vanity_or_email }
+    end
+
+    unless data['result']
+      return "Could not find user #{vanity_or_email}."
+    end
+
+    data = api.call 'addFriend', :user => data['result']['key']
+    data['result'] ? "You are now friends with #{vanity_or_email}." :
+      "Rdio said you were unable to become friends with #{vanity_or_email}."
+  end
+
   config_file '.rdio'
 
   desc 'Rdio API consumer key'
@@ -304,6 +320,16 @@ module Rdio
     end
   end
 
+  desc 'Manage your friends'
+  command :friends do |c|
+    c.desc 'Add a friend'
+    c.command :add do |add|
+      add.action do |global_options,options,args|
+        say add_friend args.first
+      end
+    end
+  end
+
   pre do |global,command,options,args|
     # Pre logic here
     # Return true to proceed; false to abourt and not call the

data/lib/rdio/version.rb

@@ -1,3 +1,3 @@
 module Rdio
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdio-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2014-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: CLI for Rdio for Mac