cloudhead-less 1.0.16 → 1.1.0

data/VERSION

@@ -1 +1 @@
-1.0.16
+1.1.0

data/bin/lessc

@@ -3,13 +3,23 @@
 $:.unshift File.dirname(__FILE__) + "/../lib"
 
 require 'optparse'
+require 'rubygems'
 require 'less'
 
+begin
+  require 'growl'
+rescue LoadError
+  Less::GROWL = false
+else
+  Less::GROWL = true
+end
+
 # Argument defaults
 options = {
   :watch => false,
   :compress => false,
   :debug => false,
+  :growl => false
 }
 
 # Get arguments
@@ -22,6 +32,18 @@ opts = OptionParser.new do |o|
     options[:watch] = true
   end
   
+  # Growl
+  o.on("-g", "--growl", "growl notifications") do
+    if Less::GROWL && Growl.installed?
+      options[:growl] = true
+    elsif Less::GROWL
+      abort "Growl wasn't found on your system."
+    else
+      abort "Growl gem not found, please install with: " +
+            "`sudo gem install visionmedia-growl -s http://gems.github.com`"
+    end
+  end
+  
   # Compression needs a proper algorithm
   #
   #  o.on("-x", "--compress", "compress css file") do

data/less.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{less}
-  s.version = "1.0.16"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["cloudhead"]
-  s.date = %q{2009-07-23}
+  s.date = %q{2009-07-24}
   s.default_executable = %q{lessc}
   s.description = %q{LESS is leaner CSS}
   s.email = %q{self@cloudhead.net}

data/lib/less/command.rb

@@ -1,4 +1,12 @@
 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
 
@@ -6,6 +14,7 @@ module Less
       $verbose = options[:debug]
       @source = options[:source]
       @destination = (options[:destination] || options[:source]).gsub /\.(less|lss)/, '.css'
+      @growl = Growl.new if options[:growl]
       @options = options
     end
 
@@ -53,25 +62,26 @@ 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)).to_css
         css = css.delete " \n" if compress?
 
         File.open( @destination, "w" ) do |file|
           file.write css
         end
-        print "#{new ? '* [Created]' : '* [Updated]'} #{@destination.split('/').last}\n: " if watch?
+        print "#{GREEN['* ' + (new ? 'Created'  : 'Updated')]} " + 
+              "#{@destination.split('/').last}\n: " if watch?
       rescue Errno::ENOENT => e
         abort "#{e}"
       rescue SyntaxError => e
-        err "#{e}\n", "Parse"
+        err "#{e}\n", "Syntax"
       rescue MixedUnitsError => e
         err "`#{e}` you're  mixing units together! What do you expect?\n"
       rescue PathError => e
         err "`#{e}` was not found.\n", "Path"
       rescue VariableNameError => e
-        err "`#{e}` is undefined.\n", "Name"
+        err "#{YELLOW[e]} is undefined.\n", "Name"
       rescue MixinNameError => e
-        err "`#{e}` is undefined.\n", "Name"
+        err "#{YELLOW[e]} is undefined.\n", "Name"
       else
         true
       end
@@ -84,7 +94,10 @@ module Less
 
     def err s = '', type = ''
       type = type.strip + ' ' unless type.empty?
-      print "! [#{type}Error] #{s}"
+      print "#{RED["! #{type}Error"]}: #{s}"
+      @growl.message = "#{type}Error in #@source!" if @options[:growl]
+      @growl.run
+      false
     end
   end
-end
+end

data/lib/less/engine/less.tt

@@ -36,7 +36,7 @@ grammar Less
         path = File.join(env.root.file, url.value)
         path += '.less' unless path =~ /\.(le|c)ss$/
         if File.exist? path
-          imported = Less::Engine.new(File.new path).to_tree
+          imported = Less::Engine.new(File.new(path)).to_tree
           env.rules += imported.rules
         else
           raise ImportError, path
@@ -48,7 +48,7 @@ grammar Less
   rule url
     'url(' path:(string / [-a-zA-Z0-9_%$/.&=:;#+?]+) ')' {
       def build env = nil
-        Node::String.new(CGI.unescape path.text_value)
+        Node::String.new CGI.unescape(path.text_value)
       end
       
       def value
@@ -313,7 +313,6 @@ grammar Less
     ('px'/'em'/'pc'/'%'/'pt'/'cm'/'mm')?
   end
 
-  
   #
   # Color
   #

data/lib/less/engine/parser.rb

@@ -494,7 +494,7 @@ module Less
       path = File.join(env.root.file, url.value)
       path += '.less' unless path =~ /\.(le|c)ss$/
       if File.exist? path
-        imported = Less::Engine.new(File.new path).to_tree
+        imported = Less::Engine.new(File.new(path)).to_tree
         env.rules += imported.rules
       else
         raise ImportError, path
@@ -589,7 +589,7 @@ module Less
 
   module Url1
     def build env = nil
-      Node::String.new(CGI.unescape path.text_value)
+      Node::String.new CGI.unescape(path.text_value)
     end
     
     def value
@@ -1476,92 +1476,6 @@ module Less
     r0
   end
 
-  def _nt_separator
-    start_index = index
-    if node_cache[:separator].has_key?(index)
-      cached = node_cache[:separator][index]
-      @index = cached.interval.end if cached
-      return cached
-    end
-
-    i0 = index
-    r1 = _nt_operator
-    if r1
-      r0 = r1
-    else
-      r2 = _nt_S
-      if r2
-        r0 = r2
-      else
-        r3 = _nt_WS
-        if r3
-          r0 = r3
-        else
-          @index = i0
-          r0 = nil
-        end
-      end
-    end
-
-    node_cache[:separator][start_index] = r0
-
-    r0
-  end
-
-  module Paren0
-    def s
-      elements[0]
-    end
-
-    def s
-      elements[2]
-    end
-  end
-
-  module Paren1
-    def build
-      Node::Paren.new(text_value.strip)
-    end
-  end
-
-  def _nt_paren
-    start_index = index
-    if node_cache[:paren].has_key?(index)
-      cached = node_cache[:paren][index]
-      @index = cached.interval.end if cached
-      return cached
-    end
-
-    i0, s0 = index, []
-    r1 = _nt_s
-    s0 << r1
-    if r1
-      if has_terminal?('\G[()]', true, index)
-        r2 = instantiate_node(SyntaxNode,input, index...(index + 1))
-        @index += 1
-      else
-        r2 = nil
-      end
-      s0 << r2
-      if r2
-        r3 = _nt_s
-        s0 << r3
-      end
-    end
-    if s0.last
-      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-      r0.extend(Paren0)
-      r0.extend(Paren1)
-    else
-      @index = i0
-      r0 = nil
-    end
-
-    node_cache[:paren][start_index] = r0
-
-    r0
-  end
-
   def _nt_entity
     start_index = index
     if node_cache[:entity].has_key?(index)
@@ -1640,9 +1554,6 @@ module Less
 
   module Fonts2
     def build
-      fonts = all.map do |font|
-        font.build
-      end
       Node::FontFamily.new(all.map(&:build))
     end
     

data/lib/less/engine.rb

@@ -15,7 +15,7 @@ module Less
     
     def initialize obj
       @less = if obj.is_a? File
-        @path = File.dirname(File.expand_path obj.path)
+        @path = File.dirname File.expand_path(obj.path)
         obj.read
       elsif obj.is_a? String
         obj.dup

data/lib/less.rb

@@ -39,9 +39,9 @@ module Treetop
         "on line #{failure_line}: expected " + (
           tf.size == 1 ? 
             tf[0].expected_string : 
-            "one of #{tf.map {|f| f.expected_string }.uniq * ' '}"
+            "one of #{Less::YELLOW[tf.map {|f| f.expected_string }.uniq * ' ']}"
         ) +
-        " got `#{input[failure_index]}`" +
+        " got #{Less::YELLOW[input[failure_index]]}" +
         " after:\n\n#{input[index...failure_index]}\n"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudhead-less
 version: !ruby/object:Gem::Version 
-  version: 1.0.16
+  version: 1.1.0
 platform: ruby
 authors: 
 - cloudhead
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-23 00:00:00 -07:00
+date: 2009-07-24 00:00:00 -07:00
 default_executable: lessc
 dependencies: []