robbie 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13ec5a7421307b16ee798ca983aab5270da5b76
-  data.tar.gz: 74785a9d367a49b6197e0361868aa73fbfcbda7a
+  metadata.gz: 6dd30b7ec003d2d52b6ff91563c34d5fd54f92d5
+  data.tar.gz: 628def2f049252b0816beaaff19ddc78701157ea
 SHA512:
-  metadata.gz: 1c5af80c46720a42175c7e35a4213105d9960728c10a8bc0f9bb9852165121bc2648a615c5723542df0b82286daf794a5bd172c5df6cfb4d5a05ad8a46d49930
-  data.tar.gz: 8d4309b2338c91d4c3c9c12958b026e09167094360ef652d377dee2b246bd4afc5ef80c615e7a02665257bc2ed6e872ec7c7326e805a8beb25f6203b18bb296c
+  metadata.gz: 48c21f51693f56f328bd999cdee92ff916f18b17677f6851b1fa146e4007f2d234e33d2c912dbe69e8a0d459e89fbc768da6abc2175119e892e64a0eba10a6bb
+  data.tar.gz: e5aaa2ecdeeafe1f74210151d2922c016926dedb6b77f3f5ddb9c32f79cc824ae45ceea4147df3a6b238f7a51a7a22a99ab0c98d021d1c77e9aa37556e63ebad

data/README.md

@@ -1,36 +1,24 @@
 # robbie
-Media metadata aggregating CLI
+Media Information at your Fingertips
 
 <img align="right" height="260" src="http://poile.me/robbie/img/logo.png">
 
-## Resources
+## Docs
+### `robbie`, the friendly robot
 
