compass 0.13.alpha.12 → 1.0.0.alpha.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23e35f6d157c012711c85e217ed310335e604d88
-  data.tar.gz: 18fc508f4ac20c5b070fda945eb0686ffe81a934
+  metadata.gz: 04e3c18f1ded719f3aded13bbaed40ddcd3bc8b6
+  data.tar.gz: 00585ad11c78af8c0803595ee36dd47b3de97051
 SHA512:
-  metadata.gz: 9afbecbeb9aaba5db2804487353b2703e87f2003a99494d8c989071675f0c3689ac1b865020a9ef27396d793603547a25046f804b6913cdb035f7f7de0054705
-  data.tar.gz: b9af38337a3132a718f0f250d00a3de5c1b9a82feb1b7234a2c88b4f020f3355c4d34b9325f1669b70dd7a102b3595c41bfc0db6f48f87a9e022d555443509fa
+  metadata.gz: d1bbc7020fc15db67f7bba0788ddb790403ee7e70f2fa349632196e2b0a7ee9984a8f21f7ea0ad058e99da9381a5e9b2e8ddda77b84ee1e337d6d2a3d50bf530
+  data.tar.gz: 469768af9e50b6142e1c29f6776887941d1a4373ed8bdd9008e5fdd5e591cc0e46077cd950bd8b0a6c978af459309e1ac6bcc7e1916d738782d4f439de52ae46

data/Rakefile

@@ -1,9 +1,13 @@
 require 'rubygems'
+require 'rubygems/package_task'
+require 'rake/testtask'
+require 'fileutils'
+
+
 if ENV["PKG"]
   $: << File.expand_path(File.dirname(__FILE__))+"/lib"
 else
-  require 'bundler'
-  Bundler.setup
+  require 'bundler/setup'
 end
 
 unless ENV['CI']
@@ -14,17 +18,12 @@ end
 begin
   require 'rake/dsl_definition'
 rescue LoadError
-  #pass
+  # pass
 end
-require 'compass'
 
 # ----- Default: Testing ------
-
 task :default => [:test, :features]
 
-require 'rake/testtask'
-require 'fileutils'
-
 begin
   require 'cucumber'
   require 'cucumber/rake/task'
@@ -63,67 +62,6 @@ Rake::TestTask.new :integrations do |t|
   t.verbose = true
 end
 
-desc "Download the latest browser stats data."
-task :caniuse do
-  require 'uri'
-  require 'net/http'
-  require 'net/https'
-  uri = URI.parse("https://raw.github.com/Fyrd/caniuse/master/data.json")
-  https = Net::HTTP.new(uri.host,uri.port)
-  https.use_ssl = true
-  req = Net::HTTP::Get.new(uri.path)
-  res = https.request(req)
-  filename = File.join(File.dirname(__FILE__), "data", "caniuse.json")
-  open(filename, "wb") do |file|
-    file.write(res.body)
-  end
-  puts "#{filename} (#{res.body.size} bytes)"
-end
-
-desc "Compile Examples into HTML and CSS"
-task :examples do
-  linked_haml = "tests/haml"
-  if File.exists?(linked_haml) && !$:.include?(linked_haml + '/lib')
-    puts "[ using linked Haml ]"
-    $:.unshift linked_haml + '/lib'
-  end
-  require 'haml'
-  require 'sass'
-  require 'pathname'
-  require 'compass'
-  require 'compass/exec'
-  FileList['examples/*'].each do |example|
-    next unless File.directory?(example)
-    puts "\nCompiling #{example}"
-    puts "=" * "Compiling #{example}".length
-    Dir.chdir example do
-      load "bootstrap.rb" if File.exists?("bootstrap.rb")
-      Compass::Exec::SubCommandUI.new(%w(compile --force)).run!
-    end
-    # compile any haml templates to html
-    FileList["#{example}/**/*.haml"].each do |haml_file|
-      basename = haml_file[0..-6]
-      engine = Haml::Engine.new(open(haml_file).read, :filename => haml_file)
-      puts "     haml #{File.basename(basename)}"
-      output = open(basename,'w')
-      output.write(engine.render)
-      output.close
-    end
-  end
-end
-
-namespace :examples do
-  desc "clean up the example directories"
-  task :clean do
-    puts "Cleaning Examples"
-    Dir.glob('examples/*/clean.rb').each do |cleaner|
-      load cleaner
-    end
-  end
-end
-
-task "gemspec:generate" => "examples:clean"
-
 namespace :git do
   task :clean do
     sh "git", "clean", "-fdx"
