compass 1.0.0.rc.0 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a26745c6095de368da35711b64f29a0be0a3897e
-  data.tar.gz: a00c977cd66bd80da2dd604bb4f52aecb989636f
+  metadata.gz: 2ba40664c33ba36cfbe915fc363e6cc6a8d37d6e
+  data.tar.gz: 294f5d5a77d9cfa5e0a9bdeddedc412fbf4b05b7
 SHA512:
-  metadata.gz: 50187461fe4d727c49786feb10cba2666191d842c42caa81242c40017fe3549128a24ff1750a93f2c8110912937e9bb7d865676881d628af9f57df987619e9a8
-  data.tar.gz: bf6637915bb3f293cbfd702bf04f43a994010941fad637bc0a3e9cb965b3c5634ca56cbe99ba198c9cbebf4a4d7aff95459e2f5e185b1819417f374cc598c82f
+  metadata.gz: 3c6b495cc53ff748913bb2c1bac81a533df5fe7279e35c1422191e47f76db3c139077f3188e8edf6c556f9e2cc3973d42c05fc5cc2a3ff0e58ca952a1aaa3d1b
+  data.tar.gz: 14b1abf7ad122a618f2885928007470fc66699cdeef1aa9d5546fbe5fd0a893d6f023f4b52426d214be627459bc9885e3834f7924e23d4949679cd606003dd15

data/lib/compass.rb

@@ -27,9 +27,8 @@ module Compass
   extend QuickCache
 end
 
-%w(configuration/adapters
+%w(configuration/helpers
    configuration/comments
-   configuration/helpers
    configuration/serialization
    configuration/file_data
    app_integration

data/lib/compass/commands/update_project.rb

@@ -94,7 +94,7 @@ module Compass
       end
 
       def compiler_options
-        transfer_options(options, {}, :time, :debug_info, :only_sass_files, :force)
+        transfer_options(options, {}, :time, :debug_info, :only_sass_files, :force, :quiet)
       end
 
       def transfer_options(from, to, *keys)

data/lib/compass/generated_version.rb

@@ -1,4 +1,4 @@
 module Compass
-  VERSION = "1.0.0.rc.0"
+  VERSION = "1.0.0.rc.1"
   VERSION_NAME = "Polaris"
 end

data/lib/compass/logger.rb

@@ -27,6 +27,27 @@ module Compass
 
     DEFAULT_ACTIONS = ACTION_COLORS.keys
 
+    ACTION_CAN_BE_QUIET = {
+      :error     => false,
+      :warning   => true,
+      :info      => true,
+      :compile   => true,
+      :overwrite => true,
+      :modified  => true,
+      :clean     => true,
+      :write     => true,
+      :create    => true,
+      :remove    => true,
+      :delete    => true,
+      :deleted   => true,
+      :created   => true,
+      :exists    => true,
+      :directory => true,
+      :identical => true,
+      :convert   => true,
+      :unchanged => true
+    }
+
     attr_accessor :actions, :options, :time
 
     def initialize(*actions)
@@ -37,6 +58,7 @@ module Compass
 
     # Record an action that has occurred
     def record(action, *arguments)
+      return if options[:quiet] && ACTION_CAN_BE_QUIET[action]
       msg = ""
       if time
         msg << Time.now.strftime("%I:%M:%S.%3N %p")

data/lib/compass/sass_compiler.rb

@@ -5,6 +5,7 @@ class Compass::SassCompiler
   include Compass::Actions
 
   attr_writer :logger
+  attr_reader :quiet
   attr_reader :error_count
   attr_accessor :config
   attr_accessor :display_compilation_times
@@ -17,12 +18,15 @@ class Compass::SassCompiler
     self.display_compilation_times = options.delete(:time)
     self.working_path = options.delete(:working_path) || Dir.pwd
     self.only_sass_files = options.delete(:only_sass_files) || []
+    @quiet = options[:quiet]
     plugin_options = config.to_sass_plugin_options.merge(options)
     if only_sass_files.any?
       plugin_options[:template_location] = []
       plugin_options[:load_paths] = config.sass_load_paths
     end
     plugin_options[:always_update] = true if options.delete(:force)
+    plugin_options[:compass] ||= {}
+    plugin_options[:compass][:logger] = logger
     @compiler = Sass::Plugin::Compiler.new(plugin_options)
     @start_times = {}
     @error_count = 0
@@ -108,16 +112,20 @@ class Compass::SassCompiler
 
   def when_compilation_error(error, sass_file, css_file, sourcemap_file)
     @error_count += 1
-    if relativize(error.sass_filename) == relativize(sass_file)
-      logger.record :error, "#{relativize(error.sass_filename)} (Line #{error.sass_line}: #{error.message})"
+    if error.respond_to?(:sass_filename)
+      if relativize(error.sass_filename) == relativize(sass_file)
+        logger.record :error, "#{relativize(error.sass_filename)} (Line #{error.sass_line}: #{error.message})"
+      else
+        logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line} of #{relativize(error.sass_filename)}: #{error.message})"
+      end
     else
-      logger.record :error, "#{relativize(sass_file)} (Line #{error.sass_line} of #{relativize(error.sass_filename)}: #{error.message})"
+      logger.record :error, "#{relativize(sass_file)} (#{error.backtrace.first}: #{error.message})"
     end
     config.run_stylesheet_error(sass_file, error.message)
   end
 
   def logger
-    @logger ||= Compass::Logger.new
+    @logger ||= Compass::Logger.new(:quiet => quiet)
   end
 
   def corresponding_css_file(sass_file)

data/lib/compass/sass_extensions/sprites/image_methods.rb

@@ -8,7 +8,7 @@ module Compass
             name = name.value
           end
           name = name.to_s
-          @images.detect { |img| img.name == name}
+          @images.detect { |img| img.name.downcase == name.downcase}
          end
 
          # Returns true if the image name has a hover selector image

data/lib/compass/version.rb

@@ -32,7 +32,7 @@ module Compass
 
   extend Compass::Version
 
-  unless defined?(VERSION)
+  unless defined?(::Compass::VERSION)
     VERSION = File.read(scope("VERSION")).strip 
     VERSION_NAME = File.read(scope("VERSION_NAME")).strip
   end

data/test/units/configuration_test.rb

@@ -360,8 +360,6 @@ CONFIG
 
     assert load_paths.include?("/home/chris/foo"), "Expected to find /home/chris/foo in #{load_paths.inspect}"
     assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
-    assert_equal "/home/chris/my_compass_project/css/framework", plugin_opts[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
-    assert_equal "/home/chris/my_compass_project/css/foo", plugin_opts[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
 require 'compass/import-once/activate'
@@ -423,8 +421,6 @@ EXPECTED
 
     assert load_paths.include?("/home/chris/foo"), "Expected to find /home/chris/foo in #{load_paths.inspect}"
     assert load_paths.include?("/path/to/my/framework"), load_paths.inspect
-    assert_equal "/home/chris/my_compass_project/css/framework", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/path/to/my/framework"}[1]
-    assert_equal "/home/chris/my_compass_project/css/foo", Compass.configuration.to_sass_plugin_options[:template_location].find{|s,c| s == "/home/chris/my_compass_project/../foo"}[1]
 
     expected_serialization = <<EXPECTED
 require 'compass/import-once/activate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compass
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.0
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - Chris Eppstein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
@@ -40,28 +40,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.0
+        version: 1.0.0.rc.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.0
+        version: 1.0.0.rc.1
 - !ruby/object:Gem::Dependency
   name: compass-import-once
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.4
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,6 @@ files:
 - lib/compass/commands/write_configuration.rb
 - lib/compass/commands.rb
 - lib/compass/compiler.rb
-- lib/compass/configuration/adapters.rb
 - lib/compass/configuration/comments.rb
 - lib/compass/configuration/file_data.rb
 - lib/compass/configuration/helpers.rb

data/lib/compass/configuration/adapters.rb

@@ -1,109 +0,0 @@
-module Compass
-  module Configuration
-    # The adapters module provides methods that make configuration data from a compass project
-    # adapt to various consumers of configuration data
-    module Adapters
-      def to_compiler_arguments(additional_options = {})
-        engine_opts = to_sass_engine_options.merge(additional_options)
-        # we have to pass the quiet option in the nested :sass hash to disambiguate it from the compass compiler's own quiet option.
-        if engine_opts.has_key?(:quiet)
-          engine_opts[:sass] ||= {}
-          engine_opts[:sass][:quiet] = engine_opts.delete(:quiet)
-        end
-        [project_path, sass_path, css_path, engine_opts]
-      end
-
-      def to_sass_plugin_options
-        locations = []
-        locations << [sass_path, css_path] if sass_path && css_path
-        Compass::Frameworks::ALL.each do |framework|
-          locations << [framework.stylesheets_directory, File.join(css_path || css_dir || ".", framework.name)]
-        end
-        load_paths = []
-        resolve_additional_import_paths.each do |additional_path|
-          if additional_path.is_a?(String)
-            locations << [additional_path, File.join(css_path || css_dir || ".", File.basename(additional_path))]
-          else
-            load_paths << additional_path
-          end
-        end
-        plugin_opts = {:template_location => locations}
-        plugin_opts[:style] = output_style if output_style
-        plugin_opts[:line_comments] = line_comments
-        if sass_3_4?
-          plugin_opts[:sourcemap] = sourcemap ? :auto : :none
-        else
-          plugin_opts[:sourcemap] = sourcemap
-        end
-        plugin_opts[:cache] = cache unless cache.nil?
-        plugin_opts[:cache_location] = cache_path unless cache_path.nil?
-        plugin_opts[:quiet] = disable_warnings if disable_warnings
-        plugin_opts[:compass] = {}
-        plugin_opts[:compass][:environment] = environment
-        plugin_opts.merge!(sass_options || {})
-        plugin_opts[:load_paths] ||= []
-        plugin_opts[:load_paths] += load_paths
-        plugin_opts[:load_paths] << Compass::SpriteImporter.new
-        plugin_opts[:full_exception] = (environment == :development)
-        plugin_opts
-      end
-
-      def resolve_additional_import_paths
-        (additional_import_paths || []).map do |path|
-          if path.is_a?(String) && project_path && !absolute_path?(path)
-            File.join(project_path, path)
-          else
-            path
-          end
-        end
-      end
-
-      def absolute_path?(path)
-        # Pretty basic implementation
-        path.index(File::SEPARATOR) == 0 || path.index(':') == 1
-      end
-
-      def to_sass_engine_options
-        engine_opts = {:load_paths => sass_load_paths}
-        engine_opts[:style] = output_style if output_style
-        engine_opts[:line_comments] = line_comments
-        if sass_3_4?
-          engine_opts[:sourcemap] = sourcemap ? :auto : :none
-        else
-          engine_opts[:sourcemap] = sourcemap
-        end
-        engine_opts[:cache] = cache
-        engine_opts[:cache_location] = cache_path
-        engine_opts[:quiet] = disable_warnings if disable_warnings
-        engine_opts[:compass] = {}
-        engine_opts[:compass][:environment] = environment
-        engine_opts[:full_exception] = (environment == :development)
-        engine_opts.merge!(sass_options || {})
-      end
-
-      def sass_load_paths
-        load_paths = []
-        load_paths << sass_path if sass_path
-        Compass::Frameworks::ALL.each do |f|
-          load_paths << f.stylesheets_directory if File.directory?(f.stylesheets_directory)
-        end
-        importer = sass_options[:filesystem_importer] if sass_options && sass_options[:filesystem_importer]
-        importer ||= Sass::Importers::Filesystem
-        load_paths += resolve_additional_import_paths
-        load_paths.map! do |p|
-          next p if p.respond_to?(:find_relative)
-          importer.new(p.to_s)
-        end
-        load_paths << Compass::SpriteImporter.new
-        load_paths
-      end
-
-      def sass_3_4?
-        Sass.version[:major] == 3 && Sass.version[:minor] == 4
-      end
-    end
-    class Data
-      include Adapters
-    end
-  end
-end