asciiart 0.0.4 → 0.0.5

data/.gitignore

@@ -17,3 +17,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.DS_Store

data/README.md

@@ -131,6 +131,16 @@ _or make it thinner_
 	|oooooooooooooooooooooooooooooooooooooooooooooooooo|
 	+--------------------------------------------------+
 
+Add color with the "color" option
+
+	require 'asciiart'
+    a = AsciiArt.new("http://www.evangogh.org/images/paintings/self-portrait.jpg")
+      => #<AsciiArt:0x007fa889cbacf8 @data="...">
+
+	puts a.to_ascii_art(color: true) =>
+
+[Booyah!](http://farm9.staticflickr.com/8080/8424360420_8011af48fe_b.jpg)
+
 ### In The Command Line
 
 Local Files
@@ -147,6 +157,8 @@ Get Help
 
 	Usage: asciiart [options] <path_or_url>
 	    -w, --width WIDTH                Width of the finished Ascii Art (Default: 100)
+	    -c, --color                      Switch to use colored terminal output (Default: false)
+	    -i, --invert-chars               Invert the character map. Depending on your terminal and image this can make the image clearer (or a lot worse)
 	    -v, --version                    Show AsciiArt version
 	    -h, --help                       Show this message
 

data/asciiart.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency('rmagick')
+  gem.add_dependency('rainbow')
 
   gem.add_development_dependency('pry')
 end

data/bin/asciiart

@@ -3,7 +3,9 @@
 require 'asciiart'
 require 'optparse'
 
-options = {}
+options       = {}
+invert_chars  = false
+
 opt_parser = OptionParser.new do |opts|
   opts.banner = 'Usage: asciiart [options] <path_or_url>'
 
@@ -11,6 +13,14 @@ opt_parser = OptionParser.new do |opts|
     options[:width] = width.to_i
   end
 
+  opts.on('-c', '--color', 'Switch to use colored terminal output (Default: false)') do
+    options[:color] = true
+  end
+
+  opts.on('-i', '--invert-chars', 'Invert the character map. Depending on your terminal and image this can make the image clearer (or a lot worse)') do
+    invert_chars = true
+  end
+
   opts.on_tail('-v', '--version', 'Show AsciiArt version') do
     puts 'AsciiArt version ' + AsciiArt::VERSION
     exit
@@ -20,6 +30,7 @@ opt_parser = OptionParser.new do |opts|
     puts opts
     exit
   end
+
 end
 
 begin
@@ -34,5 +45,9 @@ if ARGV.length == 0
   exit
 end
 
-puts AsciiArt.new(ARGV[0]).to_ascii_art(options)
+art = AsciiArt.new(ARGV[0])
+
+art.image_chars = art.image_chars.reverse if invert_chars
+
+puts art.to_ascii_art(options)
 

data/lib/asciiart.rb

@@ -2,6 +2,7 @@ require "asciiart/version"
 require 'RMagick'
 require 'uri'
 require 'open-uri'
+require 'rainbow'
 
 class AsciiArt
 
@@ -14,20 +15,18 @@ class AsciiArt
   end
 
   def to_ascii_art(options = {})
-    options = { width: 100 }.merge(options)
+    options = { width: 100, color: false }.merge(options)
 
     img = Magick::Image.from_blob(@data).first
 
-    width  = options[:width]
-    scale  = (width.to_f / img.columns)
-    height = ((img.rows * scale) / 2).to_i
+    width       = options[:width]
+    scale       = (width.to_f / img.columns)
+    height      = ((img.rows * scale) / 2).to_i
 
     img.resize!(width, height)
-
-    img = img.quantize(image_chars.length, Magick::GRAYColorspace)
-    img = img.normalize
-
-    quantum_calc = Magick::QuantumRange / Magick::QuantumPixel.to_i
+    color_image   = img.dup if options[:color]
+    img           = img.quantize(image_chars.length, Magick::GRAYColorspace).normalize
+    quantum_calc  = Magick::QuantumRange / Magick::QuantumPixel.to_i
 
     border = "+#{'-' * width}+\n"
     output = border.dup
@@ -35,7 +34,17 @@ class AsciiArt
     img.view(0, 0, width, height) do |view|
       height.times do |i|
         output << '|'
-        width.times { |j| output << image_chars[view[i][j].red/quantum_calc] }
+        width.times do |j|
+
+          character = image_chars[view[i][j].red/quantum_calc]
+
+          if options[:color]
+            pix       = color_image.pixel_color(j,i)
+            character = character.color(unified_rgb_value(pix.red), unified_rgb_value(pix.green), unified_rgb_value(pix.blue))
+          end
+
+          output << character
+        end
         output << "|\n"
       end
     end
@@ -50,5 +59,12 @@ class AsciiArt
   def inspect
     "#<#{self.class.to_s}>"
   end
+
+private
+
+  def unified_rgb_value(number)
+    (Magick::QuantumDepth == 16) ? (number / 256) : number
+  end
+
 end
 

data/lib/asciiart/version.rb

@@ -1,3 +1,3 @@
 class AsciiArt
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciiart
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-25 00:00:00.000000000 Z
+date: 2013-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -28,6 +28,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement