Document the errors... ish?

diff --git a/doc/Lyricli.html b/doc/Lyricli.html
index d757eacdc926304fe67c5f093d4c03625a9e9cc9..cb9593318ba79791ea3944a7e486d5ce7d47c5d0 100644 (file)
--- a/doc/Lyricli.html
+++ b/doc/Lyricli.html
@@ -80,7 +80,7 @@
   
     <dt class="r1 last">Defined in:</dt>
     <dd class="r1 last">lib/lyricli.rb<span class="defines">,<br />
   
     <dt class="r1 last">Defined in:</dt>
     <dd class="r1 last">lib/lyricli.rb<span class="defines">,<br />

-  lib/lyricli/util.rb,<br /> lib/lyricli/lyricli.rb,<br /> lib/lyricli/sources.rb,<br /> lib/lyricli/exceptions.rb,<br /> lib/lyricli/sources/rdio.rb,<br /> lib/lyricli/lyrics_engine.rb,<br /> lib/lyricli/configuration.rb,<br /> lib/lyricli/sources/itunes.rb,<br /> lib/lyricli/source_manager.rb,<br /> lib/lyricli/sources/arguments.rb</span>
+  lib/lyricli/util.rb,<br /> lib/lyricli/sources.rb,<br /> lib/lyricli/lyricli.rb,<br /> lib/lyricli/exceptions.rb,<br /> lib/lyricli/sources/rdio.rb,<br /> lib/lyricli/configuration.rb,<br /> lib/lyricli/lyrics_engine.rb,<br /> lib/lyricli/sources/itunes.rb,<br /> lib/lyricli/source_manager.rb,<br /> lib/lyricli/sources/arguments.rb,<br /> lib/lyricli/exceptions/reset_source_error.rb,<br /> lib/lyricli/exceptions/start_source_error.rb,<br /> lib/lyricli/exceptions/enable_source_error.rb,<br /> lib/lyricli/exceptions/unknown_source_error.rb,<br /> lib/lyricli/exceptions/invalid_lyrics_error.rb,<br /> lib/lyricli/exceptions/disable_source_error.rb,<br /> lib/lyricli/exceptions/lyrics_not_found_error.rb,<br /> lib/lyricli/exceptions/source_configuration_error.rb</span>

 </dd>
   
 </dl>
 </dd>
   
 </dl>


@@ -313,17 +313,25 @@ Disables a source via the Source Manager
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-56
-57
-58
-59</pre>
+70
+71
+72
+73
+74
+75
+76
+77</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 56</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 70</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>

-  <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>rescue</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>There is no such Source</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>

 <span class='kw'>end</span></pre>
     </td>
   </tr>
 <span class='kw'>end</span></pre>
     </td>
   </tr>


@@ -357,17 +365,25 @@ Enables a source via the Source Manager
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-50
-51
-52
-53</pre>
+60
+61
+62
+63
+64
+65
+66
+67</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 50</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 60</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_enable'>enable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_enable'>enable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>

-  <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_enable'>enable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_enable'>enable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>rescue</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>There is no such Source</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>

 <span class='kw'>end</span></pre>
     </td>
   </tr>
 <span class='kw'>end</span></pre>
     </td>
   </tr>


@@ -421,13 +437,13 @@ the fetched lyrics
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-30
-31
-32
-33</pre>
+40
+41
+42
+43</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 30</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 40</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_lyrics'>lyrics</span>
   <span class='ivar'>@lyricli</span> <span class='op'>=</span> <span class='const'>Lyricli</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_lyrics'>lyrics</span>
   <span class='ivar'>@lyricli</span> <span class='op'>=</span> <span class='const'>Lyricli</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>


@@ -465,17 +481,25 @@ Resets all configuration for a source via the Source Manager
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-62
-63
-64
-65</pre>
+80
+81
+82
+83
+84
+85
+86
+87</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 62</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 80</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>

-  <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_source_manager'>source_manager</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
+  <span class='kw'>rescue</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>
+    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>There is no such Source</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>

 <span class='kw'>end</span></pre>
     </td>
   </tr>
 <span class='kw'>end</span></pre>
     </td>
   </tr>


@@ -528,13 +552,13 @@ the list of available sources. Enabled sources have a star appended.
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-44
-45
-46
-47</pre>
+54
+55
+56
+57</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 44</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 54</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_sources'>sources</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_sources'>sources</span>
   <span class='id identifier rubyid_source_manager'>source_manager</span> <span class='op'>=</span> <span class='const'>SourceManager</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>


@@ -591,12 +615,12 @@ the version
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-37
-38
-39</pre>
+47
+48
+49</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 37</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli.rb', line 47</span>

 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_version'>version</span>
   <span class='const'>Gem</span><span class='period'>.</span><span class='id identifier rubyid_loaded_specs'>loaded_specs</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>lyricli</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_version'>version</span>
 
 <span class='kw'>def</span> <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_version'>version</span>
   <span class='const'>Gem</span><span class='period'>.</span><span class='id identifier rubyid_loaded_specs'>loaded_specs</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>lyricli</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_version'>version</span>


@@ -611,7 +635,7 @@ the version
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Configuration.html b/doc/Lyricli/Configuration.html
index f2fa54d8b901a5ef3cea26ecdcc35ca4ecf29174..54b439ca2101b945c178642896a2613b50169437 100644 (file)
--- a/doc/Lyricli/Configuration.html
+++ b/doc/Lyricli/Configuration.html
@@ -783,7 +783,7 @@ Serializes the `@config` Hash to JSON and saves it to a file.
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Exceptions.html b/doc/Lyricli/Exceptions.html
index f6acefd119c7b2647db74e885dfed070892bf238..5cb8e99f158ad645bff03609df1e5bfe17bf5d28 100644 (file)
--- a/doc/Lyricli/Exceptions.html
+++ b/doc/Lyricli/Exceptions.html
@@ -79,7 +79,9 @@
   
   
     <dt class="r1 last">Defined in:</dt>
   
   
     <dt class="r1 last">Defined in:</dt>

