lily 0.1.32 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d34b90d302efac285582160f742adb3cf7210bf
-  data.tar.gz: 6eaecd6597c17cf6dc81dde92921e9df19a4d948
+  metadata.gz: 75b97ec581e49684c65d5359805346373829b643
+  data.tar.gz: b1356a98ccbc565653a07995256cf89d4539192e
 SHA512:
-  metadata.gz: 54e7ad4d1097682286e5bdabd3c9e7ef647e740b8c1743be158054c3edda3b56ce20ea74541e9928ce677f00eeabb6b7e7cf91d08e5058835d5246c9634cc4ff
-  data.tar.gz: c41d533c40acf14e4ae4d1e3bbbd5c3f8cd98b6feac527b9a72d2e588bf29dc50e16ec7a6da74ed0262cfa8683069f30631740cab2d7bf2573d28a9aa8613dae
+  metadata.gz: f5a5f107c4cff6e69ce9e619ace0b9bdc2b2f30af266873f2bb4ef8863cd7b11abd83fe40fcf0db7509ed501e25819b9f357ba93f49aab71f8a56c68d0a80fbb
+  data.tar.gz: 5ef72f04e4f2169f68cf1d2112875fb2d06aaa324c278932fc131e794572d5c362db74702395d370afc6e493a348179ac2a3164514caf01424058d30aa502b27

data/README.md

@@ -19,10 +19,10 @@ lily init # Initialize :)
 
 ## Usage
 
-What's a CLI without usage docs? A bad one. Below you'll find out how Lily can be used. Keep in mind, you can reference every command Lily has with `lily help`
+What's a CLI without usage docs? A bad one. Below you'll find out how Lily can be used. Keep in mind, you can reference every command Lily has with `lily help`. You can find out what version of Lily you are running with `lily version` or `lily --version`.
 
-### Initializing
-Initializing Lily is very easy. Just run `lily init`, log in with LastFM, and you're set.
+### Initializing and Resetting
+Initializing Lily is very easy. Just run `lily init`, log in with LastFM, and you're set. There may be cases where a URL cannot be opened natively, in that case, run `lily init --no-open` and you can open the URL manually, which will work the same way. If you are having trouble, or want to move to a new account, just run `lily reset` to start over and re-initialize with `lily init` as usual.
 
 ### Scrobbling
 Lily's scrobbling feature is very useful, particularly for scrobbling things that can't be scrobbled automatically. For example, when you listen to a vinyl, a CD, that song you really like on the radio, or just something that bugged out and didn't scrobble. Here's how you do that:
@@ -36,7 +36,6 @@ Lily can simply and easily scrobble any individual song for you, assuming you ju
 
 ```bash
 lily scrobble song "Here Comes the Sun" "The Beatles" # scrobbles Here Comes the Sun from Abbey Road, the most popular album it is on
-
 lily scrobble song "Here Comes the Sun" "The Beatles" "The Beatles Ballads" # if you're a hipster, you can optionally specify the exact album you're listening to the song on
 ```
 
@@ -67,4 +66,26 @@ lily unlove album "The Beatles" "Abbey Road"
 
 lily love song "Here Comes the Sun" "The Beatles" "The Beatles Ballads"
 lily unlove song "Here Comes the Sun" "The Beatles"
+```
+
+### Information
+Lily can give you information on users, albums, and songs.
+
+**Syntax for songs:** `lily info song (<song> <artist>) [<album>]`
+
+**Syntax for albums:** `lily info album (<album> <artist> | <eponymous album>)`
+
+**Syntax for users:** `lily info user <username>`
+
+**Examples:**
+
+```bash
+lily info song "Here Comes the Sun" "The Beatles"
+lily info song "Here Comes the Sun" "The Beatles" "The Beatles Ballads"
+
+lily info album "The Beatles"
+lily info album "The Beatles" "The White Album"
+
+lily info user "soodologica"
+lily info user "jshtrmml"
 ```

data/lib/lily.rb

@@ -25,7 +25,7 @@ class Lily
 
       # returns {sk, signature}
     rescue
-      puts "~/.lily.json appears empty"
+      puts "Your settings file (~/.lily.json) appears to be empty, please initialize Lily."
     end
   end
 
@@ -51,7 +51,7 @@ class Lily
     begin
       res.album
     rescue
-      puts "Album does not exist."
+      puts "That album does not exist."
     end
   end
 
@@ -62,12 +62,22 @@ class Lily
     res.token
   end
 
-  def auth
+  def auth(cmd)
     lastfmURL = "http://www.last.fm/api/auth/?api_key=#{@keys.public}&token=#{@token}"
+    
+    if cmd == "--no-open" then puts "Open this URL and sign in to give access: #{lastfmURL}" else
+      Launchy.open(lastfmURL)
+    end
+    
     print "Press Enter once you've given access..."
-    Launchy.open(lastfmURL)
     STDIN.gets
   end
+  
+  def reset
+    # reset sk and config stuff
+    File.delete(ENV["HOME"] + "/.lily.json")
+    puts "Lily has been reset, please re-initialize."
+  end
 
   def session_key
     sig = Digest::MD5.hexdigest("api_key#{@keys.public}methodauth.getSessiontoken#{@token}#{@keys.private}")
@@ -79,6 +89,119 @@ class Lily
       file.write(JSON.pretty_generate({"session_key" => sk}))
     end
   end
+  
+  def get_dashes(string)
+    # create dashes for cosmetic reasons
+    string_array = string.split("")
+    dashes = ""
+    
+    string_array.each do
+      dashes += "-"
+    end
+    
+    return dashes
+  end
+  
+  def tags(toptags)
+    tags = ""
+    
+    toptags.tag.each do |i|
+      if i != toptags.tag[-1]
+        tags += i.name + ", "
+      elsif
+        tags += i.name
+      end
+    end
+    
+    tags
+  end
+  
+  def info
+    # http://www.last.fm/api/show/user.getInfo
+    command = @args.shift
+    
+    if command == "user"
+      # user profile
+      username = @args[0]
+      info_url = "http://ws.audioscrobbler.com/2.0/?method=user.getinfo&user=" + username + "&api_key=" + @keys.public + "&format=json"
+      top_artists_url = "http://ws.audioscrobbler.com/2.0/?method=user.gettopartists&user=" + username + "&api_key=" + @keys.public + "&format=json"
+      recent_tracks_url = "http://ws.audioscrobbler.com/2.0/?method=user.getrecenttracks&user=" + username + "&api_key=" + @keys.public + "&format=json"
+      
+      # get profile
+      info = JSON.parse(HTTP.get(info_url))
+      top_artists = JSON.parse(HTTP.get(top_artists_url))
+      recent_tracks = JSON.parse(HTTP.get(recent_tracks_url))
+      
+      # create dashes for cosmetic reasons
+      dashes = get_dashes(username)
+      
+      # figure out what to show
+      information = [username, "#{dashes}\n\n", "profile link: #{info.user.url}", "songs played: #{info.user.playcount}", "top artist: #{top_artists.topartists.artist[0].name}, with #{top_artists.topartists.artist[0].playcount} total plays", "most recent track: #{recent_tracks.recenttracks.track[0].name} by #{recent_tracks.recenttracks.track[0].artist['#text']}"]
+      
+      if info.user.age != "0" then information.push("age: #{info.user.age}") end
+      if info.user.country != "" then information.push("country: #{info.user.country}") end
+      
+      information.each do |i|
+        puts i
+      end
+    elsif command == "album"
+      # album info
+
+      # we got eponymous albums covered :)
+      if @args[1] == nil then album, artist = @args[0], @args[0] else album, artist = @args[0], @args[1] end
+
+      album_info = get_album_info(album, artist)
+      
+      # dashes for cosmetic reasons
+      title = album + " by " + artist
+      dashes = get_dashes(title)
+      
+      # figure out what to show
+      information = [title, "#{dashes}\n\n", "album link: #{album_info.url}", "played #{album_info.playcount} times by a total of #{album_info.listeners} listeners"]
+      
+      begin
+        if album_info.tags != [] then information.push("tags: #{tags(album_info.tags)}") end
+        if album_info.wiki.summary != "" then information.push("\nsummary:\n#{album_info.wiki.summary}") end
+      rescue
+        # puts "error"
+      end
+      
+      information.each do |i|
+        puts i
+      end
+    elsif command == "song"
+      # song info
+      track, artist = @args[0], @args[1]
+      
+      url = "http://ws.audioscrobbler.com/2.0/?method=track.getInfo&api_key=" + @keys.public + "&artist=" + artist + "&track=" + track + "&format=json"
+      if @args[2]
+        album = @args[2]
+        url += "&album=#{album}"
+      end # album name is optional
+      
+      song_info = JSON.parse(HTTP.get(url))["track"]
+      
+      # dashes for cosmetic reasons
+      title = track + " by " + artist + " from the album " + song_info.album.title
+      dashes = get_dashes(title)
+      
+      # figure out what to show
+      information = [title, "#{dashes}\n\n", "song link: #{song_info.url}", "played #{song_info.playcount} times by a total of #{song_info.listeners} listeners"]
+      
+      begin
+        if song_info.toptags != [] then information.push("top tags: #{tags(song_info.toptags)}") end
+        if song_info.wiki.summary != "" then information.push("\nsummary:\n#{song_info.wiki.summary}") end
+      rescue
+        # nothing to see here!
+      end
+      
+      information.each do |i|
+        puts i
+      end
+    else
+      puts "Huh, Lily didn't recognize that."
+    end
+  end
 
   def scrobble
     # last.fm/api/show/track.scrobble
@@ -115,8 +238,8 @@ class Lily
       album_length = 0
       
       # get full length of album in seconds
-      album_info.tracks.track.each do |track|
-        album_length += track.duration.to_i
+      album_info.tracks.track.each do |i|
+        album_length += i.duration.to_i
       end
         
       puts "Whole album length: #{album_length} seconds."
@@ -127,16 +250,16 @@ class Lily
       puts "Scrobbling your album starting at " + Time.at(time).utc.strftime("%I:%M:%S %p") + " UTC"
         
       # begin scrobbling
-      album_info.tracks.track.each do |track|
-        time += track.duration.to_i
+      album_info.tracks.track.each do |i|
+        time += i.duration.to_i
         
         # scrobble track
         body = self.format_params({
-          "artist" => track.artist.name,
+          "artist" => i.artist.name,
           "method" => "track.scrobble",
           "sk" => @lily_json.session_key,
           "timestamp" => time,
-          "track" => track.name,
+          "track" => i.name,
           "api_key" => @keys.public,
           "format" => "json",
           "album" => album_info.name
@@ -147,7 +270,7 @@ class Lily
 
       puts "#{album} by #{artist} has been scrobbled."
     else
-      puts "huh"
+      puts "Huh, Lily didn't recognize that."
     end
   end
 
@@ -177,11 +300,10 @@ class Lily
       if @args[1] == nil then album, artist = @args[0], @args[0] else album, artist = @args[0], @args[1] end
 
       album_info = get_album_info(album, artist)
-      album_length = 0
 
-      album_info.tracks.track.each do |track|
+      album_info.tracks.track.each do |i|
         body = self.format_params({
-          "track" => track.name,
+          "track" => i.name,
           "artist" => artist,
           "method" => "track.love",
           "sk" => @lily_json.session_key,
@@ -195,7 +317,7 @@ class Lily
 
       puts "#{album} by #{artist} has been loved ♥"
     else
-      puts "huh"
+      puts "Huh, Lily didn't recognize that."
     end
   end
 
@@ -225,9 +347,8 @@ class Lily
       if @args[1] == nil then album, artist = @args[0], @args[0] else album, artist = @args[0], @args[1] end
 
       album_info = get_album_info(album, artist)
-      album_length = 0
 
-      album_info.tracks.track.each do |track|
+      album_info.tracks.track.each do |i|
         body = self.format_params({
           "track" => track.name,
           "artist" => artist,
@@ -243,7 +364,7 @@ class Lily
 
       puts "#{album} by #{artist} has been unloved :("
     else
-      puts "huh"
+      puts "Huh, Lily didn't recognize that."
     end
   end
 
@@ -251,12 +372,14 @@ class Lily
     first = @args.shift
 
     case first
-    when 'scrobble' then self.scrobble
-    when 'init' then self.init
-    when 'love' then self.love
-    when 'unlove' then self.unlove
-    when 'version', '--version' then puts self.version
-    else self.help
+      when 'scrobble' then self.scrobble
+      when 'init' then self.init
+      when 'love' then self.love
+      when 'unlove' then self.unlove
+      when 'version', '--version' then puts self.version
+      when 'info' then self.info
+      when 'reset' then self.reset
+      else self.help
     end
   end
 
@@ -265,18 +388,31 @@ class Lily
     Lily, the Last.fm CLI.
 
     Usage:
-        lily init
+      General Commands:
+        lily init [--no-open]
         lily help
-        lily (scrobble | love | unlove) song (<song> <artist>) [<album>]
-        lily (love | unlove) album (<album> <artist> | <eponymous album>)
+        lily reset
+        lily (version | --version)
+        
+      Scrobbling:
+        lily scrobble song (<song> <artist>) [<album>]
         lily scrobble album (<album> <artist> | <eponymous album>) [--live]
+        
+      Loving/Unloving:
+        lily (love | unlove) song (<song> <artist>) [<album>]
+        lily (love | unlove) album (<album> <artist> | <eponymous album>)
+        
+      Information:
+        lily info song (<song> <artist>) [<album>]
+        lily info album (<album> <artist> | <eponymous album>)
+        lily info user <username>
     """
   end
 
   def init
-    auth
+    auth(@args[-1])
     session_key
-    puts "Initialized ~/.lily.json successfully"
+    puts "Initialized Lily successfully at file ~/.lily.json"
   end
 
   def version

data/lib/lily/version.rb

@@ -1,4 +1,4 @@
 module Version
-  LITERAL = '0.1.32'
-  STRING  = "lily v#{LITERAL}"
+  LITERAL = '0.2.0'
+  STRING  = "Lily v#{LITERAL}"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lily
 version: !ruby/object:Gem::Version
-  version: 0.1.32
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Trommel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler