compass 0.10.0.pre4 → 0.10.0.pre5

data/CHANGELOG.markdown

@@ -1,6 +1,22 @@
 COMPASS CHANGELOG
 =================
 
+0.10.0.pre5 (January 18, 2010)
+------------------------------
+* Fixed a bug in the grid builder in ruby 1.8.6 (Credit: [Richard Wöber][der-rich])
+* Better sudo handling for the rails installer via environment variables or prompt. (Credit: Ryan Shaw, Evan Sharp)
+* Removed support for the rip package manager.
+* Support for scss files in the compass watcher.
+* Cache buster timestamps were not working in some cases.
+* Make ANSI color output work on windows.
+* Command line switch (--boring) to turn off colorized output.
+* Strip trailing slash from directory and path configuration variables.
+* Added a --poll option to the compass watch subcommand to force polling.
+* Fixed a test failure in ruby 1.9 due to faulty test code.
+* Move the frameworks directory back to the top level. There's not actually a good reason for it to be buried in the ruby source.
+* Upgrade FSSM. (Hopfully) Fixes a watcher issue that caused the watcher to not trigger for some users.
+* Silence a deprecation warning in Rails 3.
+
 0.10.0.pre4 (January 04, 2010)
 ------------------------------
 * Fixed an FSSM loading issue that broke the compass watcher.

data/REVISION

@@ -1 +1 @@
-08894dc6ab17c4d79297868e177cbed3d338b93b
+9503512782eba7e387ba0dec14e5cfe1f3c0f22b

data/Rakefile

@@ -63,6 +63,7 @@ begin
     gemspec.files -= Dir.glob("examples/**/*.css")
     gemspec.files -= Dir.glob("examples/**/*.html")
     gemspec.files -= Dir.glob("examples/*/extensions/**")
+    gemspec.files += Dir.glob("frameworks/**/*")
     gemspec.files += Dir.glob("lib/**/*")
     gemspec.files += Dir.glob("test/**/*.*")
     gemspec.files -= Dir.glob("test/fixtures/stylesheets/*/saved/**/*.*")

data/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: pre4
+:build: pre5

data/{lib/compass/frameworks → frameworks}/blueprint/templates/project/manifest.rb

@@ -7,8 +7,6 @@ stylesheet 'ie.sass',     :media => 'screen, projection', :condition => "lt IE 8
 
 image 'grid.png'
 
