homophone 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82b19502328a13ec7122d711ef3d87632f2f0304
-  data.tar.gz: ef0fabfb33d1c6a0bc639fca6c36fdac65650722
+  metadata.gz: 3464d5a63f67b8875c50811be08e051e698b9a7c
+  data.tar.gz: d79333378e00d3166b9783b25a9e328add9632c8
 SHA512:
-  metadata.gz: 3509b925b64fa53568bf045d1061acc1c7cae2325f61b79c06190895594b1d0cef8e3c6229c13c07f3e5501a61ed5c8332bf011e3c7716fb4a92233b653c05be
-  data.tar.gz: 688aa82798d649fee8caaa94f66d387323a4a4fe0cf2ef8255e09ff0aab15da60f39a492751be98c95be8931ae95c771fbb79b6b14449e614441293809025eed
+  metadata.gz: 99c6e5bc7b2979a903e2ef2dbb09461a1eeaa9b6b853589dbac45b5a7946572b79f9e2b8239b33f5ad5e76994f483edb93a7c4e7be79e1d4653949f432da3e61
+  data.tar.gz: c9fdca238b8a0d0feaab1ea033479cc2e06cd6f2e1cd66f9435820fa63769bc88df71a9843b49b93700c7886196d5c7454e5c87ffe8ff71d86ce697413a4f80e

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2016 Michael Dippery <michael@monkey-robot.com>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/homophone.gemspec

@@ -33,10 +33,11 @@ other artists that are similar to a given artist.
 
   spec.add_runtime_dependency('httparty', '~> 0.13.7')
   spec.add_runtime_dependency('json', '~> 1.8')
+  spec.add_runtime_dependency('slop', '~> 4.3')
 
   spec.add_development_dependency('aruba', '~> 0.14')
   spec.add_development_dependency('cucumber', '~> 2.3')
   spec.add_development_dependency('rspec', '~> 3.4')
   spec.add_development_dependency('vcr', '~> 3.0')
-  spec.add_development_dependency('webmock', '~> 1.24')
+  spec.add_development_dependency('webmock', '~> 2.0')
 end

data/lib/homophone/application.rb

@@ -1,3 +1,4 @@
+require 'slop'
 require 'homophone/version'
 
 module Homophone
@@ -8,16 +9,40 @@ module Homophone
   end
 
   class Application
+    def initialize
+      @show_genre = false
+    end
+
     def run(argv)
-      onoe 127, 'no musician name provided' if argv.count < 1
-      ohai "homophone v#{Homophone::VERSION}" if argv[0] == '--version'
+      opts = Slop.parse do |o|
+        o.banner = 'Usage: homophone [-g] ARTIST'
+        o.separator ''
+        o.separator 'Options:'
+
+        o.bool '-g', '--genre', 'Show artist genres'
+
+        o.on '-h', '--help' do
+          ohai o
+        end
+
+        o.on '--version' do
+          ohai "homophone v#{Homophone::VERSION}"
+        end
+      end
+
+      musician_name = opts.arguments.shift
+      onoe 127, 'No musician name provided' unless musician_name
+
+      @show_genre = opts.genre?
 
-      musician_name = argv.shift
       musician = spotify_service.musician(musician_name)
-      onoe 126, %Q{no musician with name "#{musician_name}" found} if musician.nil?
-      artists = musician.related_artists.map(&:name).sort
+      onoe 126, %Q{No musician with name "#{musician_name}" found} if musician.nil?
+
+      puts "#{formatter.format(musician)}:\n\n" if show_genre?
+
+      artists = musician.related_artists.sort_by(&:name)
       artists.each do |artist|
-        puts artist
+        puts formatter.format(artist)
       end
     end
 
@@ -25,13 +50,22 @@ module Homophone
       @service ||= (cucumber? ? Homophone::Service::DummySpotify : Homophone::Service::Spotify).new
     end
 