-    <dd class="r1 last">lib/lyricli/exceptions.rb</dd>
+    <dd class="r1 last">lib/lyricli/exceptions.rb<span class="defines">,<br />
+  lib/lyricli/exceptions/reset_source_error.rb,<br /> lib/lyricli/exceptions/start_source_error.rb,<br /> lib/lyricli/exceptions/enable_source_error.rb,<br /> lib/lyricli/exceptions/unknown_source_error.rb,<br /> lib/lyricli/exceptions/invalid_lyrics_error.rb,<br /> lib/lyricli/exceptions/disable_source_error.rb,<br /> lib/lyricli/exceptions/lyrics_not_found_error.rb,<br /> lib/lyricli/exceptions/source_configuration_error.rb</span>
+</dd>

   
 </dl>
 <div class="clear"></div>
   
 </dl>
 <div class="clear"></div>


@@ -96,7 +98,17 @@ The namespace for all exceptions in Lyricli. Has no functionality by itself
 <div class="tags">
   
 
 <div class="tags">
   
 

-</div>
+</div><h2>Defined Under Namespace</h2>
+<p class="children">
+  
+    
+  
+    
+      <strong class="classes">Classes:</strong> <span class='object_link'><a href="Exceptions/DisableSourceError.html" title="Lyricli::Exceptions::DisableSourceError (class)">DisableSourceError</a></span>, <span class='object_link'><a href="Exceptions/EnableSourceError.html" title="Lyricli::Exceptions::EnableSourceError (class)">EnableSourceError</a></span>, <span class='object_link'><a href="Exceptions/InvalidLyricsError.html" title="Lyricli::Exceptions::InvalidLyricsError (class)">InvalidLyricsError</a></span>, <span class='object_link'><a href="Exceptions/LyricsNotFoundError.html" title="Lyricli::Exceptions::LyricsNotFoundError (class)">LyricsNotFoundError</a></span>, <span class='object_link'><a href="Exceptions/ResetSourceError.html" title="Lyricli::Exceptions::ResetSourceError (class)">ResetSourceError</a></span>, <span class='object_link'><a href="Exceptions/SourceConfigurationError.html" title="Lyricli::Exceptions::SourceConfigurationError (class)">SourceConfigurationError</a></span>, <span class='object_link'><a href="Exceptions/StartSourceError.html" title="Lyricli::Exceptions::StartSourceError (class)">StartSourceError</a></span>, <span class='object_link'><a href="Exceptions/UnknownSourceError.html" title="Lyricli::Exceptions::UnknownSourceError (class)">UnknownSourceError</a></span>
+    
+  
+</p>
+

 
 
 
 
 
 


@@ -108,7 +120,7 @@ The namespace for all exceptions in Lyricli. Has no functionality by itself
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Lyricli.html b/doc/Lyricli/Lyricli.html
index 60c3a9487d2b5bbc02a5124a4af60647b104ae42..e3accb5aea6f641012fee32b993385c97d432be2 100644 (file)
--- a/doc/Lyricli/Lyricli.html
+++ b/doc/Lyricli/Lyricli.html
@@ -170,7 +170,7 @@ Exits with error when there is an empty field from the current track.
 
   
     <span class="summary_desc"><div class='inline'><p>
 
   
     <span class="summary_desc"><div class='inline'><p>

-Raises an InvalidLyricsException which means we did not get any valid
+Raises an InvalidLyricsError which means we did not get any valid

 artist/song from any of the sources.
 </p>
 </div></span>
 artist/song from any of the sources.
 </p>
 </div></span>


@@ -339,15 +339,17 @@ Exits with error when there is an empty field from the current track.
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-44
-45
-46
-47</pre>
+49
+50
+51
+52
+53</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 44</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 49</span>

 
 <span class='kw'>def</span> <span class='id identifier rubyid_check_params'>check_params</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_check_params'>check_params</span>

+  <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_exit_with_error'>exit_with_error</span> <span class='kw'>unless</span> <span class='ivar'>@current_track</span>

   <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_exit_with_error'>exit_with_error</span> <span class='kw'>if</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='kw'>or</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
   <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_exit_with_error'>exit_with_error</span> <span class='kw'>if</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='kw'>or</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
 <span class='kw'>end</span></pre>
   <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_exit_with_error'>exit_with_error</span> <span class='kw'>if</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='kw'>or</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
   <span class='kw'>self</span><span class='period'>.</span><span class='id identifier rubyid_exit_with_error'>exit_with_error</span> <span class='kw'>if</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_nil?'>nil?</span> <span class='kw'>or</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_empty?'>empty?</span>
 <span class='kw'>end</span></pre>


@@ -368,7 +370,7 @@ Exits with error when there is an empty field from the current track.
 </h3><div class="docstring">
   <div class="discussion">
     <p>
 </h3><div class="docstring">
   <div class="discussion">
     <p>

-Raises an InvalidLyricsException which means we did not get any valid
+Raises an InvalidLyricsError which means we did not get any valid

 artist/song from any of the sources
 </p>
 
 artist/song from any of the sources
 </p>
 


@@ -383,7 +385,7 @@ artist/song from any of the sources
     <li>
       
       
     <li>
       
       

-        <span class='type'>(<tt>Lyricli::InvalidLyricsException</tt>)</span>
+        <span class='type'>(<tt><span class='object_link'><a href="Exceptions/InvalidLyricsError.html" title="Lyricli::Exceptions::InvalidLyricsError (class)">Lyricli::Exceptions::InvalidLyricsError</a></span></tt>)</span>

       
       
       
       
       
       


@@ -411,7 +413,7 @@ because we found nothing
       <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 16</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_exit_with_error'>exit_with_error</span>
       <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 16</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_exit_with_error'>exit_with_error</span>

-  <span class='id identifier rubyid_raise'>raise</span> <span class='const'>InvalidLyricsException</span>
+  <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>InvalidLyricsError</span>

 <span class='kw'>end</span></pre>
     </td>
   </tr>
 <span class='kw'>end</span></pre>
     </td>
   </tr>


@@ -476,21 +478,31 @@ the found lyrics, or a string indicating none were found
 32
 33
 34
 32
 33
 34

-35</pre>
+35
+36
+37
+38
+39
+40</pre>

     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 24</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_get_lyrics'>get_lyrics</span>
     </td>
     <td>
       <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 24</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_get_lyrics'>get_lyrics</span>

-  <span class='id identifier rubyid_set_current_track'>set_current_track</span>
-  <span class='id identifier rubyid_check_params'>check_params</span>
+
+  <span class='kw'>begin</span>
+    <span class='id identifier rubyid_set_current_track'>set_current_track</span>
+    <span class='id identifier rubyid_check_params'>check_params</span>
+  <span class='kw'>rescue</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>InvalidLyricsError</span>
+    <span class='kw'>return</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>No Artist/Song could be found :(</span><span class='tstring_end'>&quot;</span></span>
+  <span class='kw'>end</span>

 
   <span class='id identifier rubyid_engine'>engine</span> <span class='op'>=</span> <span class='const'>LyricsEngine</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='rparen'>)</span>
 
   <span class='kw'>begin</span>
 
   <span class='id identifier rubyid_engine'>engine</span> <span class='op'>=</span> <span class='const'>LyricsEngine</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span><span class='lparen'>(</span><span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:artist</span><span class='rbracket'>]</span><span class='comma'>,</span> <span class='ivar'>@current_track</span><span class='lbracket'>[</span><span class='symbol'>:song</span><span class='rbracket'>]</span><span class='rparen'>)</span>
 
   <span class='kw'>begin</span>

-    <span class='id identifier rubyid_engine'>engine</span><span class='period'>.</span><span class='id identifier rubyid_get_lyrics'>get_lyrics</span>
-  <span class='kw'>rescue</span> <span class='const'>LyricsNotFoundException</span>
-    <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Lyrics not found :(</span><span class='tstring_end'>&quot;</span></span>
+    <span class='kw'>return</span> <span class='id identifier rubyid_engine'>engine</span><span class='period'>.</span><span class='id identifier rubyid_get_lyrics'>get_lyrics</span>
+  <span class='kw'>rescue</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>LyricsNotFoundError</span>
+    <span class='kw'>return</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>Lyrics not found :(</span><span class='tstring_end'>&quot;</span></span>

   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>


@@ -526,12 +538,12 @@ its current track
       <pre class="lines">
 
 
       <pre class="lines">
 
 

-39
-40
-41</pre>
+44
+45
+46</pre>

     </td>
     <td>
     </td>
     <td>

-      <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 39</span>
+      <pre class="code"><span class="info file"># File 'lib/lyricli/lyricli.rb', line 44</span>

 
 <span class='kw'>def</span> <span class='id identifier rubyid_set_current_track'>set_current_track</span>
   <span class='ivar'>@current_track</span> <span class='op'>=</span> <span class='ivar'>@source_manager</span><span class='period'>.</span><span class='id identifier rubyid_current_track'>current_track</span>
 
 <span class='kw'>def</span> <span class='id identifier rubyid_set_current_track'>set_current_track</span>
   <span class='ivar'>@current_track</span> <span class='op'>=</span> <span class='ivar'>@source_manager</span><span class='period'>.</span><span class='id identifier rubyid_current_track'>current_track</span>


@@ -546,7 +558,7 @@ its current track
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/LyricsEngine.html b/doc/Lyricli/LyricsEngine.html
index 0efd283fa3a47e68025fec833636616ca31c4bc9..4d7c6694d47d24a0024121451866c0a0cf5e8b28 100644 (file)
--- a/doc/Lyricli/LyricsEngine.html
+++ b/doc/Lyricli/LyricsEngine.html
@@ -365,7 +365,7 @@ the lyrics
     <span class='id identifier rubyid_doc'>doc</span> <span class='op'>=</span> <span class='const'>Nokogiri</span><span class='op'>::</span><span class='const'>HTML</span><span class='lparen'>(</span><span class='id identifier rubyid_open'>open</span><span class='lparen'>(</span><span class='id identifier rubyid_response'>response</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>url</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_node'>node</span> <span class='op'>=</span> <span class='id identifier rubyid_doc'>doc</span><span class='period'>.</span><span class='id identifier rubyid_search'>search</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>.lyricbox</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
   <span class='kw'>rescue</span>
     <span class='id identifier rubyid_doc'>doc</span> <span class='op'>=</span> <span class='const'>Nokogiri</span><span class='op'>::</span><span class='const'>HTML</span><span class='lparen'>(</span><span class='id identifier rubyid_open'>open</span><span class='lparen'>(</span><span class='id identifier rubyid_response'>response</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>'</span><span class='tstring_content'>url</span><span class='tstring_end'>'</span></span><span class='rbracket'>]</span><span class='rparen'>)</span><span class='rparen'>)</span>
     <span class='id identifier rubyid_node'>node</span> <span class='op'>=</span> <span class='id identifier rubyid_doc'>doc</span><span class='period'>.</span><span class='id identifier rubyid_search'>search</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>.lyricbox</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_first'>first</span>
   <span class='kw'>rescue</span>

-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Lyricli</span><span class='op'>::</span><span class='const'>LyricsNotFoundException</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>LyricsNotFoundError</span>

   <span class='kw'>end</span>
 
   <span class='id identifier rubyid_node'>node</span><span class='period'>.</span><span class='id identifier rubyid_search'>search</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>.rtMatcher</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_n'>n</span><span class='op'>|</span>
   <span class='kw'>end</span>
 
   <span class='id identifier rubyid_node'>node</span><span class='period'>.</span><span class='id identifier rubyid_search'>search</span><span class='lparen'>(</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>.rtMatcher</span><span class='tstring_end'>&quot;</span></span><span class='rparen'>)</span><span class='period'>.</span><span class='id identifier rubyid_each'>each</span> <span class='kw'>do</span> <span class='op'>|</span><span class='id identifier rubyid_n'>n</span><span class='op'>|</span>


@@ -388,7 +388,7 @@ the lyrics
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/SourceManager.html b/doc/Lyricli/SourceManager.html
index 3a37bc4f2c57819a79b3c74e6989072f55a29e5b..a8ddaa0de1bd3addd9fbe3218255386c1d4bfd0b 100644 (file)
--- a/doc/Lyricli/SourceManager.html
+++ b/doc/Lyricli/SourceManager.html
@@ -377,7 +377,7 @@ Creates a new instance of SourceManager
       <span class='id identifier rubyid_current_source'>current_source</span> <span class='op'>=</span> <span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
       <span class='ivar'>@enabled_sources</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_current_source'>current_source</span>
     <span class='kw'>else</span>
       <span class='id identifier rubyid_current_source'>current_source</span> <span class='op'>=</span> <span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_new'>new</span>
       <span class='ivar'>@enabled_sources</span> <span class='op'>&lt;&lt;</span> <span class='id identifier rubyid_current_source'>current_source</span>
     <span class='kw'>else</span>

-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>StartSourceException</span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>StartSourceError</span>

     <span class='kw'>end</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     <span class='kw'>end</span>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>


@@ -589,7 +589,7 @@ the current track, has an `:artist` and `:song` key.
         <span class='id identifier rubyid_lock'>lock</span> <span class='op'>=</span> <span class='kw'>true</span> <span class='kw'>if</span> <span class='id identifier rubyid_source'>source</span><span class='period'>.</span><span class='id identifier rubyid_class'>class</span><span class='period'>.</span><span class='id identifier rubyid_name'>name</span> <span class='op'>==</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>arguments</span><span class='tstring_end'>&quot;</span></span>
       <span class='kw'>end</span>
     <span class='kw'>rescue</span>
         <span class='id identifier rubyid_lock'>lock</span> <span class='op'>=</span> <span class='kw'>true</span> <span class='kw'>if</span> <span class='id identifier rubyid_source'>source</span><span class='period'>.</span><span class='id identifier rubyid_class'>class</span><span class='period'>.</span><span class='id identifier rubyid_name'>name</span> <span class='op'>==</span> <span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>arguments</span><span class='tstring_end'>&quot;</span></span>
       <span class='kw'>end</span>
     <span class='kw'>rescue</span>

-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>SourceConfigurationException</span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>SourceConfigurationError</span>

     <span class='kw'>end</span>
   <span class='kw'>end</span>
   <span class='id identifier rubyid_track'>track</span>
     <span class='kw'>end</span>
   <span class='kw'>end</span>
   <span class='id identifier rubyid_track'>track</span>


@@ -670,10 +670,10 @@ the name of the source to disable
       <span class='ivar'>@config</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>enabled_sources</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
       <span class='ivar'>@config</span><span class='period'>.</span><span class='id identifier rubyid_save_config'>save_config</span>
     <span class='kw'>else</span>
       <span class='ivar'>@config</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>enabled_sources</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_delete'>delete</span><span class='lparen'>(</span><span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_name'>name</span><span class='rparen'>)</span>
       <span class='ivar'>@config</span><span class='period'>.</span><span class='id identifier rubyid_save_config'>save_config</span>
     <span class='kw'>else</span>

-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>DisableSourceException</span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>DisableSourceError</span>

     <span class='kw'>end</span>
   <span class='kw'>else</span>
     <span class='kw'>end</span>
   <span class='kw'>else</span>

-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>UnknownSource</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>

   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>


@@ -757,10 +757,10 @@ the name of the source to enable
       <span class='ivar'>@config</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>enabled_sources</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_uniq!'>uniq!</span>
       <span class='ivar'>@config</span><span class='period'>.</span><span class='id identifier rubyid_save_config'>save_config</span>
     <span class='kw'>else</span>
       <span class='ivar'>@config</span><span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&quot;</span><span class='tstring_content'>enabled_sources</span><span class='tstring_end'>&quot;</span></span><span class='rbracket'>]</span><span class='period'>.</span><span class='id identifier rubyid_uniq!'>uniq!</span>
       <span class='ivar'>@config</span><span class='period'>.</span><span class='id identifier rubyid_save_config'>save_config</span>
     <span class='kw'>else</span>

-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>EnableSourceException</span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>EnableSourceError</span>

     <span class='kw'>end</span>
   <span class='kw'>else</span>
     <span class='kw'>end</span>
   <span class='kw'>else</span>

-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>UnknownSource</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>

   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>


@@ -927,10 +927,10 @@ the name of the source to reset.
       <span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span>
       <span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
     <span class='kw'>else</span>
       <span class='id identifier rubyid_klass'>klass</span><span class='period'>.</span><span class='id identifier rubyid_reset'>reset</span>
       <span class='id identifier rubyid_disable'>disable</span><span class='lparen'>(</span><span class='id identifier rubyid_source_name'>source_name</span><span class='rparen'>)</span>
     <span class='kw'>else</span>

-      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>ResetSourceException</span>
+      <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>ResetSourceError</span>

     <span class='kw'>end</span>
   <span class='kw'>else</span>
     <span class='kw'>end</span>
   <span class='kw'>else</span>

-    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>UnknownSource</span>
+    <span class='id identifier rubyid_raise'>raise</span> <span class='const'>Exceptions</span><span class='op'>::</span><span class='const'>UnknownSourceError</span>

   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>
   <span class='kw'>end</span>
 <span class='kw'>end</span></pre>
     </td>


@@ -943,7 +943,7 @@ the name of the source to reset.
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Sources.html b/doc/Lyricli/Sources.html
index 518014ab0d016c0f3773857e7a52f5e5eaf8fcac..0ebaab8aaa60c7aafaa64308b31bd2c3ca470eba 100644 (file)
--- a/doc/Lyricli/Sources.html
+++ b/doc/Lyricli/Sources.html
@@ -120,7 +120,7 @@ The namespace for all sources in Lyricli. Has no functionality by itself
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Sources/Arguments.html b/doc/Lyricli/Sources/Arguments.html
index 934a4a7101fc7616ceda3e31445ece1953f7f2ef..f3678ed7c2e69ff1b98b0751e0794ed0995e9d57 100644 (file)
--- a/doc/Lyricli/Sources/Arguments.html
+++ b/doc/Lyricli/Sources/Arguments.html
@@ -539,7 +539,7 @@ A hash containing the current `:song` and `:artist`.
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Sources/Itunes.html b/doc/Lyricli/Sources/Itunes.html
index 349f1189f47dd0f46c8ff529b5960892dd9cad08..e1a0f05fa83fa0d2cd9cbe9036955ced82753d1d 100644 (file)
--- a/doc/Lyricli/Sources/Itunes.html
+++ b/doc/Lyricli/Sources/Itunes.html
@@ -544,7 +544,7 @@ A hash containing the current `:song` and `:artist`.
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Sources/Rdio.html b/doc/Lyricli/Sources/Rdio.html
index 3336a24284fc731d320ad065c9a56409d902e89b..d79cade61ae4f97f19aaffb67aaccebf22ebf77f 100644 (file)
--- a/doc/Lyricli/Sources/Rdio.html
+++ b/doc/Lyricli/Sources/Rdio.html
@@ -661,7 +661,7 @@ A hash containing the current `:song` and `:artist`.
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/Lyricli/Util.html b/doc/Lyricli/Util.html
index a126af59b4b20b763cd5d5e6372ca22f448fbf17..610ec2cce61e531b29dea880a797e19aebaa6fe6 100644 (file)
--- a/doc/Lyricli/Util.html
+++ b/doc/Lyricli/Util.html
@@ -464,7 +464,7 @@ the sanitized parameter
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:27 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/_index.html b/doc/_index.html
index 681baf6d422d323dc8bbd6475216804a719c339a..6e818225190a06aa4a925d63b5a36d8356a5d2e0 100644 (file)
--- a/doc/_index.html
+++ b/doc/_index.html
@@ -110,10 +110,32 @@
         </ul>
       
         
         </ul>
       
         

+        <ul id="alpha_D" class="alpha">
+          <li class="letter">D</li>
+          <ul>
+            
+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/DisableSourceError.html" title="Lyricli::Exceptions::DisableSourceError (class)">DisableSourceError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            
+          </ul>
+        </ul>
+      
+        

         <ul id="alpha_E" class="alpha">
           <li class="letter">E</li>
           <ul>
             
         <ul id="alpha_E" class="alpha">
           <li class="letter">E</li>
           <ul>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/EnableSourceError.html" title="Lyricli::Exceptions::EnableSourceError (class)">EnableSourceError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

               <li>
                 <span class='object_link'><a href="Lyricli/Exceptions.html" title="Lyricli::Exceptions (module)">Exceptions</a></span>
                 
               <li>
                 <span class='object_link'><a href="Lyricli/Exceptions.html" title="Lyricli::Exceptions (module)">Exceptions</a></span>
                 


@@ -129,6 +151,13 @@
           <li class="letter">I</li>
           <ul>
             
           <li class="letter">I</li>
           <ul>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/InvalidLyricsError.html" title="Lyricli::Exceptions::InvalidLyricsError (class)">InvalidLyricsError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

               <li>
                 <span class='object_link'><a href="Lyricli/Sources/Itunes.html" title="Lyricli::Sources::Itunes (class)">Itunes</a></span>
                 
               <li>
                 <span class='object_link'><a href="Lyricli/Sources/Itunes.html" title="Lyricli::Sources::Itunes (class)">Itunes</a></span>
                 


@@ -163,6 +192,13 @@
                 
               </li>
             
                 
               </li>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/LyricsNotFoundError.html" title="Lyricli::Exceptions::LyricsNotFoundError (class)">LyricsNotFoundError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

           </ul>
         </ul>
       
           </ul>
         </ul>
       


@@ -178,14 +214,31 @@
                 
               </li>
             
                 
               </li>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/ResetSourceError.html" title="Lyricli::Exceptions::ResetSourceError (class)">ResetSourceError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

           </ul>
         </ul>
       
         
           </ul>
         </ul>
       
         

+          </td><td valign='top' width="33%">
+          
+        

         <ul id="alpha_S" class="alpha">
           <li class="letter">S</li>
           <ul>
             
         <ul id="alpha_S" class="alpha">
           <li class="letter">S</li>
           <ul>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/SourceConfigurationError.html" title="Lyricli::Exceptions::SourceConfigurationError (class)">SourceConfigurationError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

               <li>
                 <span class='object_link'><a href="Lyricli/SourceManager.html" title="Lyricli::SourceManager (class)">SourceManager</a></span>
                 
               <li>
                 <span class='object_link'><a href="Lyricli/SourceManager.html" title="Lyricli::SourceManager (class)">SourceManager</a></span>
                 


@@ -200,17 +253,28 @@
                 
               </li>
             
                 
               </li>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/StartSourceError.html" title="Lyricli::Exceptions::StartSourceError (class)">StartSourceError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

           </ul>
         </ul>
       
         
           </ul>
         </ul>
       
         

-          </td><td valign='top' width="33%">
-          
-        

         <ul id="alpha_U" class="alpha">
           <li class="letter">U</li>
           <ul>
             
         <ul id="alpha_U" class="alpha">
           <li class="letter">U</li>
           <ul>
             

+              <li>
+                <span class='object_link'><a href="Lyricli/Exceptions/UnknownSourceError.html" title="Lyricli::Exceptions::UnknownSourceError (class)">UnknownSourceError</a></span>
+                
+                  <small>(Lyricli::Exceptions)</small>
+                
+              </li>
+            

               <li>
                 <span class='object_link'><a href="Lyricli/Util.html" title="Lyricli::Util (module)">Util</a></span>
                 
               <li>
                 <span class='object_link'><a href="Lyricli/Util.html" title="Lyricli::Util (module)">Util</a></span>
                 


@@ -230,7 +294,7 @@
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:26 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/class_list.html b/doc/class_list.html
index 598a4a4f27794b7fe85efd035ec76487817d2217..6f7ba77420e724d300b6d70cdd02d2899003dba8 100644 (file)
--- a/doc/class_list.html
+++ b/doc/class_list.html
@@ -45,7 +45,7 @@
 
       <ul id="full_list" class="class">
         <li><span class='object_link'><a href="top-level-namespace.html" title=" (root)">Top Level Namespace</a></span></li>
 
       <ul id="full_list" class="class">
         <li><span class='object_link'><a href="top-level-namespace.html" title=" (root)">Top Level Namespace</a></span></li>

-<li><a class='toggle'></a> <span class='object_link'><a href="Lyricli.html" title="Lyricli (module)">Lyricli</a></span><small class='search_info'>Top Level Namespace</small></li><ul><li><span class='object_link'><a href="Lyricli/Configuration.html" title="Lyricli::Configuration (class)">Configuration</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/Exceptions.html" title="Lyricli::Exceptions (module)">Exceptions</a></span><small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/Lyricli.html" title="Lyricli::Lyricli (class)">Lyricli</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/LyricsEngine.html" title="Lyricli::LyricsEngine (class)">LyricsEngine</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/SourceManager.html" title="Lyricli::SourceManager (class)">SourceManager</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><a class='toggle'></a> <span class='object_link'><a href="Lyricli/Sources.html" title="Lyricli::Sources (module)">Sources</a></span><small class='search_info'>Lyricli</small></li><ul><li><span class='object_link'><a href="Lyricli/Sources/Arguments.html" title="Lyricli::Sources::Arguments (class)">Arguments</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li><li><span class='object_link'><a href="Lyricli/Sources/Itunes.html" title="Lyricli::Sources::Itunes (class)">Itunes</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li><li><span class='object_link'><a href="Lyricli/Sources/Rdio.html" title="Lyricli::Sources::Rdio (class)">Rdio</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li></ul><li><span class='object_link'><a href="Lyricli/Util.html" title="Lyricli::Util (module)">Util</a></span><small class='search_info'>Lyricli</small></li></ul>
+<li><a class='toggle'></a> <span class='object_link'><a href="Lyricli.html" title="Lyricli (module)">Lyricli</a></span><small class='search_info'>Top Level Namespace</small></li><ul><li><span class='object_link'><a href="Lyricli/Configuration.html" title="Lyricli::Configuration (class)">Configuration</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><a class='toggle'></a> <span class='object_link'><a href="Lyricli/Exceptions.html" title="Lyricli::Exceptions (module)">Exceptions</a></span><small class='search_info'>Lyricli</small></li><ul><li><span class='object_link'><a href="Lyricli/Exceptions/DisableSourceError.html" title="Lyricli::Exceptions::DisableSourceError (class)">DisableSourceError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/EnableSourceError.html" title="Lyricli::Exceptions::EnableSourceError (class)">EnableSourceError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/InvalidLyricsError.html" title="Lyricli::Exceptions::InvalidLyricsError (class)">InvalidLyricsError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/LyricsNotFoundError.html" title="Lyricli::Exceptions::LyricsNotFoundError (class)">LyricsNotFoundError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/ResetSourceError.html" title="Lyricli::Exceptions::ResetSourceError (class)">ResetSourceError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/SourceConfigurationError.html" title="Lyricli::Exceptions::SourceConfigurationError (class)">SourceConfigurationError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/StartSourceError.html" title="Lyricli::Exceptions::StartSourceError (class)">StartSourceError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li><li><span class='object_link'><a href="Lyricli/Exceptions/UnknownSourceError.html" title="Lyricli::Exceptions::UnknownSourceError (class)">UnknownSourceError</a></span> &lt; StandardError<small class='search_info'>Lyricli::Exceptions</small></li></ul><li><span class='object_link'><a href="Lyricli/Lyricli.html" title="Lyricli::Lyricli (class)">Lyricli</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/LyricsEngine.html" title="Lyricli::LyricsEngine (class)">LyricsEngine</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><span class='object_link'><a href="Lyricli/SourceManager.html" title="Lyricli::SourceManager (class)">SourceManager</a></span> &lt; Object<small class='search_info'>Lyricli</small></li><li><a class='toggle'></a> <span class='object_link'><a href="Lyricli/Sources.html" title="Lyricli::Sources (module)">Sources</a></span><small class='search_info'>Lyricli</small></li><ul><li><span class='object_link'><a href="Lyricli/Sources/Arguments.html" title="Lyricli::Sources::Arguments (class)">Arguments</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li><li><span class='object_link'><a href="Lyricli/Sources/Itunes.html" title="Lyricli::Sources::Itunes (class)">Itunes</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li><li><span class='object_link'><a href="Lyricli/Sources/Rdio.html" title="Lyricli::Sources::Rdio (class)">Rdio</a></span> &lt; Object<small class='search_info'>Lyricli::Sources</small></li></ul><li><span class='object_link'><a href="Lyricli/Util.html" title="Lyricli::Util (module)">Util</a></span><small class='search_info'>Lyricli</small></li></ul>

 
       </ul>
     </div>
 
       </ul>
     </div>

diff --git a/doc/file.README.html b/doc/file.README.html
index efaa47535e7cc08ecbe302e3399a63cf7f9f5f4a..5b5a8e3b687d0da86c34f7c0e059ae9b2c0cff7b 100644 (file)
--- a/doc/file.README.html
+++ b/doc/file.README.html
@@ -134,7 +134,7 @@ post any issues you find.</p>
 </div></div>
 
     <div id="footer">
 </div></div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:26 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/index.html b/doc/index.html
index efaa47535e7cc08ecbe302e3399a63cf7f9f5f4a..5b5a8e3b687d0da86c34f7c0e059ae9b2c0cff7b 100644 (file)
--- a/doc/index.html
+++ b/doc/index.html
@@ -134,7 +134,7 @@ post any issues you find.</p>
 </div></div>
 
     <div id="footer">
 </div></div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:26 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/doc/method_list.html b/doc/method_list.html
index f731b8e91e08bde4d6ef451eaffddaa1c17fdde2..a54d0ca7c78f14d88a99770a59f36daca1e0fc80 100644 (file)
--- a/doc/method_list.html
+++ b/doc/method_list.html
@@ -95,33 +95,33 @@
   
 
   <li class="r1 ">
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/Sources/Rdio.html#current_track-instance_method" title="Lyricli::Sources::Rdio#current_track (method)">#current_track</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#current_track-instance_method" title="Lyricli::Sources::Itunes#current_track (method)">#current_track</a></span>

     
     

-      <small>Lyricli::Sources::Rdio</small>
+      <small>Lyricli::Sources::Itunes</small>

     
   </li>
   
 
   <li class="r2 ">
     
   </li>
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/Sources/Arguments.html#current_track-instance_method" title="Lyricli::Sources::Arguments#current_track (method)">#current_track</a></span>
+    <span class='object_link'><a href="Lyricli/SourceManager.html#current_track-instance_method" title="Lyricli::SourceManager#current_track (method)">#current_track</a></span>

     
     

-      <small>Lyricli::Sources::Arguments</small>
+      <small>Lyricli::SourceManager</small>

     
   </li>
   
 
   <li class="r1 ">
     
   </li>
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#current_track-instance_method" title="Lyricli::Sources::Itunes#current_track (method)">#current_track</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Rdio.html#current_track-instance_method" title="Lyricli::Sources::Rdio#current_track (method)">#current_track</a></span>

     
     

-      <small>Lyricli::Sources::Itunes</small>
+      <small>Lyricli::Sources::Rdio</small>

     
   </li>
   
 
   <li class="r2 ">
     
   </li>
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/SourceManager.html#current_track-instance_method" title="Lyricli::SourceManager#current_track (method)">#current_track</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Arguments.html#current_track-instance_method" title="Lyricli::Sources::Arguments#current_track (method)">#current_track</a></span>

     
     

-      <small>Lyricli::SourceManager</small>
+      <small>Lyricli::Sources::Arguments</small>

     
   </li>
   
     
   </li>
   


@@ -151,17 +151,17 @@
   
 
   <li class="r2 ">
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#enable-class_method" title="Lyricli::Sources::Itunes.enable (method)">enable</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Rdio.html#enable-class_method" title="Lyricli::Sources::Rdio.enable (method)">enable</a></span>

     
     

-      <small>Lyricli::Sources::Itunes</small>
+      <small>Lyricli::Sources::Rdio</small>

     
   </li>
   
 
   <li class="r1 ">
     
   </li>
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/Sources/Arguments.html#enable-class_method" title="Lyricli::Sources::Arguments.enable (method)">enable</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#enable-class_method" title="Lyricli::Sources::Itunes.enable (method)">enable</a></span>

     
     

-      <small>Lyricli::Sources::Arguments</small>
+      <small>Lyricli::Sources::Itunes</small>

     
   </li>
   
     
   </li>
   


@@ -183,9 +183,9 @@
   
 
   <li class="r2 ">
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/Sources/Rdio.html#enable-class_method" title="Lyricli::Sources::Rdio.enable (method)">enable</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Arguments.html#enable-class_method" title="Lyricli::Sources::Arguments.enable (method)">enable</a></span>

     
     

-      <small>Lyricli::Sources::Rdio</small>
+      <small>Lyricli::Sources::Arguments</small>

     
   </li>
   
     
   </li>
   


@@ -207,17 +207,17 @@
   
 
   <li class="r1 ">
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/Lyricli.html#get_lyrics-instance_method" title="Lyricli::Lyricli#get_lyrics (method)">#get_lyrics</a></span>
+    <span class='object_link'><a href="Lyricli/LyricsEngine.html#get_lyrics-instance_method" title="Lyricli::LyricsEngine#get_lyrics (method)">#get_lyrics</a></span>

     
     

-      <small>Lyricli::Lyricli</small>
+      <small>Lyricli::LyricsEngine</small>

     
   </li>
   
 
   <li class="r2 ">
     
   </li>
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/LyricsEngine.html#get_lyrics-instance_method" title="Lyricli::LyricsEngine#get_lyrics (method)">#get_lyrics</a></span>
+    <span class='object_link'><a href="Lyricli/Lyricli.html#get_lyrics-instance_method" title="Lyricli::Lyricli#get_lyrics (method)">#get_lyrics</a></span>

     
     

-      <small>Lyricli::LyricsEngine</small>
+      <small>Lyricli::Lyricli</small>

     
   </li>
   
     
   </li>
   


@@ -239,33 +239,33 @@
   
 
   <li class="r1 ">
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/Configuration.html#initialize-instance_method" title="Lyricli::Configuration#initialize (method)">#initialize</a></span>
+    <span class='object_link'><a href="Lyricli/Lyricli.html#initialize-instance_method" title="Lyricli::Lyricli#initialize (method)">#initialize</a></span>

     
     

-      <small>Lyricli::Configuration</small>
+      <small>Lyricli::Lyricli</small>

     
   </li>
   
 
   <li class="r2 ">
     
   </li>
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/Lyricli.html#initialize-instance_method" title="Lyricli::Lyricli#initialize (method)">#initialize</a></span>
+    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#initialize-instance_method" title="Lyricli::Sources::Itunes#initialize (method)">#initialize</a></span>

     
     

-      <small>Lyricli::Lyricli</small>
+      <small>Lyricli::Sources::Itunes</small>

     
   </li>
   
 
   <li class="r1 ">
     
   </li>
   
 
   <li class="r1 ">

-    <span class='object_link'><a href="Lyricli/LyricsEngine.html#initialize-instance_method" title="Lyricli::LyricsEngine#initialize (method)">#initialize</a></span>
+    <span class='object_link'><a href="Lyricli/Configuration.html#initialize-instance_method" title="Lyricli::Configuration#initialize (method)">#initialize</a></span>

     
     

-      <small>Lyricli::LyricsEngine</small>
+      <small>Lyricli::Configuration</small>

     
   </li>
   
 
   <li class="r2 ">
     
   </li>
   
 
   <li class="r2 ">

-    <span class='object_link'><a href="Lyricli/Sources/Itunes.html#initialize-instance_method" title="Lyricli::Sources::Itunes#initialize (method)">#initialize</a></span>
+    <span class='object_link'><a href="Lyricli/LyricsEngine.html#initialize-instance_method" title="Lyricli::LyricsEngine#initialize (method)">#initialize</a></span>

     
     

-      <small>Lyricli::Sources::Itunes</small>
+      <small>Lyricli::LyricsEngine</small>

     
   </li>
   
     
   </li>
   

diff --git a/doc/top-level-namespace.html b/doc/top-level-namespace.html
index c6184477449760897da12d65a8a60faa83e3c628..7df9eac1868866ceeb1440645ea91b10f241d80d 100644 (file)
--- a/doc/top-level-namespace.html
+++ b/doc/top-level-namespace.html
@@ -103,7 +103,7 @@
 </div>
 
     <div id="footer">
 </div>
 
     <div id="footer">

-  Generated on Sat Oct  6 02:34:26 2012 by
+  Generated on Sat Oct  6 03:20:24 2012 by

   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
   0.8.2.1 (ruby-1.9.2).
 </div>

diff --git a/lib/lyricli.rb b/lib/lyricli.rb
index 041959b505a486eb5f0d196a08ee51cdf4217fbc..82871441325c2a6aff7c44e967c2ca8e3a6cc0f2 100755 (executable)
--- a/lib/lyricli.rb
+++ b/lib/lyricli.rb
@@ -59,18 +59,30 @@ module Lyricli
   # Enables a source via the Source Manager
   def self.enable(source_name)
     source_manager = SourceManager.new
   # Enables a source via the Source Manager
   def self.enable(source_name)
     source_manager = SourceManager.new

-    source_manager.enable(source_name)
+    begin
+      source_manager.enable(source_name)
+    rescue Exceptions::UnknownSourceError
+      "There is no such Source"
+    end

   end
 
   # Disables a source via the Source Manager
   def self.disable(source_name)
     source_manager = SourceManager.new
   end
 
   # Disables a source via the Source Manager
   def self.disable(source_name)
     source_manager = SourceManager.new

-    source_manager.disable(source_name)
+    begin
+      source_manager.disable(source_name)
+    rescue Exceptions::UnknownSourceError
+      "There is no such Source"
+    end

   end
 
   # Resets all configuration for a source via the Source Manager
   def self.reset(source_name)
     source_manager = SourceManager.new
   end
 
   # Resets all configuration for a source via the Source Manager
   def self.reset(source_name)
     source_manager = SourceManager.new

-    source_manager.reset(source_name)
+    begin
+      source_manager.reset(source_name)
+    rescue Exceptions::UnknownSourceError
+      "There is no such Source"
+    end

   end
 end
   end
 end

diff --git a/lib/lyricli/exceptions/disable_source_error.rb b/lib/lyricli/exceptions/disable_source_error.rb
index 1f9b0d3ad140e89805e4f6fd2165fca64e6b0fab..5a201b364da6a2bbb83177b3544230cbb8df4498 100644 (file)
--- a/lib/lyricli/exceptions/disable_source_error.rb
+++ b/lib/lyricli/exceptions/disable_source_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # There was an error when disabling a source

     class DisableSourceError < StandardError
     end
   end
     class DisableSourceError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/enable_source_error.rb b/lib/lyricli/exceptions/enable_source_error.rb
index b1596c8415c312621055432a2de53b8fe86772e3..33c849d6c74ef2f507e3d9fc7a943d67a28e0b8a 100644 (file)
--- a/lib/lyricli/exceptions/enable_source_error.rb
+++ b/lib/lyricli/exceptions/enable_source_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # There was an error when enabling the source

     class EnableSourceError < StandardError
     end
   end
     class EnableSourceError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/invalid_lyrics_error.rb b/lib/lyricli/exceptions/invalid_lyrics_error.rb
index 3f1b7c82f863a4417ebc82f2422db64459a360a7..3eb6e180a053e8d193308d783e56afa08e58f436 100644 (file)
--- a/lib/lyricli/exceptions/invalid_lyrics_error.rb
+++ b/lib/lyricli/exceptions/invalid_lyrics_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # No artist/song was found.

     class InvalidLyricsError < StandardError
     end
   end
     class InvalidLyricsError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/lyrics_not_found_error.rb b/lib/lyricli/exceptions/lyrics_not_found_error.rb
index 023e3dba0a8e11c0154aa4353201c92b9704f227..b5e44119da7c50b47748c64035475795421f1195 100644 (file)
--- a/lib/lyricli/exceptions/lyrics_not_found_error.rb
+++ b/lib/lyricli/exceptions/lyrics_not_found_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # No lyrics could be found for this artist/song pair

     class LyricsNotFoundError < StandardError
     end
   end
     class LyricsNotFoundError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/reset_source_error.rb b/lib/lyricli/exceptions/reset_source_error.rb
index 0bfa7f4644392aa3b14112bf0267892d142cbc61..8f87c9c33e35af90236d12544c766fee6966cc79 100644 (file)
--- a/lib/lyricli/exceptions/reset_source_error.rb
+++ b/lib/lyricli/exceptions/reset_source_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # There was an error while resetting a source

     class ResetSourceError < StandardError
     end
   end
     class ResetSourceError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/source_configuration_error.rb b/lib/lyricli/exceptions/source_configuration_error.rb
index b2970830aa4133389ca0faeed714613c2b02cd35..b8f08fbb41628a001f932ebb8c7f54116367017a 100644 (file)
--- a/lib/lyricli/exceptions/source_configuration_error.rb
+++ b/lib/lyricli/exceptions/source_configuration_error.rb
@@ -1,5 +1,7 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # There is an error with the source's configuration and it can't
+    # find its current track.

     class SourceConfigurationError < StandardError
     end
   end
     class SourceConfigurationError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/start_source_error.rb b/lib/lyricli/exceptions/start_source_error.rb
index 9db1549ee58b534cb72e66617e5c1d242cc5bcb7..71c0fc9cb705681add3f689c11fc338bfe6cb7d4 100644 (file)
--- a/lib/lyricli/exceptions/start_source_error.rb
+++ b/lib/lyricli/exceptions/start_source_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # There was an error while starting a source

     class StartSourceError < StandardError
     end
   end
     class StartSourceError < StandardError
     end
   end

diff --git a/lib/lyricli/exceptions/unknown_source_error.rb b/lib/lyricli/exceptions/unknown_source_error.rb
index 8d9ba6209f31b2f6ee185b9cdc68e002538f4c95..ee62f4527f151450d4d47e166e04fad44656c873 100644 (file)
--- a/lib/lyricli/exceptions/unknown_source_error.rb
+++ b/lib/lyricli/exceptions/unknown_source_error.rb
@@ -1,5 +1,6 @@
 module Lyricli
   module Exceptions
 module Lyricli
   module Exceptions

+    # An unknown source was tried to enable/disable/reset

     class UnknownSourceError < StandardError
     end
   end
     class UnknownSourceError < StandardError
     end
   end

diff --git a/lyricli-0.0.1.gem b/lyricli-0.0.1.gem
index 3e1023b9057139861f250055c4c9960a718c1d13..21d0c09781966d99fe7a28a69db7cf96cc09114d 100644 (file)
Binary files a/lyricli-0.0.1.gem and b/lyricli-0.0.1.gem differ