compass 0.10.0.pre4 → 0.10.0.pre5

data/lib/compass/configuration.rb

@@ -41,6 +41,6 @@ module Compass
   end
 end
 
-['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'data'].each do |lib|
+['adapters', 'comments', 'defaults', 'helpers', 'inheritance', 'serialization', 'paths', 'data'].each do |lib|
   require "compass/configuration/#{lib}"
 end

data/lib/compass/configuration/data.rb

@@ -22,10 +22,13 @@ module Compass
       include Compass::Configuration::Inheritance
       include Compass::Configuration::Serialization
       include Compass::Configuration::Adapters
+      extend  Compass::Configuration::Paths
 
       inherited_accessor *ATTRIBUTES
       inherited_accessor :required_libraries #XXX we should make this array add up cumulatively.
 
+      strip_trailing_separator *ATTRIBUTES.select{|a| a.to_s =~ /dir|path/}
+
       def initialize(name, attr_hash = nil)
         raise "I need a name!" unless name
         @name = name

data/lib/compass/configuration/paths.rb

@@ -0,0 +1,19 @@
+module Compass::Configuration::Paths
+
+  TRAILING_SEPARATOR = %r{.(/|#{Regexp.escape(File::SEPARATOR)})$}
+
+  def strip_trailing_separator(*attributes)
+    attributes.each do |attr|
+      alias_method "#{attr}_with_trailing_separator".to_sym, attr
+      class_eval %Q{
+        def #{attr}                                # def css_dir
+          path = #{attr}_with_trailing_separator   #   path = css_dir_with_trailing_separator
+          if path =~ TRAILING_SEPARATOR            #   if path =~ TRAILING_SEPARATOR
+            path = path[0..-($1.length+1)]         #     path = path[0..-($1.length+1)]
+          end                                      #   end
+          path                                     #   path
+        end                                        # end
+      }
+    end
+  end
+end

data/lib/compass/exec.rb

@@ -5,6 +5,8 @@ require 'compass/errors'
 require 'compass/actions'
 require 'compass/installers'
 require 'compass/commands'
+require 'rbconfig'
+require 'win32console' if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
 
 module Compass::Exec
 end

data/lib/compass/exec/global_options_parser.rb

@@ -27,6 +27,10 @@ module Compass::Exec::GlobalOptionsParser
       self.options[:dry_run] = true
     end
 
+    opts.on('--boring', :NONE, 'Turn off colorized output.') do
+      self.options[:color_output] = false
+    end
+
     opts.on_tail("-?", "-h", "--help", "Show this message") do
       puts opts
       exit

data/lib/compass/exec/switch_ui.rb

@@ -154,6 +154,10 @@ END
         self.options[:command] = :print_version
       end
 
+      opts.on('--boring', :NONE, 'Turn off colorized output.') do
+        self.options[:color_output] = false
+      end
+
     end
     
     def do_command(command)

data/lib/compass/frameworks.rb

@@ -3,7 +3,7 @@ module Compass
     extend self
 
     ALL = []
-    DEFAULT_FRAMEWORKS_PATH = File.join(Compass.lib_directory, 'compass', 'frameworks')
+    DEFAULT_FRAMEWORKS_PATH = File.join(Compass.base_directory, 'frameworks')
 
     class Framework
       attr_accessor :name

data/lib/compass/grid_builder.rb

@@ -15,7 +15,7 @@ module Compass
 
     class << self
       def crc(chunkdata='')
-        chunkdata.bytes.to_a.inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte)  & 0xff] ^ (crc >> 8) } ^  0xffffffff
+        chunkdata.unpack('C*').inject(0xffffffff){|crc, byte| CRC_TABLE[(crc ^ byte)  & 0xff] ^ (crc >> 8) } ^  0xffffffff
       end
 
       def chunk(type, data="")
@@ -64,14 +64,17 @@ module Compass
     #   * <tt>:height</tt> -- Height (in pixels) of a row
     #   * <tt>:filename</tt> -- Output path of grid.png file
     def initialize(options={})
-      @column_width = options[:column_width]
-      gutter_width = options[:gutter_width]
+      @column_width = options[:column_width] || 0
+      gutter_width = options[:gutter_width] || 0
 
       height = options[:height] || 20
+      width = @column_width + gutter_width
+      width = 10 if width == 0
+
       @filename = options[:filename]
       @options = options
 
-      super(@column_width + gutter_width, height, [0xe9,0xe9,0xe9])
+      super(width, height, [0xe9,0xe9,0xe9])
     end
 
     def working_path

data/lib/compass/sass_extensions/functions/urls.rb

@@ -116,7 +116,7 @@ module Compass::SassExtensions::Functions::Urls
 
   def default_cache_buster(path, real_path)
     if File.readable?(real_path)
-      File.mtime(real_path).strftime("%s") 
+      File.mtime(real_path).to_i.to_s
     else
       $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
     end

data/lib/vendor/{fssm.rb → fssm/fssm.rb}

@@ -12,15 +12,7 @@ module FSSM
 
     def monitor(*args, &block)
       monitor = FSSM::Monitor.new
-      context = args.empty? ? monitor : monitor.path(*args)
-
-      if block_given?
-        if block.arity == 1
-          block.call(context)
-        else
-          context.instance_eval(&block)
-        end
-      end
+      FSSM::Support.use_block(args.empty? ? monitor : monitor.path(*args), block)
 
       monitor.run
     end
@@ -33,7 +25,8 @@ require 'fssm/pathname'
 require 'fssm/support'
 require 'fssm/tree'
 require 'fssm/path'
-require 'fssm/state'
+require 'fssm/state/directory'
+require 'fssm/state/file'
 require 'fssm/monitor'
 
 require "fssm/backends/#{FSSM::Support.backend.downcase}"

data/lib/vendor/fssm/{backends → fssm/backends}/fsevents.rb

@@ -7,18 +7,17 @@ module FSSM::Backends
       @fsevents = []
     end
 
-    def add_path(path, preload=true)
-      handler = FSSM::State.new(path)
-      @handlers["#{path}"] = handler
+    def add_handler(handler, preload=true)
+      @handlers[handler.path.to_s] = handler
 
-      fsevent = Rucola::FSEvents.new("#{path}", {:latency => 0.5}) do |events|
+      fsevent = Rucola::FSEvents.new(handler.path.to_s, {:latency => 0.5}) do |events|
         events.each do |event|
           handler.refresh(event.path)
         end
       end
 
       fsevent.create_stream
-      handler.refresh(path.to_pathname, true) if preload
+      handler.refresh(nil, true) if preload
       fsevent.start
       @fsevents << fsevent
     end

data/lib/vendor/fssm/{backends → fssm/backends}/inotify.rb

@@ -4,14 +4,12 @@ module FSSM::Backends
       @notifier = INotify::Notifier.new
     end
 
-    def add_path(path, preload=true)
-      handler = FSSM::State.new(path)
-
-      @notifier.watch(path.to_s, :all_events) do |event|
+    def add_handler(handler, preload=true)
+      @notifier.watch(handler.path.to_s, :all_events) do |event|
         handler.refresh(event.name)
       end
 
-      handler.refresh(path.to_pathname, true) if preload
+      handler.refresh(nil, true) if preload
     end
 
     def run

data/lib/vendor/fssm/{backends → fssm/backends}/polling.rb

@@ -5,9 +5,8 @@ module FSSM::Backends
       @latency = options[:latency] || 1.5
     end
 
-    def add_path(path, preload=true)
-      handler = FSSM::State.new(path)
-      handler.refresh(path.to_pathname, true) if preload
+    def add_handler(handler, preload=true)
+      handler.refresh(nil, true) if preload
       @handlers << handler
     end
 

data/lib/vendor/fssm/fssm/monitor.rb

@@ -0,0 +1,26 @@
+class FSSM::Monitor
+  def initialize(options={})
+    @options = options
+    @backend = FSSM::Backends::Default.new
+  end
+
+  def path(*args, &block)
+    path = FSSM::Path.new(*args)
+    FSSM::Support.use_block(path, block)
+
+    @backend.add_handler(FSSM::State::Directory.new(path))
+    path
+  end
+
+  def file(*args, &block)
+    path = FSSM::Path.new(*args)
+    FSSM::Support.use_block(path, block)
+
+    @backend.add_handler(FSSM::State::File.new(path))
+    path
+  end
+
+  def run
+    @backend.run
+  end
+end

data/lib/vendor/fssm/{path.rb → fssm/path.rb}

@@ -81,7 +81,7 @@ class FSSM::Path
 
   def set_path(path)
     path = FSSM::Pathname.for(path)
-    raise FSSM::FileNotFoundError, "#{path}" unless path.exist?
+    raise FSSM::FileNotFoundError, "No such file or directory - #{path}" unless path.exist?
     @path = path.expand_path
   end
 

data/lib/vendor/fssm/fssm/state/directory.rb

@@ -0,0 +1,57 @@
+module FSSM::State
+  class Directory
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+      @cache = FSSM::Tree::Cache.new
+    end
+
+    def refresh(base=nil, skip_callbacks=false)
+      previous, current = recache(base || @path.to_pathname)
+
+      unless skip_callbacks
+        deleted(previous, current)
+        created(previous, current)
+        modified(previous, current)
+      end
+    end
+
+    private
+
+    def created(previous, current)
+      (current.keys - previous.keys).each {|created| @path.create(created)}
+    end
+
+    def deleted(previous, current)
+      (previous.keys - current.keys).each {|deleted| @path.delete(deleted)}
+    end
+
+    def modified(previous, current)
+      (current.keys & previous.keys).each do |file|
+        @path.update(file) if (current[file] <=> previous[file]) != 0
+      end
+    end
+
+    def recache(base)
+      base = FSSM::Pathname.for(base)
+      previous = @cache.files
+      snapshot(base)
+      current = @cache.files
+      [previous, current]
+    end
+
+    def snapshot(base)
+      base = FSSM::Pathname.for(base)
+      @cache.unset(base)
+      @path.glob.each {|glob| add_glob(base, glob)}
+    end
+
+    def add_glob(base, glob)
+      FSSM::Pathname.glob(base.join(glob).to_s).each do |fn|
+        @cache.set(fn)
+      end
+    end
+
+  end
+end

data/lib/vendor/fssm/fssm/state/file.rb

@@ -0,0 +1,24 @@
+module FSSM::State
+  class File
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    def refresh(base=nil, skip_callbacks=false)
+      base ||= @path.to_pathname
+      used_to_exist, @exists = @exists, base.exists?
+      # this handles bad symlinks without failing. why handle bad symlinks at
+      # all? well, we could still be interested in their creation and deletion.
+      old_mtime, @mtime = @mtime, base.symlink? ? Time.at(0) : base.mtime if @exists
+
+      unless skip_callbacks
+        @path.delete(@path.to_s) if used_to_exist && !@exists
+        @path.create(@path.to_s) if !used_to_exist && @exists
+        @path.update(@path.to_s) if used_to_exist && @exists && old_mtime != @mtime
+      end
+    end
+
+  end
+end

data/lib/vendor/fssm/{support.rb → fssm/support.rb}

@@ -37,15 +37,23 @@ module FSSM::Support
     end
 
     def rb_inotify?
-      begin
-        require 'rubygems'
-        gem 'rb-inotify', '>= 0.3.0'
+      found = begin
         require 'rb-inotify'
-        true
-      rescue LoadError, Gem::LoadError
-        STDERR.puts("Warning: Unable to load rb-inotify >= 0.3.0. Inotify will be unavailable.")
+        INotify::Notifier.ancestors.include?(IO)
+      rescue LoadError
         false
       end