+    def show_genre?
+      !!@show_genre
+    end
+
+    def formatter
+      opts = {:show_genre => show_genre?}
+      @formatter ||= Homophone::Formatter::ConsoleFormatter.new(opts)
+    end
+
     def ohai(msg)
       puts msg
       exit 0
     end
 
     def onoe(exit_code, msg)
-      STDERR.puts "homophone: #{msg}"
+      STDERR.puts msg
       exit exit_code
     end
 

data/lib/homophone/formatter.rb

@@ -0,0 +1,21 @@
+module Homophone
+  module Formatter
+    class ConsoleFormatter
+      def initialize(opts = {})
+        @show_genre = !!opts[:show_genre]
+      end
+
+      def format(artist)
+        if show_genre?
+          "#{artist.name} (#{artist.genres.join(', ')})".sub(/ \(\)/, '')
+        else
+          artist.name
+        end
+      end
+
+      def show_genre?
+        @show_genre
+      end
+    end
+  end
+end

data/lib/homophone/service.rb

@@ -30,19 +30,9 @@ module Homophone
 
       def get(url)
         uri = URI(url)
+        params = begin CGI::parse(uri.query) rescue nil end
         path_parts = uri.path.split('/').reject { |p| p == '' }
-        path_base = path_parts.first
-        path = case path_base
-               when 'search'
-                 params = CGI::parse(uri.query)
-                 type = params['type'].first
-                 name = params['q'].first.gsub(/[+ ]/, '_')
-                 "search/#{type}/#{name}"
-               when 'artists'
-                 "artists/#{path_parts.last}/#{path_parts[1]}"
-               else
-                 nil
-               end
+        path = cassette_path(path_parts, params)
         raise ArgumentError, "No cassette for #{url}" unless path
         path = File.join(source_path, "#{path}.yml")
         JSON.load(YAML.load(IO.read(path))['http_interactions'][0]['response']['body']['string'])
@@ -53,16 +43,30 @@ module Homophone
       def source_path
         File.join(File.dirname(__FILE__), '..', '..', 'features', 'fixtures', 'cassettes')
       end
+
+      def cassette_path(components, params)
+        case components.first
+        when 'search'
+          type = params['type'].first
+          name = params['q'].first.gsub(/[+ ]/, '_')
+          "search/#{type}/#{name}"
+        when 'artists'
+          "artists/#{components.last}/#{components[1]}"
+        else
+          nil
+        end
+      end
     end
   end
 
   class Musician
-    attr_reader :spotify_id, :name
+    attr_reader :spotify_id, :name, :genres
 
     def initialize(service, blob)
       @service = service
       @spotify_id = blob['id']
       @name = blob['name']
+      @genres = blob['genres']
     end
 
     def related_artists

data/lib/homophone/version.rb

@@ -1,3 +1,3 @@
 module Homophone
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/lib/homophone.rb

@@ -1,2 +1,3 @@
 require 'homophone/application'
+require 'homophone/formatter'
 require 'homophone/service'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homophone
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Michael Dippery
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: slop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.24'
+        version: '2.0'
 description: |
   Find related artists for your favorite band. Queries the Spotify API to find
   other artists that are similar to a given artist.
@@ -120,20 +134,22 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE
 - Rakefile
 - exe/homophone
 - homophone.gemspec
 - lib/homophone.rb
 - lib/homophone/application.rb
+- lib/homophone/formatter.rb
 - lib/homophone/service.rb
 - lib/homophone/version.rb
 homepage: https://github.com/mdippery/homophone
 licenses:
 - MIT
 metadata:
-  build_date: 2016-04-06 19:32:51 PDT
-  commit: v1.0.0
-  commit_hash: 3f64945aa6d8860cc6675ce0bb4496c13fcd6e4c
+  build_date: 2016-05-04 19:08:25 PDT
+  commit: v1.1.0
+  commit_hash: 46d49fa0f0f6cdd3e9f5ba1c763c0fb34d252803
 post_install_message: 
 rdoc_options: []
 require_paths: