vagalume 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5b30c2065b43e890469a84e577ce547dca15bb1
-  data.tar.gz: 48ee5bdb1cf6d46df66fc21795efb4a5c2eb8ca7
+  metadata.gz: d06acfd5b52be5d23a930c642b0829efe4802ee2
+  data.tar.gz: e86a3b7e30b579405225cfc5f0a7c8be189abf52
 SHA512:
-  metadata.gz: ffd03794e2283805337e5f68c9ba9f548686328cfc5c0696ad9f354032785fa2b486593c0ac83277d2b97510d675e809c67a7f010060caa560846e368c390d99
-  data.tar.gz: f8a9eff2944fb8b8ae66e3d26adc9eb34f88de76b8372b70dc4b9342c3c3579230592f3524bbe006cac2f73a7cf1b5d7a69156f60361370e80df5c926a0352ef
+  metadata.gz: 7ed49516aba72eab580b89eae5cb8ce508dfaee771088f063160e923dd8393c1ebb4f2797058588b8e3cd672dafc2b894fbe9bec242e4631b7abab4dc5d0595e
+  data.tar.gz: 89807c874b91ac1d6cdb4d8d69cfd32903ed2a8716647b6d730fba14c5349563c3d5aa460f04eb0960b40841221dfcbc86aa625213147ec587c29ee4763d4e2c

data/Gemfile

@@ -1,9 +1,3 @@
 source "http://rubygems.org"
 
-gem "multi_json"
-
-group :development do
-  gem "vcr", ">= 0"
-  gem "rspec"
-  gem "webmock"
-end
+gemspec

data/Gemfile.lock

@@ -1,11 +1,17 @@
+PATH
+  remote: .
+  specs:
+    vagalume (0.1.4)
+      multi_json (~> 1.9.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.6)
+    addressable (2.3.7)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    multi_json (1.9.2)
+    multi_json (1.9.3)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -14,8 +20,8 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
-    safe_yaml (1.0.2)
-    vcr (2.9.0)
+    safe_yaml (1.0.4)
+    vcr (2.9.3)
     webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -24,7 +30,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  multi_json
-  rspec
-  vcr
-  webmock
+  bundler (~> 1.3)
+  rspec (~> 2.14.1)
+  vagalume!
+  vcr (~> 2.9.0)
+  webmock (~> 1.17.4)

data/README.md

@@ -1,4 +1,4 @@
-## Vagalume
+![vagalume-logo](https://github.com/brianstorti/vagalume/blob/master/vagalume.jpg)
 
 A simple ruby interface to the Vagalume API. Also a command line utility to search song lyrics.
 

data/bin/vagalume

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'optparse'
 require 'vagalume'
+require 'shellwords'
 
 if ARGV.empty?
   system "vagalume -h"
@@ -10,7 +10,7 @@ if ARGV.empty?
 end
 
 options = {}
-optparse = OptionParser.new do |opts|
+OptionParser.new do |opts|
   opts.banner = "Usage: vagalume [options] [artist] - [song]"
   opts.banner += "\n    vagalume Metallica - Unforgiven"
   opts.banner += "\n    vagalume -t Metallica - Unforgiven        Shows portuguese translation\n\n"
@@ -27,4 +27,7 @@ optparse = OptionParser.new do |opts|
 end.parse!(ARGV)
 
 artist, song = ARGV.join(" ").split("-")
-Vagalume.print(artist, song, options)
+output = Vagalume.get_lyric(artist, song, options)
+viewer = ENV["VAGALUME_VIEWER"] || "cat"
+
+system "echo #{Shellwords.escape(output)} | #{viewer} -"

data/lib/vagalume.rb

@@ -20,8 +20,8 @@ module Vagalume
     search_result = Vagalume::SearchResult.fetch(result_json)
   end
 
-  def print(artist, song, options)
+  def get_lyric(artist, song, options)
     search = find(artist, song)
-    puts Vagalume::LyricFormatter.format(search, options)
+    Vagalume::LyricFormatter.format(search, options)
   end
 end

data/spec/fixtures/vcr_cassettes/vagalume_with_no_translation_available.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://www.vagalume.com.br/api/search.php?art=Bruce%20Springsteen&mus=Ain't%20good%20enough%20for%20You
+    uri: http://www.vagalume.com.br/api/search.php?art=Bruce%20Springsteen&mus=Ain%27t%20good%20enough%20for%20You
     body:
       encoding: US-ASCII
       string: ''
@@ -76,6 +76,6 @@ http_interactions:
         Hey! Hey!\nNo matter what I do, girl you know it''s true\nAin''t good enough
         for you\nAww no matter what I do, girl you know it''s true\nAin''t good enough
         for you\nWhoaaa!"}]}'
-    http_version: 
+    http_version:
   recorded_at: Sat, 14 Jul 2012 20:48:29 GMT
 recorded_with: VCR 2.2.2

data/vagalume.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   spec.name          = "vagalume"
   spec.executables   = ["vagalume"]
-  spec.version       = "0.1.4"
+  spec.version       = "0.1.5"
   spec.authors       = ["Brian Thomas Storti"]
   spec.email         = ["btstorti@gmail.com"]
   spec.description   = "Ruby interface for the Vagalume API"
@@ -16,6 +16,10 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.require_paths = ["lib"]
 
+  spec.add_runtime_dependency "multi_json", "~> 1.9"
+
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "vcr", "~> 2.9"
+  spec.add_development_dependency "webmock", "~> 1.17"
+  spec.add_development_dependency "rspec", "~> 2.14"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: vagalume
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Brian Thomas Storti
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2015-02-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.9'
+- !ruby/object:Gem::Dependency
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.14'
 description: Ruby interface for the Vagalume API
 email:
 - btstorti@gmail.com
@@ -75,6 +117,7 @@ files:
 - spec/lyric_formatter_spec.rb
 - spec/spec_helper.rb
 - vagalume.gemspec
+- vagalume.jpg
 homepage: https://github.com/brianstorti/vagalume
 licenses:
 - MIT
@@ -95,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby interface for the Vagalume API