-### Movies/TV Shows
-- [OMDB gem](https://github.com/jvanbaarsen/omdb)
-- [CanIStreamIt API](https://github.com/KevinBongart/canistreamit)
+Primarily you'll be using `info`, if you know what you want, but you can also use `search` if you're looking to find something general.
 
-### Music
-- [SoundCloud API 1](https://developers.soundcloud.com/docs/api/guide)
-- [SoundCloud API 2](https://developers.soundcloud.com/docs/api/sdks)
-- [SoundCloud gem](https://github.com/soundcloud/soundcloud-ruby)
-
-### Books
- - [GoodReads API](http://www.goodreads.com/api)
- - [Goodreads gem](https://github.com/sosedoff/goodreads)
-
-## Ideas/Planning
-### `robbie`, the main command
 Specify one of the following afterwards (as well as as a title for the media)
 - `movie`
 
   ```bash
-  robbie movie "Hitchhiker's Guide to the Galaxy"
+  robbie info movie "Hitchhiker's Guide to the Galaxy"
   ```
 
 - `tv`
 
   ```bash
-  robbie tv "Rick and Morty"
+  robbie search tv "Rick and Morty" # =>
   ```
 
 - `music`

data/lib/robbie/command.rb

@@ -32,7 +32,10 @@ module Command
     when 'tv' then Request.tv(@args)
     when 'actor' then Request.actor(@args)
     when 'book' then Request.book(@args)
-    when 'id' then Request.id(@args)
+    when 'song' then Request.song(@args)
+    when 'album' then Request.album(@args)
+    when 'artist' then Request.artist(@args)
+    when 'id' then Request.id(@args) # currently only works for movie and tv show
     else help end
   end
 

data/lib/robbie/request.rb

@@ -17,11 +17,49 @@ module Request
     puts "Title: \t\t #{@json["Title"]}"
     puts "Plot:  \t\t #{@json["Plot"]}"
     puts "Poster: \t #{@json["Poster"]}"
-    puts "Poster: \t #{@json["Actors"]}"
+    puts "Actors: \t #{@json["Actors"]}"
     puts "Rating: \t\t #{@json["imdbRating"]}"
   end
 
+  def artist(args) # to do
+    @artist = URI.escape(args.shift)
+    @res = HTTP.get("http://ws.audioscrobbler.com/2.0/?method=artist.getInfo&artist=#{@artist}&api_key=0a7d3b25ed857f679eba1a353e98a658&format=json").body
+    @json = JSON.parse(@res)
+
+    puts @json['artist']['bio']['summary']
+  end
+
+  def song(args) # to do
+    # Requires track title and artist name
+    @song = URI.escape(args.shift)
+    @artist = URI.escape(args.shift)
+    @res = HTTP.get("http://ws.audioscrobbler.com/2.0/?method=track.getInfo&track=#{@song}&artist=#{@artist}&api_key=0a7d3b25ed857f679eba1a353e98a658&format=json").body
+    @json = JSON.parse(@res)
+
+    puts "Title: \t\t#{@json['track']['name']}"
+    puts "Artist: \t#{@json['track']['artist']['name']}"
+    puts "Year: \t\t#{@json['track']['wiki']['published']}"
+  end
+
+  def album(args) # works, sort of
+    # Requires artist and album
+    @album = URI.escape(args.shift)
+    @artist = URI.escape(args.shift)
+    @res = HTTP.get("http://ws.audioscrobbler.com/2.0/?method=album.getInfo&artist=#{@artist}&album=#{@album}&api_key=0a7d3b25ed857f679eba1a353e98a658&format=json").body
+    @json = JSON.parse(@res)
+
+    puts "Title: \t\t#{puts @json['album']['name']}"
+    puts "Artist: \t#{@json['album']['artist']}"
+    puts "Year: \t\t#{@json['album']['wiki']['published']}"
+    puts "Tracks: \t"
+
+    @json['album']['tracks']['track'].each do |track|
+      puts "\t#{track['name']}"
+    end
+  end
+
   def movie(title)
+    puts "title: #{title}"
     Bitly.use_api_version_3
 
     bitly = Bitly.new('benp51', 'R_886e9ca24b25c1e91d66f5c6379568a9')

data/lib/robbie/search.rb

@@ -7,6 +7,10 @@ module Search
   module_function
 
   def movie(title)
+    if title.empty?
+      puts "You need to specify a movie to query"
+      exit
+    end
     title = URI.escape(title.first)
     url = "http://www.omdbapi.com/?type=movie&r=json&s="+title
     omdbData = JSON.parse(HTTP.get('http://www.omdbapi.com/?type=movie&r=json&s='+title).body)
@@ -16,6 +20,10 @@ module Search
   end
 
   def tv (title)
+    if title.nil?
+      puts "You need to specify a TV show to query"
+      exit
+    end
     title = URI.escape(title.first)
     omdbData = JSON.parse(HTTP.get('http://www.omdbapi.com/?type=series&r=json&s='+title).body)
     puts "- #{omdbData["Search"][0]["Title"]} (#{omdbData["Search"][0]["Year"]}) /#{omdbData["Search"][0]["imdbID"]}"
@@ -24,6 +32,10 @@ module Search
   end
 
   def actor (name)
+    if name.nil?
+      puts "You need to specify an actor/actress to query"
+      exit
+    end
     name = URI.escape(name.first)
     myApiFilms = JSON.parse(HTTP.get("http://www.myapifilms.com/imdb/idIMDB?name=#{name}&token=8e26a029-8cf1-4dd7-89bd-889bf5e74cbd&format=json&language=en-us&limit=1&bornDied=1").body)
 

data/lib/robbie/version.rb

@@ -1,4 +1,4 @@
 module Robbie
-	VERSION = '2.0.1'
+	VERSION = '2.1.0'
 	E_VERSION = "robbie v#{VERSION}"
 end

data/lib/robbie.rb

@@ -3,7 +3,7 @@ require_relative 'robbie/version'
 require_relative 'robbie/command'
 require 'rainbow'
 
-module Marvin
+module Robbie
   module_function #ily
 
   def run(*args)
@@ -21,9 +21,9 @@ module Marvin
     case @first
     when 'search' then Command.search(@args)
     when 'info' then Command.info(@args)
-    when 'version', '--version' then puts Marvin::E_VERSION
+    when 'version', '--version' then puts Robbie::E_VERSION
     when 'help', '--help' then Command.help(@args)
-    else puts "marvin: '#{@first}' is not a marvin command. See 'marvin --help'."
+    else puts "robbie: '#{@first}' is not a robbie command. See 'robbie --help'."
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robbie
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Poile
@@ -130,7 +130,6 @@ files:
 - bin/robbie
 - lib/robbie.rb
 - lib/robbie/command.rb
-- lib/robbie/keys.json
 - lib/robbie/request.rb
 - lib/robbie/search.rb
 - lib/robbie/version.rb

data/lib/robbie/keys.json

@@ -1,9 +0,0 @@
-{
-  "goodreads": {
-    "public": "oSMwxqaPNr0o1PYs2Jddg",
-    "private": "qbOgJbyCF64rAXuMINjIpCCAONULQcIRh7gcDB5uds"
-  },
-  "myapifilms": {
-    "public": "8e26a029-8cf1-4dd7-89bd-889bf5e74cbd"
-  }
-}