less 1.1.13 → 1.2.9

data/Rakefile

@@ -8,55 +8,25 @@ begin
     s.homepage    = "http://www.lesscss.org"
     s.description = "LESS is leaner CSS"
     s.rubyforge_project = 'less'
+    s.add_dependency('treetop', '>= 1.4.2')
+    s.add_dependency('mutter', '>= 0.3.7')
   end
+  Jeweler::GemcutterTasks.new
+  Jeweler::RubyforgeTasks.new
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
 end
 
-# rubyforge
-begin
-  require 'rake/contrib/sshpublisher'
-  namespace :rubyforge do
-    desc "Release gem and RDoc documentation to RubyForge"
-    task :release => ["rubyforge:release:gem", "rubyforge:release:docs"]
-
-    namespace :release do
-      desc "Publish RDoc to RubyForge."
-      task :docs => [:rdoc] do
-        config = YAML.load(
-            File.read(File.expand_path('~/.rubyforge/user-config.yml'))
-        )
-        options << '--line-numbers' << '--inline-source'
-        host = "#{config['username']}@rubyforge.org"
-        remote_dir = "/var/www/gforge-projects/the-perfect-gem/"
-        local_dir = 'rdoc'
+require 'spec/rake/spectask'
 
-        Rake::SshDirPublisher.new(host, remote_dir, local_dir).upload
-      end
-    end
-  end
-rescue LoadError
-  puts "Rake SshDirPublisher is unavailable or your rubyforge environment is not configured."
+Spec::Rake::SpecTask.new("spec") do |t|
+  t.libs << 'lib' << 'spec'
+  t.spec_files = FileList['spec/**/*_spec.rb']
+  t.spec_opts = ['--color', '--format=specdoc']
 end
 
-begin
-  require 'spec/rake/spectask'
-
-  Spec::Rake::SpecTask.new("spec") do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color', '--format=specdoc']
-  end
-
-  task :test do
-    Rake::Task['spec'].invoke
-  end
-
-  Spec::Rake::SpecTask.new("rcov_spec") do |t|
-    t.spec_files = FileList['spec/**/*_spec.rb']
-    t.spec_opts = ['--color']
-    t.rcov = true
-    t.rcov_opts = ['--exclude', '^spec,/gems/']
-  end
+task :test do
+  Rake::Task['spec'].invoke
 end
 
 begin
@@ -88,3 +58,5 @@ begin
   end
 end
 
+task :spec => :check_dependencies
+task :default => :spec

data/VERSION

@@ -1 +1 @@
-1.1.13
+1.2.9

data/bin/lessc

@@ -19,7 +19,8 @@ options = {
   :watch => false,
   :compress => false,
   :debug => false,
-  :growl => false
+  :growl => false,
+  :color => true
 }
 
 # Get arguments
@@ -44,6 +45,11 @@ opts = OptionParser.new do |o|
     end
   end
   
+  # No color in output
+  o.on("--no-color", "suppress color in output") do
+    options[:color] = false
+  end
+  
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do
@@ -83,4 +89,4 @@ case ARGV.size
     exit
 end
 
-Less::Command.new( options ).run!
+Less::Command.new( options ).run! ? exit(0) : exit(1)

data/less.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.1.13"
+  s.version = "1.2.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-08-11}
+  s.date = %q{2009-10-12}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}
@@ -39,96 +42,6 @@ Gem::Specification.new do |s|
      "lib/less/engine/nodes/property.rb",
      "lib/less/engine/nodes/ruleset.rb",
      "lib/less/engine/nodes/selector.rb",
-     "lib/vendor/treetop/.gitignore",
-     "lib/vendor/treetop/LICENSE",
-     "lib/vendor/treetop/README",
-     "lib/vendor/treetop/Rakefile",
-     "lib/vendor/treetop/benchmark/seqpar.gnuplot",
-     "lib/vendor/treetop/benchmark/seqpar.treetop",
-     "lib/vendor/treetop/benchmark/seqpar_benchmark.rb",
-     "lib/vendor/treetop/bin/tt",
-     "lib/vendor/treetop/lib/treetop.rb",
-     "lib/vendor/treetop/lib/treetop/bootstrap_gen_1_metagrammar.rb",
-     "lib/vendor/treetop/lib/treetop/compiler.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/grammar_compiler.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/lexical_address_space.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/metagrammar.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/metagrammar.treetop",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/anything_symbol.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/atomic_expression.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/character_class.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/choice.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/declaration_sequence.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/grammar.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/inline_module.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/nonterminal.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/optional.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parenthesized_expression.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parsing_expression.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/parsing_rule.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/predicate.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/repetition.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/sequence.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/terminal.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/transient_prefix.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/node_classes/treetop_file.rb",
-     "lib/vendor/treetop/lib/treetop/compiler/ruby_builder.rb",
-     "lib/vendor/treetop/lib/treetop/ruby_extensions.rb",
-     "lib/vendor/treetop/lib/treetop/ruby_extensions/string.rb",
-     "lib/vendor/treetop/lib/treetop/runtime.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/compiled_parser.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/head_node.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/interval_skip_list.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/interval_skip_list/node.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/syntax_node.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/terminal_parse_failure.rb",
-     "lib/vendor/treetop/lib/treetop/runtime/terminal_syntax_node.rb",
-     "lib/vendor/treetop/lib/treetop/version.rb",
-     "lib/vendor/treetop/spec/compiler/and_predicate_spec.rb",
-     "lib/vendor/treetop/spec/compiler/anything_symbol_spec.rb",
-     "lib/vendor/treetop/spec/compiler/character_class_spec.rb",
-     "lib/vendor/treetop/spec/compiler/choice_spec.rb",
-     "lib/vendor/treetop/spec/compiler/circular_compilation_spec.rb",
-     "lib/vendor/treetop/spec/compiler/failure_propagation_functional_spec.rb",
-     "lib/vendor/treetop/spec/compiler/grammar_compiler_spec.rb",
-     "lib/vendor/treetop/spec/compiler/grammar_spec.rb",
-     "lib/vendor/treetop/spec/compiler/nonterminal_symbol_spec.rb",
-     "lib/vendor/treetop/spec/compiler/not_predicate_spec.rb",
-     "lib/vendor/treetop/spec/compiler/one_or_more_spec.rb",
-     "lib/vendor/treetop/spec/compiler/optional_spec.rb",
-     "lib/vendor/treetop/spec/compiler/parenthesized_expression_spec.rb",
-     "lib/vendor/treetop/spec/compiler/parsing_rule_spec.rb",
-     "lib/vendor/treetop/spec/compiler/sequence_spec.rb",
-     "lib/vendor/treetop/spec/compiler/terminal_spec.rb",
-     "lib/vendor/treetop/spec/compiler/terminal_symbol_spec.rb",
-     "lib/vendor/treetop/spec/compiler/test_grammar.treetop",
-     "lib/vendor/treetop/spec/compiler/test_grammar.tt",
-     "lib/vendor/treetop/spec/compiler/test_grammar_do.treetop",
-     "lib/vendor/treetop/spec/compiler/zero_or_more_spec.rb",
-     "lib/vendor/treetop/spec/composition/a.treetop",
-     "lib/vendor/treetop/spec/composition/b.treetop",
-     "lib/vendor/treetop/spec/composition/c.treetop",
-     "lib/vendor/treetop/spec/composition/d.treetop",
-     "lib/vendor/treetop/spec/composition/f.treetop",
-     "lib/vendor/treetop/spec/composition/grammar_composition_spec.rb",
-     "lib/vendor/treetop/spec/composition/subfolder/e_includes_c.treetop",
-     "lib/vendor/treetop/spec/ruby_extensions/string_spec.rb",
-     "lib/vendor/treetop/spec/runtime/compiled_parser_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/delete_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/expire_range_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/insert_and_delete_node.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/insert_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.graffle",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/interval_skip_list_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/palindromic_fixture_spec.rb",
-     "lib/vendor/treetop/spec/runtime/interval_skip_list/spec_helper.rb",
-     "lib/vendor/treetop/spec/runtime/syntax_node_spec.rb",
-     "lib/vendor/treetop/spec/spec_helper.rb",
-     "lib/vendor/treetop/spec/spec_suite.rb",
-     "lib/vendor/treetop/treetop.gemspec",
      "spec/command_spec.rb",
      "spec/css/accessors.css",
      "spec/css/big.css",
@@ -160,12 +73,14 @@ Gem::Specification.new do |s|
      "spec/less/exceptions/name-error-1.0.less",
      "spec/less/exceptions/syntax-error-1.0.less",
      "spec/less/functions.less",
+     "spec/less/hidden.less",
      "spec/less/import.less",
      "spec/less/import/import-test-a.less",
      "spec/less/import/import-test-b.less",
      "spec/less/import/import-test-c.less",
      "spec/less/import/import-test-d.css",
      "spec/less/lazy-eval.less",
+     "spec/less/literal-css.less",
      "spec/less/mixins-args.less",
      "spec/less/mixins.less",
      "spec/less/operations.less",
@@ -197,8 +112,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<treetop>, [">= 1.4.2"])
+      s.add_runtime_dependency(%q<mutter>, [">= 0.3.7"])
     else
+      s.add_dependency(%q<treetop>, [">= 1.4.2"])
+      s.add_dependency(%q<mutter>, [">= 0.3.7"])
     end
   else
+    s.add_dependency(%q<treetop>, [">= 1.4.2"])
+    s.add_dependency(%q<mutter>, [">= 0.3.7"])
   end
 end

data/lib/ext.rb

@@ -1,15 +1,22 @@
 module Treetop
   module Runtime
     class CompiledParser
-      def failure_message
+      def failure_message color
+        o = color ? Mutter.new.clear : lambda {|i, *args| i }
         return nil unless (tf = terminal_failures) && tf.size > 0
-        "on line #{failure_line}: expected " + (
+        msg = "on line #{failure_line}: expected " + (
           tf.size == 1 ? 
-            tf[0].expected_string : 
-            "one of #{Less::YELLOW[tf.map {|f| f.expected_string }.uniq * ' ']}"
-        ) +
-        " got #{Less::YELLOW[input[failure_index].chr]}" +
-        " after:\n\n#{input[index...failure_index]}\n"
+            o[tf[0].expected_string, :yellow] : 
+            "one of #{o[tf.map {|f| f.expected_string }.uniq * ' ', :yellow]}"
+        )
+        f = input[failure_index]
+        got = case f
+          when "\n" then o['\n',  :cyan]
+          when nil  then o["EOF", :cyan]
+          when ' '  then o["white-space", :cyan]
+          else           o[f.chr, :yellow]
+        end
+        msg += " got #{got} after:\n\n#{input[index...failure_index]}\n"
       end
     end
   end
@@ -27,11 +34,6 @@ class Object
     yield self
     self
   end
-  
-  def log(s = '')  puts "* #{s}" if $verbose end
-  def log!(s = '') puts "* #{s}" end
-  def error(s) $stderr.puts s end
-  def error!(s) raise Exception, s end
 end
 
 class Array
@@ -49,16 +51,10 @@ class Array
   end
 end
 
-class Class
-  def to_sym
-    self.to_s.to_sym
-  end
-end
-
 unless :symbol.respond_to?(:to_proc)
   class Symbol
     def to_proc
-      proc {|obj, *args| obj.send(self, *args) }
+      Proc.new {|*args| args.shift.__send__(self, *args) }
     end
   end
 end

data/lib/less.rb

@@ -1,8 +1,8 @@
-$:.unshift File.join(File.dirname(__FILE__), 'vendor', 'treetop', 'lib'), 
-           File.dirname(__FILE__)
+$:.unshift File.dirname(__FILE__)
 
 require 'cgi'
 require 'treetop'
+require 'mutter'
 require 'delegate'
 
 LESS_ROOT = File.expand_path(File.dirname(__FILE__))

data/lib/less/command.rb

@@ -1,12 +1,4 @@
 module Less
-  ESC = "\033"
-  RESET   = "#{ESC}[0m"
-  
-  GREEN  = lambda {|s| "#{ESC}[1;32m#{s}#{RESET}"}
-  RED    = lambda {|s| "#{ESC}[1;31m#{s}#{RESET}"}
-  YELLOW = lambda {|s| "#{ESC}[1;33m#{s}#{RESET}"}
-  BOLD   = lambda {|s| "#{ESC}[1m#{s}#{RESET}"}
-  
   class Command
     attr_accessor :source, :destination, :options
 
@@ -15,6 +7,7 @@ module Less
       @source = options[:source]
       @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, '.css'
       @options = options
