lyricli 0.0.1 → 0.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4a3c40e40ef5bbfcb2e58f24190e9e16d9cfe833
+  data.tar.gz: 0730ffe22cf4ab44f33933337814e6db33d34f08
+SHA512:
+  metadata.gz: 445a763aac0d369a8c703f5427a90ab4c0c98b16485d62aa9543b6e4c4e2de859e871974ab7c32cc7b920edaf98a238c40359ec71203e5b05802eeed91a22c1d
+  data.tar.gz: fd938e701f9e2a780f56204f003472e070133130235bddd7b136fe68901fdf5eb000dc6ac4d43f9e30e5c4436adbc310de415c0cf94a13fa172f8536739b0909

data/bin/lrc

@@ -3,8 +3,6 @@
 require 'optparse'
 require 'lyricli'
 
-
-options = {}
 OptionParser.new do |opts|
     opts.banner = %{Usage:
     lrc [options]
@@ -37,6 +35,10 @@ Options:
       exit
     end
 
+    opts.on("-t", "--title", "Shows the song title and artist") do
+      Lyricli.show_title
+    end
+
     opts.on("-h", "--help", "Shows this message") do
       puts opts
       exit

data/lib/lyricli.rb

@@ -40,7 +40,7 @@ module Lyricli
   # @return [String] the fetched lyrics
   def self.lyrics
     @lyricli = Lyricli.new
-    @lyricli.get_lyrics
+    @lyricli.get_lyrics(@show_title)
   end
 
   # Returns the version of the library
@@ -93,4 +93,9 @@ module Lyricli
   def self.root
     File.expand_path('../..',__FILE__)
   end
+
+  # Sets the show_title instance variable so it requests the title
+  def self.show_title
+    @show_title = true
+  end
 end

data/lib/lyricli/configuration.rb

@@ -56,7 +56,7 @@ module Lyricli
     def load_config
       path = File.expand_path(@config_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else
@@ -79,7 +79,7 @@ module Lyricli
       # Load the default
       path = File.join(::Lyricli.root, "config", @defaults_path)
 
-      if File.exists?(path)
+      if File.exist?(path)
         file = File.new(path, "r")
         @config = MultiJson.decode(file.read)
       else

data/lib/lyricli/lyricli.rb

@@ -21,7 +21,7 @@ module Lyricli
     # LyricsEngine
     #
     # @return [String] the found lyrics, or a string indicating none were found
-    def get_lyrics
+    def get_lyrics(show_title=false)
 
       begin
         set_current_track
@@ -33,7 +33,14 @@ module Lyricli
       engine = LyricsEngine.new(@current_track[:artist], @current_track[:song])
 
       begin
-        return engine.get_lyrics
+        lyrics_output = engine.get_lyrics
+
+        if show_title
+          lyrics_title = "#{@current_track[:artist]} - #{@current_track[:song]}"
+          lyrics_output = "#{lyrics_title}\n\n#{lyrics_output}"
+        end
+
+        return lyrics_output
       rescue Exceptions::LyricsNotFoundError
         return "Lyrics not found :("
       end

data/lib/lyricli/lyrics_engine.rb

@@ -31,11 +31,15 @@ module Lyricli
         n.remove
       end
 
+      node.search("script").each do |n|
+        n.remove
+      end
+
       node.search("br").each do |br|
         br.replace "\n"
       end
 
-      node.inner_text
+      node.inner_text.gsub(/\s+$/, "")
     end
   end
 end

metadata

@@ -1,144 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: lyricli
 version: !ruby/object:Gem::Version
-  version: 0.0.1
-  prerelease: 
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Beltran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.5
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rdio
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: '0.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.6
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2.1
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.11.0
+        version: '2.11'
 description: Lyricli is an awesome CLI tool to read the lyrics of your currently playing
   song right in the command line
 email: ben@nsovocal.com
@@ -147,7 +130,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile
+- Gemfile.lock
+- README.md
+- bin/lrc
+- config/defaults.json
+- lib/lyricli.rb
 - lib/lyricli/configuration.rb
+- lib/lyricli/exceptions.rb
 - lib/lyricli/exceptions/disable_source_error.rb
 - lib/lyricli/exceptions/enable_source_error.rb
 - lib/lyricli/exceptions/invalid_lyrics_error.rb
@@ -156,20 +146,15 @@ files:
 - lib/lyricli/exceptions/source_configuration_error.rb
 - lib/lyricli/exceptions/start_source_error.rb
 - lib/lyricli/exceptions/unknown_source_error.rb
-- lib/lyricli/exceptions.rb
 - lib/lyricli/lyricli.rb
 - lib/lyricli/lyrics_engine.rb
 - lib/lyricli/source_manager.rb
+- lib/lyricli/sources.rb
 - lib/lyricli/sources/arguments.rb
+- lib/lyricli/sources/current_song.scpt
 - lib/lyricli/sources/itunes.rb
 - lib/lyricli/sources/rdio.rb
-- lib/lyricli/sources.rb
 - lib/lyricli/util.rb
-- lib/lyricli.rb
-- bin/lrc
-- Gemfile
-- Gemfile.lock
-- README.md
 - spec/bin/lrc_spec.rb
 - spec/lib/lyricli/configuration_spec.rb
 - spec/lib/lyricli/exceptions_spec.rb
@@ -182,31 +167,28 @@ files:
 - spec/lib/lyricli/sources_spec.rb
 - spec/lib/lyricli/util_spec.rb
 - spec/lib/lyricli_spec.rb
-- config/defaults.json
-- lib/lyricli/sources/current_song.scpt
 homepage: http://nsovocal.com/lyricli
-licenses: []
+licenses:
+- BSD-3-Clause
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lyricli is an awesome lyric client for your Command Line
 test_files: []
-has_rdoc: