Decompose sprites

.travis.yml

@@ -16,15 +16,21 @@ sudo: false
 env:
   - CI_TEST=core
   - CI_TEST=cli
+  - CI_TEST=sprites
 
 gemfile:
   - core/Gemfile
   - cli/gemfiles/sass_3_3.gemfile
   - cli/gemfiles/listen_2.gemfile
+  - sprites/Gemfile
 
 script: cd $CI_TEST && bundle exec rake
 
 matrix:
+  allow_failures:
+  - gemfile: cli/gemfiles/listen_2.gemfile
+    env: CI_TEST=cli
+    rvm: rbx
   exclude:
   - gemfile: cli/gemfiles/sass_3_3.gemfile
     env: CI_TEST=core

Rakefile

@@ -1,5 +1,5 @@
 
-GEMS = ['core', 'cli', 'import-once']
+GEMS = ['core', 'cli', 'import-once', 'sprites']
 
 
 task :default => %w[test]
@@ -10,7 +10,19 @@ task :test do
      Rake::Task["test_cleanup"].invoke if ok
   end
 end
+desc "run cli sass 3.3 tests"
+task "sass_3_3_test" do
+  sh "cd cli && (BUNDLE_GEMFILE=gemfiles/sass_3_3.gemfile bundle install --quiet && bundle exec rake test) && cd .." do |ok, res|
+    Rake::Task["test_cleanup"].invoke if ok
+  end
+end
 
+desc "run cli listen 2 tests"
+task "listen_2_test" do
+  sh "cd cli && (BUNDLE_GEMFILE=gemfiles/listen_2.gemfile bundle install --quiet && bundle exec rake test) && cd .." do |ok, res|
+    Rake::Task["test_cleanup"].invoke if ok
+  end
+end
 
 desc "Clean up all test files"
 task :test_cleanup do

cli/Gemfile

@@ -8,13 +8,14 @@ unless ENV['PKG']
   gem "compass-core", :path => "../core" unless defined?(CI)
   gem "compass-import-once", :path => "../import-once" unless defined?(CI)
   gem 'sass-globbing', "~> 1.1.1"
+  gem "compass-sprites", :path => "../sprites" unless defined?(CI)
   gem "cucumber", "~> 1.2.1"
   gem "rspec", "~> 2.0.0"
   gem "compass-validator", "3.0.1"
   gem "css_parser", "~> 1.0.1"
   gem "rubyzip", "0.9.9"
-  gem 'mocha', '0.11.4'
   gem 'minitest', '2.12.1'
+  gem "mocha", "~> 0.14.0", :require => false
   gem 'diff-lcs', '~> 1.1.2'
   gem 'rake'
   gem 'json', '~> 1.7.7', :platforms => :ruby_18

cli/compass.gemspec

@@ -17,7 +17,6 @@ Gem::Specification.new do |gemspec|
   gemspec.add_dependency 'sass', '>= 3.3.13', '< 3.5'
   gemspec.add_dependency 'compass-core', "~> #{File.read(File.join(File.dirname(__FILE__),"..","core","VERSION")).strip}"
   gemspec.add_dependency 'compass-import-once', "~> #{File.read(File.join(File.dirname(__FILE__),"..","import-once","VERSION")).strip}"
-  gemspec.add_dependency 'chunky_png', '~> 1.2'
   gemspec.add_dependency 'rb-fsevent', '>= 0.9.3'
   gemspec.add_dependency 'rb-inotify', '>= 0.9'
 

cli/features/step_definitions/command_line_steps.rb

@@ -4,9 +4,9 @@
 require 'test_helper'
 
 require 'compass/exec'
-include Compass::TestCaseHelper
-include Compass::CommandLineHelper
-include Compass::IoHelper
+include Compass::Test::TestCaseHelper
+include Compass::Test::CommandLineHelper
+include Compass::Test::IoHelper
 
 Before do
   Compass.reset_configuration!

cli/gemfiles/listen_2.gemfile

@@ -6,6 +6,7 @@ gem 'sass', '~> 3.3.12'
 gem 'compass', :path => "../"
 gem 'compass-core', :path => "../../core"
 gem 'compass-import-once', :path => "../../import-once"
