sass 3.1.0.alpha.44 → 3.1.0.alpha.45

data/EDGE_GEM_VERSION

@@ -1 +1 @@
-3.1.0.alpha.44
+3.1.0.alpha.45

data/VERSION

@@ -1 +1 @@
-3.1.0.alpha.44
+3.1.0.alpha.45

data/lib/sass/exec.rb

@@ -231,6 +231,9 @@ END
         opts.on('-q', '--quiet', 'Silence warnings and status messages during compilation.') do
           @options[:for_engine][:quiet] = true
         end
+        opts.on('--compass', 'Loads compass.') do
+          @options[:compass] = true
+        end
         opts.on('-g', '--debug-info',
                 'Emit extra information in the generated CSS that can be used by the FireSass Firebug plugin.') do
           @options[:for_engine][:debug_info] = true
@@ -276,7 +279,7 @@ END
             @options[:update] = true
           end
         end
-
+        load_compass if @options[:compass]
         return interactive if @options[:interactive]
         return watch_or_update if @options[:watch] || @options[:update]
         super
@@ -309,6 +312,22 @@ END
 
       private
 
+      def load_compass
+        begin
+          require 'compass'
+        rescue LoadError
+          require 'rubygems'
+          begin
+            require 'compass'
+          rescue LoadError
+            puts "ERROR: Cannot load compass."
+            exit 1
+          end
+        end
+        Compass.add_project_configuration
+        @options[:for_engine][:load_paths] += Compass.configuration.sass_load_paths
+      end
+
       def interactive
         require 'sass/repl'
         ::Sass::Repl.new(@options).run

data/lib/sass/script/functions.rb

@@ -1092,7 +1092,6 @@ module Sass::Script
     # @param if_true [Literal] The value that will be returned if `$condition` is true.
     # @param if_false [Literal] The value that will be returned if `$condition` is false.
     def if(condition, if_true, if_false)
-      assert_type condition, :Bool
       if condition.to_bool
         if_true
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sass
 version: !ruby/object:Gem::Version 
-  version: 3.1.0.alpha.44
+  version: 3.1.0.alpha.45
 platform: ruby
 authors: 
 - Nathan Weizenbaum