-html 'welcome.html.haml', :erb => true
-
 help %Q{
 Please see the blueprint website for documentation on how blueprint works:
 

data/lib/compass/app_integration/rails/installer.rb

@@ -62,7 +62,7 @@ module Compass
           print %Q{Compass recommends that you keep your stylesheets in #{recommended_location}
   instead of the Sass default location of #{default_location}.
   Is this OK? (Y/n) }
-          answer = gets.downcase[0]
+          answer = $stdin.gets.downcase[0]
           answer == ?n ? default_location : recommended_location
         end
 
@@ -74,7 +74,8 @@ module Compass
   instead the Sass default of #{default_location}/.
   However, if you're exclusively using Sass, then #{default_location}/ is recommended.
   Emit compiled stylesheets to #{recommended_location}/? (Y/n) }
-          answer = gets.downcase[0]
+          answer = $stdin.gets
+          answer = answer.downcase[0]
           answer == ?n ? default_location : recommended_location
         end
 
@@ -92,7 +93,7 @@ module Compass
           %Q{require 'compass'
   # If you have any compass plugins, require them here.
   Compass.configuration.parse(File.join(RAILS_ROOT, "config", "compass.rb"))
-  Compass.configuration.environment = RAILS_ENV.to_sym
+  Compass.configuration.environment = (defined?(Rails) ? Rails.env : RAILS_ENV).to_sym
   Compass.configure_sass_plugin!
   }
         end

data/lib/compass/app_integration/rails/templates/compass-install-rails.rb

@@ -28,6 +28,15 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 # =================================================================
+
+# Determine if we use sudo, defaults to true unless we are
+# on win32, cygwin, or mingw32 or they ask us not to
+def sudo_is_an_option?
+  return false if RUBY_PLATFORM =~ /(win|w)32$/ # true if win32, cygwin or mingw32
+  return false if ENV['NO_SUDO'] =~ /true/i
+  return true
+end
+
 puts "==================================================="
 puts "Welcome to the Compass Installer for Ruby on Rails!"
 puts "==================================================="
@@ -45,29 +54,25 @@ sass_dir = "app/stylesheets" if sass_dir.blank?
 css_dir = ask("Where would you like Compass to store your compiled css files? (default: 'public/stylesheets/compiled')")
 css_dir = "public/stylesheets/compiled" if css_dir.blank?
 
+# use sudo for gem commands?
+use_sudo = sudo_is_an_option?
+if sudo_is_an_option? # dont give them the option if they are on a system that can't use sudo (aka windows)
+  use_sudo = yes?("Use sudo for the gem commands? (the default for your system is #{sudo_is_an_option? ? 'yes' : 'no'})")
+end
+
 # define dependencies
 gem "haml", :version => ">=2.2.16"
 gem "compass", :version => ">= 0.8.17"
 
 # install and unpack
-unless RUBY_PLATFORM =~ /(win|w)32$/ # true if win32, cygwin or mingw32
-  rake "gems:install GEM=haml", :sudo => true
-  rake "gems:install GEM=compass", :sudo => true
-else
-  rake "gems:install GEM=haml"
-  rake "gems:install GEM=compass"
-end
+rake "gems:install GEM=haml", :sudo => use_sudo
+rake "gems:install GEM=compass", :sudo => use_sudo
 rake "gems:unpack GEM=compass"
 
 # load any compass framework plugins
 if css_framework =~ /960/
   gem "compass-960-plugin", :lib => "ninesixty"
-  unless RUBY_PLATFORM =~ /(win|w)32$/
-    rake "gems:install GEM=compass-960-plugin", :sudo => true
-  else
-    rake "gems:install GEM=compass-960-plugin"
-  end
-  rake "gems:unpack GEM=compass-960-plugin"
+  rake "gems:install GEM=compass-960-plugin", :sudo => use_sudo
   css_framework = "960" # rename for command
   plugin_require = "-r ninesixty"
 end

data/lib/compass/commands/watch_project.rb

@@ -5,6 +5,25 @@ require 'compass/commands/update_project'
 
 module Compass
   module Commands
+    module WatchProjectOptionsParser
+      def set_options(opts)
+        super
+
+        opts.banner = %Q{
+          Usage: compass watch [path/to/project] [path/to/project/src/file.sass ...] [options]
+
+          Description:
+          watch the project for changes and recompile when they occur.
+
+          Options:
+        }.split("\n").map{|l| l.gsub(/^ */,'')}.join("\n")
+
+        opts.on("--poll", :NONE, "Check periodically if there's been changes.") do
+          self.options[:poll] = 1 # check every 1 second.
+        end
+
+      end
+    end
     class WatchProject < UpdateProject
 
       register :watch
@@ -19,19 +38,29 @@ module Compass
 
         recompile
 
-        puts ">>> Compass is watching for changes. Press Ctrl-C to Stop."
-
         begin
           require 'fssm'
         rescue LoadError
-          $: << File.join(Compass.lib_directory, 'vendor')
+          $: << File.join(Compass.lib_directory, 'vendor', 'fssm')
           retry
         end
 
+        if options[:poll]
+          require "fssm/backends/polling"
+          # have to silence the ruby warning about chaning a constant.
+          stderr, $stderr = $stderr, StringIO.new
+          FSSM::Backends.const_set("Default", FSSM::Backends::Polling)
+          $stderr = stderr
+        end
+
+        action = FSSM::Backends::Default.to_s == "FSSM::Backends::Polling" ? "polling" : "watching"
+
+        puts ">>> Compass is #{action} for changes. Press Ctrl-C to Stop."
+
         FSSM.monitor do |monitor|
           Compass.configuration.sass_load_paths.each do |load_path|
             monitor.path load_path do |path|
-              path.glob '**/*.sass'
+              path.glob '**/*.s[ac]ss'
 
               path.update &method(:recompile)
               path.delete {|base, relative| remove_obsolete_css(base,relative); recompile(base, relative)}
@@ -66,6 +95,15 @@ module Compass
         end
       end
 
+      class << self
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(CompileProjectOptionsParser)
+          parser.extend(WatchProjectOptionsParser)
+        end
+      end
     end
   end
 end