+gem 'compass-sprites', :path=> '../../sprites'
 gem 'listen', '~> 2.7.1'
 
 gemspec :path=>"../"

cli/gemfiles/sass_3_3.gemfile

@@ -6,5 +6,6 @@ gem 'sass', "~> 3.3.12"
 gem 'compass', :path => "../"
 gem 'compass-core', :path => "../../core"
 gem 'compass-import-once', :path => "../../import-once"
+gem "compass-sprites", :path => "../../sprites"
 
 gemspec :path=>"../"

cli/lib/compass.rb

@@ -34,7 +34,6 @@ def lib_directory
    app_integration
    compiler
    sass_compiler
-   sprite_importer
 ).each do |lib|
   require "compass/#{lib}"
 end

cli/lib/compass/commands/base.rb

@@ -1,10 +1,26 @@
 module Compass
   module Commands
     class Base
+
+      @callbacks = {}
+
       def self.register(command_name)
         Compass::Commands[command_name] = self
       end
 
+      def self.register_callback(event, &block)
+        @callbacks[event] ||= []
+        @callbacks[event] << block
+      end
+
+      def self.run_callback(event)
+        if @callbacks.has_key?(event)
+          @callbacks[event].each do |callback|
+            callback.call(self)
+          end
+        end
+      end
+
       include Actions
 
       attr_accessor :working_path, :options
@@ -13,7 +29,7 @@ def initialize(working_path, options)
         self.working_path = working_path.to_s
         self.options = options
       end
-      
+
       def execute
         perform
       end

cli/lib/compass/commands/clean_project.rb

@@ -30,8 +30,12 @@ def initialize(working_path, options)
       def perform
         compiler = new_compiler_instance
         compiler.clean!
-        Compass::SpriteImporter.find_all_sprite_map_files(Compass.configuration.generated_images_path).each do |sprite|
-          remove sprite
+        # if compass sprites is loaded clean those
+        # todo: the cli interface should emmit some kinda events so addons can attach there cleanup
+        if defined?(Compass::Sprites::Importer)
+          Compass::Sprites::Importer.find_all_sprite_map_files(Compass.configuration.generated_images_path).each do |sprite|
+            remove sprite
+          end
         end
       end
 

cli/lib/compass/commands/sprite.rb

@@ -39,11 +39,10 @@ def initialize(working_path, options)
 
       def perform
         relative_uri = options[:uri].gsub(/^#{Compass.configuration.images_dir}\//, '')
-        name = Compass::SpriteImporter.sprite_name(relative_uri)
-        sprites = Compass::SpriteImporter.new
+        name = Compass::Sprites::Importer.sprite_name(relative_uri)
         options[:output_file] ||= File.join(Compass.configuration.sass_path, "sprites", "_#{name}.#{Compass.configuration.preferred_syntax}")
         options[:skip_overrides] ||= false
-        contents = Compass::SpriteImporter.content_for_images(relative_uri, name, options[:skip_overrides])
+        contents = Compass::Sprites::Importer.content_for_images(relative_uri, name, options[:skip_overrides])
         if options[:output_file][-4..-1] != "scss"
           contents = Sass::Engine.new(contents, Compass.sass_engine_options.merge(:syntax => :scss)).to_tree.to_sass
         end

cli/lib/compass/sass_extensions.rb

@@ -2,8 +2,4 @@
   raise LoadError, "It looks like you've got an incompatible version of Sass. This often happens when you have an old haml gem installed. Please upgrade Haml to v3.1 or above."
 end
 
-module Compass::SassExtensions
-end
-
 require 'compass/sass_extensions/functions'
-require 'compass/sass_extensions/sprites'

cli/lib/compass/sass_extensions/functions.rb

@@ -5,11 +5,3 @@ def declare(*args)
     end
   end
 end
-
-%w(sprites).each do |func|
-  require "compass/sass_extensions/functions/#{func}"
-end
-
-module Sass::Script::Functions
-  include Compass::SassExtensions::Functions::Sprites
-end

cli/test/fixtures/stylesheets/compass/config.rb

@@ -1,6 +1,7 @@
 # Require any additional compass plugins here.
 require 'true'
 require 'compass/import-once/activate'
+require 'compass/sprites'
 project_type = :stand_alone
 css_dir = "tmp"
 sass_dir = "sass"