bundle update

Gemfile

@@ -11,7 +11,7 @@ gem "sinatra-content-for"
 gem "rack-test"
 gem "yui-compressor"
 gem "haml"
-gem "compass", "0.10.0.pre1"
+gem "compass", "0.10.0.pre2"
 gem "json_pure"
 gem "smusher"
 gem "compass-slickmap"

lib/middleman/vendor/bin/compass

@@ -1,3 +1,3 @@
 #!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
 require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/compass-0.10.0.pre1/bin/compass")
+load File.join(File.dirname(__FILE__), "../gems/gems/compass-0.10.0.pre2/bin/compass")

lib/middleman/vendor/bin/css2sass

@@ -1,3 +1,3 @@
 #!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
 require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.14/bin/css2sass")
+load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/css2sass")

lib/middleman/vendor/bin/haml

@@ -1,3 +1,3 @@
 #!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
 require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.14/bin/haml")
+load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/haml")

lib/middleman/vendor/bin/html2haml

@@ -1,3 +1,3 @@
 #!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
 require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.14/bin/html2haml")
+load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/html2haml")

lib/middleman/vendor/bin/sass

@@ -1,3 +1,3 @@
 #!/Users/tdreyno/homebrew/Cellar/ruby/1.9.1-p243/bin/ruby
 require File.join(File.dirname(__FILE__), "../gems/environment")
-load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.14/bin/sass")
+load File.join(File.dirname(__FILE__), "../gems/gems/haml-2.2.15/bin/sass")

lib/middleman/vendor/gems/environment.rb

@@ -38,18 +38,18 @@ module Bundler
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/shotgun-0.4/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/bin")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-0.9.4/lib")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.15/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.15/lib")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/bin")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/smusher-0.4.2/lib")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/bin")
   $LOAD_PATH.unshift File.expand_path("#{dir}/gems/yui-compressor-0.9.1/lib")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/bin")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/sinatra-content-for-0.2/lib")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.14/bin")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/haml-2.2.14/lib")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre1/bin")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre1/lib")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.1/bin")
-  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.1/lib")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre2/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-0.10.0.pre2/lib")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/bin")
+  $LOAD_PATH.unshift File.expand_path("#{dir}/gems/compass-slickmap-0.2.3/lib")
 
   @gemfile = "#{dir}/../../../../Gemfile"
 
@@ -86,18 +86,18 @@ module Bundler
   @bundled_specs["shotgun"].loaded_from = "#{dir}/specifications/shotgun-0.4.gemspec"
   @bundled_specs["sinatra"] = eval(File.read("#{dir}/specifications/sinatra-0.9.4.gemspec"))
   @bundled_specs["sinatra"].loaded_from = "#{dir}/specifications/sinatra-0.9.4.gemspec"
+  @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.15.gemspec"))
+  @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.15.gemspec"
+  @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
+  @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
   @bundled_specs["smusher"] = eval(File.read("#{dir}/specifications/smusher-0.4.2.gemspec"))
   @bundled_specs["smusher"].loaded_from = "#{dir}/specifications/smusher-0.4.2.gemspec"
   @bundled_specs["yui-compressor"] = eval(File.read("#{dir}/specifications/yui-compressor-0.9.1.gemspec"))
   @bundled_specs["yui-compressor"].loaded_from = "#{dir}/specifications/yui-compressor-0.9.1.gemspec"
-  @bundled_specs["sinatra-content-for"] = eval(File.read("#{dir}/specifications/sinatra-content-for-0.2.gemspec"))
-  @bundled_specs["sinatra-content-for"].loaded_from = "#{dir}/specifications/sinatra-content-for-0.2.gemspec"
-  @bundled_specs["haml"] = eval(File.read("#{dir}/specifications/haml-2.2.14.gemspec"))
-  @bundled_specs["haml"].loaded_from = "#{dir}/specifications/haml-2.2.14.gemspec"
-  @bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.10.0.pre1.gemspec"))
-  @bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.10.0.pre1.gemspec"
-  @bundled_specs["compass-slickmap"] = eval(File.read("#{dir}/specifications/compass-slickmap-0.2.1.gemspec"))
-  @bundled_specs["compass-slickmap"].loaded_from = "#{dir}/specifications/compass-slickmap-0.2.1.gemspec"
+  @bundled_specs["compass"] = eval(File.read("#{dir}/specifications/compass-0.10.0.pre2.gemspec"))
+  @bundled_specs["compass"].loaded_from = "#{dir}/specifications/compass-0.10.0.pre2.gemspec"
+  @bundled_specs["compass-slickmap"] = eval(File.read("#{dir}/specifications/compass-slickmap-0.2.3.gemspec"))
+  @bundled_specs["compass-slickmap"].loaded_from = "#{dir}/specifications/compass-slickmap-0.2.3.gemspec"
 
   def self.add_specs_to_loaded_specs
     Gem.loaded_specs.merge! @bundled_specs

lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/CHANGELOG.markdown

@@ -1,6 +1,15 @@
 COMPASS CHANGELOG
 =================
 
+0.10.0.pre2 (November 30, 2009)
+--------------------------------
+Bug fixes:
+
+* The line-height in the compass reset should have been 1 and not 1em.
+* Fixed the reference in the rails initializer to the compass configuration file.
+* Use the correct error formatting function based on what sass version is installed.
+* Boolean properties like line_comments can now be set to false in configuration files
+
 0.10.0.pre1 (November 29, 2009)
 --------------------------------
 

lib/middleman/vendor/gems/gems/compass-0.10.0.pre2/VERSION.yml

@@ -2,4 +2,4 @@
 :patch: 0
 :major: 0
 :minor: 10
-:build: pre1
+:build: pre2