@@ -164,24 +102,6 @@ rescue LoadError => e
   puts "WARNING: #{e}"
 end
 
-begin
-  require 'packager/rake_task'
-  require 'compass/version'
-  # Building a package:
-  # 1. Get packager installed and make sure your system is setup correctly according to their docs.
-  # 2. Make sure you are actually using a universal binary that has been nametooled.
-  # 3. PKG=1 OFFICIAL=1 rake packager:pkg
-  Packager::RakeTask.new(:pkg) do |t|
-    t.package_name = "Compass"
-    t.version = Compass::VERSION
-    t.domain = "compass-style.org"
-    t.bin_files = ["compass"]
-    t.resource_files = FileList["frameworks/**/*"] + ["VERSION.yml", "LICENSE.markdown"]
-  end
-rescue LoadError => e
-  puts "WARNING: #{e}"
-end
-
 namespace :test do
   debug = false
   desc "update test expectations if needed"
@@ -213,7 +133,7 @@ namespace :test do
         # check to see what's changed
         diff = %x[diff -r #{File.join(fixtures, EXPECTED, '')} #{File.join(fixtures, TMP, '')}]
         # ignore non-CSS files in css/
-        diff = diff.gsub(/^Only in .*\/css\/(.*)\:.*[^.css]/, '')
+        diff.gsub!(/^Only in .*\/css\/(.*)\:.*[^.]/, '')
         if diff.empty?
           puts "#{CHECKMARK}Cool! Looks like all the tests are up to date".colorize(:green)
         else
@@ -245,4 +165,56 @@ namespace :test do
       end
     end
   end
-end
+end
+
+# Release tasks
+gemspec_file = FileList['compass.gemspec'].first
+spec = eval(File.read(gemspec_file), binding, gemspec_file)
+
+def spec.bump!
+  segments = version.to_s.split(".")
+  segments[-1] = segments.last.succ
+  self.version = Gem::Version.new(segments.join("."))
+end
+
+# Set SAME_VERSION when moving to a new major version and you want to specify the new version
+# explicitly instead of bumping the current version.
+# E.g. rake build SAME_VERSION=true
+spec.bump! unless ENV["SAME_VERSION"]
+
+desc "Run tests and build compass-#{spec.version}.gem"
+task :build => [:default, :gem]
+
+desc "Make the prebuilt gem compass-#{spec.version}.gem public."
+task :publish => [:record_version, :push_gem, :tag]
+
+desc "Build & Publish version #{spec.version}" 
+task :release => [:build, :publish]
+
+Gem::PackageTask.new(spec) do |pkg|
+  pkg.need_zip = true
+  pkg.need_tar = true
+end
+
+desc "Record the new version in version control for posterity"
+task :record_version do
+  unless ENV["SAME_VERSION"]
+    open(FileList["VERSION"].first, "w") do |f|
+      f.write(spec.version.to_s)
+    end
+    sh "git add VERSION"
+    sh %Q{git commit -m "Bump version to #{spec.version}."}
+  end
+end
+
+desc "Tag the repo as #{spec.version} and push the code and tag."
+task :tag do
+  sh "git tag -a -m 'Version #{spec.version}' #{spec.version}"
+  sh "git push --tags origin #{`git rev-parse --abbrev-ref HEAD`}"
+end
+
+desc "Push compass-#{spec.version}.gem to the rubygems server"
+task :push_gem do
+  sh "gem push pkg/compass-#{spec.version}.gem"
+end
+

data/VERSION

@@ -0,0 +1 @@
+1.0.0.alpha.12

data/features/command_line.feature

@@ -159,7 +159,7 @@ Feature: Command Line
     Given I am using the existing project in test/fixtures/stylesheets/valid
     When I run: compass compile
     And I run in a separate process: compass watch 
-    And I wait 2 seconds
+    And I wait 3 seconds
     And I touch sass/simple.sass
     And I wait 2 seconds
     And I shutdown the other process

data/features/step_definitions/command_line_steps.rb

@@ -10,8 +10,6 @@ include Compass::IoHelper
 
 Before do
   Compass.reset_configuration!
-  Compass::Frameworks::ALL.clear
-  Compass::Frameworks.discover :defaults
   @cleanup_directories = []
   @original_working_directory = Dir.pwd
 end

data/lib/compass.rb

@@ -1,7 +1,17 @@
 module Compass
 end
 
-%w(dependencies util browser_support sass_extensions version errors quick_cache logger actions).each do |lib|
+%w(frameworks
+   core
+   dependencies
+   util
+   sass_extensions
+   version
+   errors
+   quick_cache
+   logger
+   actions
+).each do |lib|
   require "compass/#{lib}"
 end
 
@@ -29,6 +39,15 @@ module Compass
   extend QuickCache
 end
 
-%w(watcher configuration frameworks app_integration compiler caniuse).each do |lib|
+%w(watcher
+   configuration/adapters
+   configuration/comments
+   configuration/helpers
+   configuration/serialization
+   configuration/file_data
+   app_integration
+   compiler
+   sprite_importer
+).each do |lib|
   require "compass/#{lib}"
 end

data/lib/compass/commands.rb

@@ -10,3 +10,5 @@ require 'compass/commands/registry'
 ).each do |lib|
   require "compass/commands/#{lib}"
 end
+
+Compass.discover_extensions!

data/lib/compass/commands/print_version.rb

@@ -28,10 +28,6 @@ Options:
           self.options[:patch] = true
           self.options[:custom] = true
         end
-        opts.on("--revision", "Include the source control revision") do
-          self.options[:revision] = true
-          self.options[:custom] = true
-        end
       end
     end
 
@@ -79,14 +75,7 @@ Options:
           version = ""
           version << "#{Compass.version[:major]}" if options[:major]
           version << ".#{Compass.version[:minor]}" if options[:minor]
-          version << ".#{Compass.version[:teeny]}" if options[:patch]
-          if options[:revision]
-            if version.size > 0
-              version << " [#{Compass.version[:rev][0..6]}]"
-            else
-              version << Compass.version[:rev]
-            end
-          end
+          version << ".#{Compass.version[:patch]}" if options[:patch]
           puts version
         elsif options[:quiet]
           puts ::Compass.version[:string]

data/lib/compass/compiler.rb

@@ -19,6 +19,7 @@ module Compass
       self.sass_options[:compass] ||= {}
       self.sass_options[:compass][:logger] = self.logger
       self.sass_options[:compass][:environment] = Compass.configuration.environment
+      self.sass_options[:compass][:compiler_in_use] = true
       reset_staleness_checker!
     end
 

data/lib/compass/configuration/adapters.rb

@@ -79,5 +79,8 @@ module Compass
         load_paths
       end
     end
+    class Data
+      include Adapters
+    end
   end
 end

data/lib/compass/configuration/comments.rb

@@ -42,7 +42,7 @@ module Compass
       end
 
       def comment_for_preferred_syntax
-        if top_level.preferred_syntax == :scss && top_level.sass_dir
+        if top_level.preferred_syntax_without_default.nil? && top_level.sass_dir
           %Q{
 # If you prefer the indented syntax, you might want to regenerate this
 # project again passing --syntax sass, or you can uncomment this:
@@ -55,5 +55,8 @@ module Compass
         end
       end
     end
+    class Data
+      include Comments
+    end
   end
 end

data/lib/compass/configuration/helpers.rb

@@ -3,31 +3,6 @@ module Compass
     @callbacks_loaded = false
     # The helpers are available as methods on the Compass module. E.g. Compass.configuration
     module Helpers
-      def configuration
-        @configuration ||= default_configuration
-        if block_given?
-          yield @configuration
-        end
-        @configuration
-      end
-
-      def default_configuration
-        Data.new('defaults').extend(Defaults).extend(Comments)
-      end
-
-      def add_configuration(config, filename = nil)
-        return if config.nil?
-
-
-        data = configuration_for(config, filename)
-
-        # puts "New configuration: #{data.name}"
-        # puts caller.join("\n")
-        data.inherit_from!(configuration)
-        data.on_top!
-        @configuration = data
-      end
-
       def configuration_for(config, filename = nil, defaults = nil)
         if config.nil?
           nil
@@ -49,11 +24,6 @@ module Compass
         end
       end
 
-      # Support for testing.
-      def reset_configuration!
-        @configuration = nil
-      end
-
       def sass_plugin_configuration
         configuration.to_sass_plugin_options
       end
@@ -106,33 +76,7 @@ module Compass
           end
           add_configuration(data)
         else
-          add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)  
-        end
-      end
-
-      def discover_extensions!
-        Compass.shared_extension_paths.each do |extensions_path|
-          if File.directory?(extensions_path)
-            Compass::Frameworks.discover(extensions_path)
-          end
-        end
-        if File.directory?(configuration.extensions_path)
-          Compass::Frameworks.discover(configuration.extensions_path)
-        end
-      end
-
-      # Returns a full path to the relative path to the project directory
-      def projectize(path, project_path = nil)
-        project_path ||= configuration.project_path
-        File.join(project_path, *path.split('/'))
-      end
-
-      def deprojectize(path, project_path = nil)
-        project_path ||= configuration.project_path
-        if path[0..(project_path.size - 1)] == project_path
-          path[(project_path.size + 1)..-1]
-        else
-          path
+          add_configuration(options[:project_type] || configuration.project_type_without_default || (yield if block_given?) || :stand_alone)
         end
       end
 
@@ -158,5 +102,4 @@ module Compass
   end
 
   extend Configuration::Helpers
-  
 end

data/lib/compass/configuration/serialization.rb

@@ -84,5 +84,8 @@ module Compass
       end
 
     end
+    class Data
+      include Serialization
+    end
   end
 end

data/lib/compass/errors.rb

@@ -1,7 +1,5 @@
+require 'compass/error'
 module Compass
-  class Error < StandardError
-  end
-
   class FilesystemConflict < Error
   end
 

data/lib/compass/frameworks.rb

@@ -3,7 +3,6 @@ module Compass
     extend self
 
     ALL = []
-    DEFAULT_FRAMEWORKS_PATH = File.join(Compass.base_directory, 'frameworks')
 
     class Framework
       attr_accessor :name
@@ -56,7 +55,10 @@ module Compass
     end
 
     def discover(frameworks_directory)
-      frameworks_directory = DEFAULT_FRAMEWORKS_PATH if frameworks_directory == :defaults
+      if frameworks_directory == :defaults
+        warn("The :defaults argument to Compass::Frameworks.discover is no longer necessary")
+        return
+      end
       frameworks_directory = Dir.new(frameworks_directory) unless frameworks_directory.is_a?(Dir)
       dirs = frameworks_directory.entries.reject{|e| e =~ /^\./}.sort_by{|n| n =~ /^_/ ? n[1..-1] : n}
       dirs.each do |framework|
@@ -128,6 +130,26 @@ module Compass
       result
     end
   end
-end
 
-Compass::Frameworks.discover(:defaults)
+  class << self
+    def discover_gem_extensions!
+      if defined?(Gem)
+        Gem.find_files("compass-*").map{|f| File.basename(f, ".rb")}.each do |compass_extension|
+          require compass_extension
+        end
+      end
+    end
+
+    def discover_extensions!
+      Compass.shared_extension_paths.each do |extensions_path|
+        if File.directory?(extensions_path)
+          Compass::Frameworks.discover(extensions_path)
+        end
+      end
+      if File.directory?(configuration.extensions_path)
+        Compass::Frameworks.discover(configuration.extensions_path)
+      end
+      discover_gem_extensions!
+    end
+  end
+end