compass-validator 1.0.0 → 3.0.0

data/README.markdown

@@ -1,6 +1,20 @@
 # compass-validator
 
-This is a library dependency for [compass](http://compass-style.org/) that provides a css validator for compass projects. It is only useful during development and should be installed separately. Very little is original code. Java is required and must be on the $PATH.
+This is a library dependency for [compass](http://compass-style.org/) that provides a css
+validator for compass projects. It is only useful during development and should be installed
+separately. Very little is original code. Java is required and must be on the $PATH.
+
+# Validating a CSS Folder
+
+The W3C Validator can be challenging to install and get working. The Compass Validator
+makes it much easier. On a system with java installed all you have do is this:
+
+    $ gem install compass-validator
+    $ compass-validate <css_folder>
+
+In your compass project all you have to do is:
+
+    $ compass validate
 
 == Copyright
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 1
+:major: 3
 :minor: 0
 :patch: 0

data/bin/compass-validate

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require 'compass'
+require 'compass/logger'
+require 'compass-validator'
+Compass::Validator.execute(*ARGV)

data/lib/compass-validator.rb

@@ -1,16 +1,30 @@
 # This file was extracted from the blueprint project and then modified.
+require "open3"
 require File.join(Compass.lib_directory, 'compass', 'core_ext')
 
 module Compass
   # Validates generated CSS against the W3 using Java
   class Validator
-    VALIDATOR_FILE = File.join(File.dirname(__FILE__), 'java_validator', 'css-validator.jar')
+    VALIDATOR_DIR = File.join(File.dirname(__FILE__), 'java_validator')
+    VALIDATOR_FILE = File.join(VALIDATOR_DIR, 'css-validator.jar')
     attr_reader :error_count
     attr_reader :css_directory
     
     def initialize(css_directory)
       @css_directory = css_directory
       @error_count = 0
+      @bad_files = 0
+      @files = 0
+      @results = []
+      @logger = Compass::Logger.new(:valid, :invalid)
+      Compass::Logger::ACTION_COLORS[:valid] = :green
+      Compass::Logger::ACTION_COLORS[:invalid] = :red
+    end
+
+    def self.execute(*directories)
+      directories.each do |dir|
+        new(dir).validate
+      end
     end
 
     # Validates all three CSS files
@@ -18,40 +32,60 @@ module Compass
       java_path = `which java`.rstrip
       raise "You do not have a Java installed, but it is required." if java_path.blank?
     
-      output_header
-    
       Dir.glob(File.join(css_directory, "**", "*.css")).each do |file_name|
-        @error_count += 1 if !validate_css_file(java_path, file_name)
+        @files += 1
+        if (count = validate_css_file(java_path, file_name))
+          @error_count += count
+          @bad_files += 1
+          @logger.record(:invalid, file_name)
+        else
+          @logger.record(:valid, file_name)
+        end
       end
     
-      output_footer
+      output_results
     end
     
     private
     def validate_css_file(java_path, css_file)
-      puts "\n\nTesting #{css_file}"
-      puts "Output ============================================================\n\n"
-      system("#{java_path} -jar '#{VALIDATOR_FILE}' -e '#{css_file}'")
+      jars = Dir.glob("#{VALIDATOR_DIR}/*.jar")
+      cmd = "#{java_path} -classpath '#{jars.join(File::PATH_SEPARATOR)}' org.w3c.css.css.CssValidator -output text -profile css3 'file:#{css_file}'"
+      Open3.popen3(cmd) do |stdin, stdout, stderr|
+        result = stdout.read
+        if result =~ /found the following errors \((\d+)\)/
+          @results << [css_file, result]
+          return $1.to_i
+        end
+      end
+      nil
     end
     
-    def output_header
-      puts "\n\n"
-      puts "************************************************************"
-      puts "**"
-      puts "**   Compass CSS Validator"
-      puts "**   Validates output CSS files"
-      puts "**"
-      puts "************************************************************"
-    end
-
-    def output_footer
-      puts "\n\n"
-      puts "************************************************************"
-      puts "**"
-      puts "**   Done!"
-      puts "**   Your CSS files are#{" not" if error_count > 0} valid.#{"  You had #{error_count} error(s) within your files" if error_count > 0}"
-      puts "**"
-      puts "************************************************************"
+    def output_results
+      if @error_count == 0
+        puts "\n\n"
+        puts "************************************************************"
+        puts 
+        puts "Result: Valid"
+        puts "#{@files} file#{"s"  if @files > 1 || @files == 0} validated."
+        puts "So INTENSE!"
+        puts 
+        puts "************************************************************"
+      else
+        puts "\n\n"
+        puts "************************************************************"
+        puts 
+        puts "Result: Invalid"
+        puts "#{@files} file#{"s"  if @files > 1} validated."
+        puts "#{@error_count} error#{"s" if @error_count > 1} found in #{@bad_files} file#{"s" if @bad_files > 1}."
+        puts "Somewhere, a kitten is crying."
+        puts 
+        puts "************************************************************"
+        @results.each do |file, result|
+        puts "Output from: #{file}"
+        puts result
+        puts "************************************************************"
+        end
+      end
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: compass-validator
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
-  - 1
+  - 3
   - 0
   - 0
-  version: 1.0.0
+  version: 3.0.0
 platform: ruby
 authors: 
 - Chris Eppstein
@@ -14,14 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 -07:00
-default_executable: 
+date: 2010-10-31 00:00:00 -07:00
+default_executable: compass-validate
 dependencies: []
 
 description: 
 email: chris@eppsteins.net
-executables: []
-
+executables: 
+- compass-validate
 extensions: []
 
 extra_rdoc_files: 
@@ -37,10 +38,14 @@ files:
 - lib/java_validator/JIGSAW_COPYRIGHT
 - lib/java_validator/README.html
 - lib/java_validator/XERCES_COPYING.txt
+- lib/java_validator/commons-collections-3.2.1.jar
+- lib/java_validator/commons-lang-2.5.jar
 - lib/java_validator/css-validator-javadoc.jar
 - lib/java_validator/css-validator.jar
 - lib/java_validator/jigsaw.jar
+- lib/java_validator/velocity-1.6.1.jar
 - lib/java_validator/xerces.jar
+- bin/compass-validate
 has_rdoc: true
 homepage: http://github.com/chriseppstein/compass-validator
 licenses: []
@@ -51,23 +56,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A CSS Validator that is used by the Compass CSS Framework.