colorant 0.1.1 → 0.1.2

data/.rvmrc

@@ -1 +1 @@
-rvm --create use ruby-1.9.2@colorist > /dev/null
+rvm --create use ruby-1.9.2@colorant

data/Gemfile

@@ -2,14 +2,3 @@ source :rubygems
 
 # Specify your gem's dependencies in colorist.gemspec
 gemspec
-# gem "color_namer", :git => 'git://github.com/retro/color-namer.git'
-# gem "bundler"
-# gem "rspec", :git => 'git://github.com/rspec/rspec.git'
-# gem "rspec-expectations", :git => 'git://github.com/rspec/rspec-expectations.git'
-# gem "rspec-mocks", :git => 'git://github.com/rspec/rspec-mocks.git'
-# gem "rspec-core", :git => 'git://github.com/rspec/rspec-core.git'
-# 
-# gem "aruba", :git => 'git://github.com/aslakhellesoy/aruba.git'
-# gem "cucumber", :git => 'git://github.com/aslakhellesoy/cucumber.git'
-# gem "watchr"
-# gem "trollop"

data/Gemfile.lock

@@ -55,7 +55,7 @@ GIT
 PATH
   remote: .
   specs:
-    colorist (0.0.1)
+    colorant (0.1.2)
 
 GEM
   remote: http://rubygems.org/
@@ -79,7 +79,7 @@ DEPENDENCIES
   aruba!
   bundler
   color_namer!
-  colorist!
+  colorant!
   cucumber!
   rspec!
   rspec-core!

data/colorant.gemspec

@@ -14,14 +14,14 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "colorant"
 
+  s.add_runtime_dependency "color_namer"
+  s.add_runtime_dependency 'trollop'
+
   s.add_development_dependency "bundler", ">= 1.0.3"
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'cucumber'
   s.add_development_dependency 'aruba'
 
-  s.add_runtime_dependency 'trollop'
-  s.add_runtime_dependency "color_namer"
-
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
   s.require_path = 'lib'

data/features/cli.feature

@@ -3,28 +3,27 @@ Feature: Command line interpreter
   You can use Colorist from the command line as well.
 
   Scenario: get the most relevant colors out of the Arnolfini Portrait
-    When I run "colorist arnolfini.jpg --colors 8 --depth 24"
+    When I run "colorant arnolfini.jpg --colors 8 --depth 24"
 
-    Then the exit status should be 0
-    And the output should contain "Brown		-- 40.54 %"
-    And the output should contain "Red		-- 17.88 %"
-    And the output should contain "Brown		-- 12.76 %"
-    And the output should contain "Red		-- 9.95 %"
-    And the output should contain "Brown		-- 8.03 %"
-    And the output should contain "Brown		-- 4.25 %"
-    And the output should contain "Red		-- 3.55 %"
-    And the output should contain "Brown		-- 3.03 %"
+    Then the output should match /\tBrown\t\t\t\t\t\t-- 40.54 %/
+    And the output should match /\Red\t\t\t\t\t\t-- 17.88 %/
+    And the output should match /\tBrown\t\t\t\t\t\t-- 12.76 %/
+    And the output should match /\tRed\t\t\t\t\t\t-- 9.95 %/
+    And the output should match /\tBrown\t\t\t\t\t\t-- 8.03 %/
+    And the output should match /\tBrown\t\t\t\t\t\t-- 4.25 %/
+    And the output should match /\tRed\t\t\t\t\t\t-- 3.55 %/
+    And the output should match /\tBrown\t\t\t\t\t\t-- 3.03 %/
+    And the exit status should be 0
     
   Scenario: get an extended report over the Arnolfini Portrait
-    When I run "colorist arnolfini.jpg --extended"
+    When I run "colorant arnolfini.jpg --extended"
 
-    Then the exit status should be 0
-    And the output should contain "Cocoa Brown		-- 40.54 %"
-    And the output should contain "Moccaccino Red		-- 17.88 %"
-    And the output should contain "Rock Brown		-- 12.76 %"
-    And the output should contain "Mojo Red		-- 9.95 %"
-    And the output should contain "Brown Derby		-- 8.03 %"
-    And the output should contain "Dark Tan Brown		-- 4.25 %"
-    And the output should contain "Brandy Rose Red		-- 3.55 %"
-    And the output should contain "Vanilla Brown		-- 3.03 %"
-    
+    Then the output should match /\tCocoa Brown\t\t\t\t\t\t-- 40.54 %/
+    And the output should match /\tMoccaccino Red\t\t\t\t\t\t-- 17.88 %/
+    And the output should match /\tRock Brown\t\t\t\t\t\t-- 12.76 %/
+    And the output should match /\tMojo Red\t\t\t\t\t\t-- 9.95 %/
+    And the output should match /\tBrown Derby\t\t\t\t\t\t-- 8.03 %/
+    And the output should match /\tDark Tan Brown\t\t\t\t\t\t-- 4.25 %/
+    And the output should match /\tBrandy Rose Red\t\t\t\t\t\t-- 3.55 %/
+    And the output should match /\tVanilla Brown\t\t\t\t\t\t-- 3.03 %/
+    And the exit status should be 0

data/lib/colorant/reporter.rb

@@ -30,7 +30,7 @@ module Colorant
 
     def stdout_report(array)
       array.each do |line|
-        stdout << "\t#{line.first}\t\t-- #{line.last} %\n"
+        stdout << "\t#{line.first}\t\t\t\t\t\t-- #{line.last} %\n"
       end
       stdout << "\n"
     end

data/lib/colorant/version.rb

@@ -1,3 +1,3 @@
 module Colorant
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Josep M. Bach
@@ -20,7 +20,7 @@ date: 2010-11-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: color_namer
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -28,14 +28,12 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
         - 0
-        - 3
-        version: 1.0.3
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: trollop
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +43,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: bundler
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,12 +54,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 3
+        version: 1.0.3
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: rspec
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,7 +74,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: trollop
+  name: cucumber
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -84,10 +84,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: color_namer
+  name: aruba
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -97,7 +97,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id006
 description: Easily extract the colors of any image file!
 email: