msd-fretboard 0.0.5 → 0.0.6

data/lib/fretboard.rb

@@ -33,8 +33,6 @@
 #   -d, --display [flat|sharp]    Show fretboard
 #   -l, --log LOGFILE             Log session score to LOGFILE
 #   -v, --version                 Show version
-#   -c, --[no-]color              Display ANSI color codes
-#   
 #
 # == Author
 #   Mark DeWandel
@@ -46,13 +44,16 @@
 require 'optparse'
 require 'timeout'
 require 'pp'
-require 'lib/ansicolor'
+
+require 'rubygems'
+require 'term/ansicolor'
+include Term::ANSIColor
 
 # Fretboard class for learning the guitar fretboard.
 class Fretboard
   FRETS = 12
   STRINGS = 6
-  VERSION = '0.0.5'
+  VERSION = '0.0.6'
 
   def self.display_version
     puts "#{File.basename(__FILE__)} version #{VERSION}"
@@ -90,10 +91,6 @@ class Fretboard
         options[:logfile] = opt
       end
 
-      opts.on("-c", "--[no-]color", "Display ANSI color codes") do |opt|
-        options[:color] = opt
-      end
-
       opts.on("-v", "--version", "Show version") do
         display_version
         exit 0
@@ -112,17 +109,6 @@ class Fretboard
   def initialize(args)
     @timeout = args[:timeout] || 0
 
-    # Default is to show ANSI color codes
-    if args.has_key?(:color)
-      if args[:color]
-        @show_color = AnsiColor.new
-      else
-        @show_color = NoColor.new
-      end
-    else
-      @show_color = AnsiColor.new
-    end
-
     if args.has_key?(:fret)
       a = args[:fret]
       @first_fret = a[0].to_i
@@ -297,10 +283,10 @@ class Fretboard
       end
 
       if correct
-        puts @show_color.green("Correct.")
+        puts green(bold("Correct."))
       else
         errors += 1
-        puts @show_color.red("Incorrect.") + (timed_out ? " [Timeout]" : "")
+        puts red(bold("Incorrect.")) + (timed_out ? " [Timeout]" : "")
         if timed_out
           printf("\nContinue? ")
           $stdin.gets

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msd-fretboard
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Mark DeWandel
@@ -11,8 +11,17 @@ cert_chain: []
 
 date: 2009-02-13 00:00:00 -08:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: 
 email: mark.dewandel@gmail.com
 executables: 
@@ -24,7 +33,6 @@ extra_rdoc_files: []
 files: 
 - COPYING
 - bin/fb
-- lib/ansicolor.rb
 - lib/fretboard.rb
 has_rdoc: false
 homepage: 

data/lib/ansicolor.rb

@@ -1,20 +0,0 @@
-class AnsiColor
-  def green(s)
-    "\e[32m#{s}\e[0m"
-  end
-
-  def red(s)
-    "\e[31m#{s}\e[0m"
-  end
-end
-
-class NoColor
-  def green(s)
-    s
-  end
-
-  def red(s)
-    s
-  end
-end
-