+      STDERR.puts("Warning: Unable to load rb-inotify >= 0.3.0. Inotify will be unavailable.") unless found
+      found
+    end
+
+    def use_block(context, block)
+      return if block.nil?
+      if block.arity == 1
+        block.call(context)
+      else
+        context.instance_eval(&block)
+      end
     end
 
   end

data/test/command_line_helper.rb

@@ -7,7 +7,7 @@ module Compass::CommandLineHelper
     if block_given?
       responder = Responder.new
       yield responder
-      IO.popen("-", "w+") do |io|
+      IO.popen("-", "r+") do |io|
         if io
           #parent process
           output = ""
@@ -26,6 +26,7 @@ module Compass::CommandLineHelper
               prompt = output.split("\n").last.strip
               if response = responder.response_for(prompt)
                 io.puts response
+                io.flush
               end
             end
           end
@@ -60,7 +61,14 @@ module Compass::CommandLineHelper
       @responses << Response.new(prompt, options[:with], options[:required])
     end
     def response_for(prompt)
-      response = @responses.detect{|r| r.prompt == prompt}
+      response = @responses.detect do |r|
+        case r.prompt
+        when Regexp
+          prompt =~ r.prompt
+        when String
+          r.prompt == prompt
+        end
+      end
       if response
         response.responded = true
         response.text
@@ -84,7 +92,7 @@ module Compass::CommandLineHelper
     end
     message = "Action #{action.inspect} was not performed on: #{path}."
     message += "The following actions were performed: #{actions_found.map{|a|a.inspect}.join(", ")}" if actions_found.any?
-    puts @last_result
+    # puts @last_result
     fail message
   end
 
@@ -100,6 +108,8 @@ module Compass::CommandLineHelper
 
   def execute(*arguments)
     command_line_class = Compass::Exec::Helpers.select_appropriate_command_line_ui(arguments)
-    command_line_class.new(arguments).run!
+    exit_code = command_line_class.new(arguments).run!
+    # fail "Command Failed with exit code: #{exit_code}" unless exit_code == 0
+    exit_code
   end
 end

data/test/command_line_test.rb

@@ -25,7 +25,7 @@ class CommandLineTest < Test::Unit::TestCase
 
   def test_basic_install
     within_tmp_directory do
-      compass "basic"
+      compass "--boring", "basic"
       assert File.exists?("basic/src/screen.sass")
       assert File.exists?("basic/stylesheets/screen.css")
       assert_action_performed :directory, "basic/"
@@ -35,11 +35,11 @@ class CommandLineTest < Test::Unit::TestCase
     end
   end
 
-  def test_framework_installs
-    Compass::Frameworks::ALL.each do |framework|
+  Compass::Frameworks::ALL.each do |framework|
+    define_method "test_#{framework.name}_installation" do
       within_tmp_directory do
-        compass *%W(--framework #{framework.name} #{framework.name}_project)
-        assert File.exists?("#{framework.name}_project/src/screen.sass")
+        compass *%W(--boring --framework #{framework.name} #{framework.name}_project)
+        assert File.exists?("#{framework.name}_project/src/screen.sass"), "src/screen.sass is missing. Found: #{Dir.glob("#{framework.name}_project/**/*").join(", ")}"
         assert File.exists?("#{framework.name}_project/stylesheets/screen.css")
         assert_action_performed :directory, "#{framework.name}_project/"
         assert_action_performed    :create, "#{framework.name}_project/src/screen.sass"
@@ -51,13 +51,13 @@ class CommandLineTest < Test::Unit::TestCase
 
   def test_basic_update
     within_tmp_directory do
-      compass "basic"
+      compass "--boring", "basic"
       Dir.chdir "basic" do
         # basic update with timestamp caching
-        compass
+        compass "--boring"
         assert_action_performed :unchanged, "src/screen.sass"
         # basic update with force option set
-        compass "--force"
+        compass "--force", "--boring"
         assert_action_performed :compile, "src/screen.sass"
         assert_action_performed :identical, "stylesheets/screen.css"
       end