+      @mutter = Mutter.new.clear
     end
 
     def watch?()    @options[:watch]    end
@@ -33,9 +26,9 @@ module Less
     end
 
     def run!
-      parse(true) unless File.exist? @destination
-
       if watch?
+        parse(true) unless File.exist? @destination
+
         log "Watching for changes in #@source... Ctrl-C to abort.\n: "
 
         # Main watch loop
@@ -61,13 +54,13 @@ module Less
     def parse new = false
       begin
         # Create a new Less object with the contents of a file
-        css = Less::Engine.new(File.new(@source)).to_css
+        css = Less::Engine.new(File.new(@source), @options).to_css
         css = css.delete " \n" if compress?
 
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        print "#{GREEN['* ' + (new ? 'Created'  : 'Updated')]} " + 
+        print "#{o('* ' + (new ? 'Created'  : 'Updated'), :green)} " + 
               "#{@destination.split('/').last}\n: " if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
@@ -78,9 +71,9 @@ module Less
       rescue PathError => e
         err "`#{e}` was not found.\n", "Path"
       rescue VariableNameError => e
-        err "#{YELLOW[e]} is undefined.\n", "Name"
+        err "#{o(e, :yellow)} is undefined.\n", "Variable Name"
       rescue MixinNameError => e
-        err "#{YELLOW[e]} is undefined.\n", "Name"
+        err "#{o(e, :yellow)} is undefined.\n", "Mixin Name"
       else
         true
       end
@@ -93,7 +86,7 @@ module Less
 
     def err s = '', type = ''
       type = type.strip + ' ' unless type.empty?
-      print "#{RED["! #{type}Error"]}: #{s}"
+      $stderr.print "#{o("! #{type}Error", :red)}: #{s}"
       if @options[:growl]
         growl = Growl.new
         growl.title = "LESS"
@@ -102,5 +95,11 @@ module Less
         false
       end
     end
+    
+    private
+    
+    def o ex, *styles
+      @mutter.process(ex.to_s, *(@options[:color] ? styles : []))
+    end
   end
 end

data/lib/less/engine.rb

@@ -14,7 +14,7 @@ module Less
   class Engine
     attr_reader :css, :less
     
-    def initialize obj
+    def initialize obj, options = {}
       @less = if obj.is_a? File
         @path = File.dirname File.expand_path(obj.path)
         obj.read
@@ -24,6 +24,7 @@ module Less
         raise ArgumentError, "argument must be an instance of File or String!"
       end
       
+      @options = options
       @parser = StyleSheetParser.new
     end
     
@@ -35,7 +36,7 @@ module Less
       if root
         @tree = root.build env.tap {|e| e.file = @path }
       else
-        raise SyntaxError, @parser.failure_message
+        raise SyntaxError, @parser.failure_message(@options[:color])
       end
 
       @tree

data/lib/less/engine/grammar/common.tt

@@ -22,7 +22,7 @@ module Less
 
       # Non-space char
       rule ns
-        ![ ;\n] .
+        ![ ;,!})\n] .
       end
     end
   end

data/lib/less/engine/grammar/entity.tt

@@ -5,7 +5,7 @@ module Less
       # Entity: Any whitespace delimited token
       #
       rule entity
-        function / fonts / keyword / accessor / variable / literal
+        url / function / accessor / keyword / variable / literal / font
       end
 
       rule fonts
@@ -21,13 +21,13 @@ module Less
       end
 
       rule font
-        [a-zA-Z] [-a-zA-Z0-9]* {
+        [a-zA-Z] [-a-zA-Z0-9]* !ns {
           def build
             Node::Keyword.new(text_value)
           end
         } / string {
           def build
-            Node::String.new(text_value)
+            Node::Quoted.new(text_value)
           end
         }
       end
@@ -46,7 +46,7 @@ module Less
           end
         } / string {
           def build
-            Node::String.new(text_value)
+            Node::Quoted.new(text_value)
           end
         }
       end
@@ -89,7 +89,7 @@ module Less
       end
 
       rule unit
-        ('px'/'em'/'pc'/'%'/'ex'/'s'/'pt'/'cm'/'mm')?
+        ('px'/'em'/'pc'/'%'/'ex'/'in'/'deg'/'s'/'pt'/'cm'/'mm')?
       end
 
       #