compass-edge 0.9.3 → 0.9.4

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 3
+:patch: 4
 :build: 

data/features/command_line.feature

@@ -77,9 +77,8 @@ Feature: Command Line
   Scenario: Initializing a rails project
     Given I'm in a newly created rails project: my_rails_project
     When I initialize a project using: compass init rails --sass-dir app/stylesheets --css-dir public/stylesheets/compiled
-    Then a config file config/compass.config is reported created
-    Then a config file config/compass.config is created
-    And a ruby file config/compass.config is created
+    Then a config file config/compass.rb is reported created
+    Then a config file config/compass.rb is created
     And a sass file config/initializers/compass.rb is created
     And a sass file app/stylesheets/screen.sass is created
     And a sass file app/stylesheets/print.sass is created
@@ -130,16 +129,23 @@ Feature: Command Line
     And an image file images/buttons/tick.png is created
     And a css file tmp/buttons.css is created
 
+  @now
   Scenario: Basic help
     When I run: compass help
-    Then I should be shown a list of available commands
-    And the list of commands should describe the compile command
-    And the list of commands should describe the create command
-    And the list of commands should describe the grid-img command
-    And the list of commands should describe the help command
-    And the list of commands should describe the init command
-    And the list of commands should describe the install command
-    And the list of commands should describe the version command
+    Then I should see the following "primary" commands:
+      | compile |
+      | create  |
+      | init    |
+      | watch   |
+    And I should see the following "other" commands:
+      | config      |
+      | grid-img    |
+      | help        |
+      | install     |
+      | interactive |
+      | stats       |
+      | validate    |
+      | version     |
 
   Scenario: Recompiling a project with no material changes
     Given I am using the existing project in test/fixtures/stylesheets/compass
@@ -193,6 +199,7 @@ Feature: Command Line
     And a png file assets/wide_grid.png is not created
 
   Scenario: Generate a compass configuration file
+    Given I should clean up the directory: config
     When I run: compass config config/compass.rb --sass-dir sass --css-dir assets/css
     Then a configuration file config/compass.rb is created
     And the following configuration properties are set in config/compass.rb:

data/features/extensions.feature

@@ -0,0 +1,20 @@
+Feature: Extensions
+  In order to have an open source ecosystem for stylesheets
+  As a compass user
+  I can install extensions that others have created
+  And I can create and publish my own extensions
+
+  Scenario: Extensions directory for stand_alone projects
+    Given I am using the existing project in test/fixtures/stylesheets/compass
+    And the "extensions" directory exists
+    And and I have a fake extension at extensions/testing
+    When I run: compass --list-frameworks
+    Then the list of frameworks includes "testing"
+
+  Scenario: Extensions directory for rails projects
+    Given I'm in a newly created rails project: my_rails_project
+    And the "my_rails_project/vendor/plugins/compass/extensions" directory exists
+    And and I have a fake extension at my_rails_project/vendor/plugins/compass/extensions/testing
+    When I run: compass --list-frameworks
+    Then the list of frameworks includes "testing"
+

data/features/step_definitions/command_line_steps.rb

@@ -44,6 +44,10 @@ Given /^I'm in a newly created rails project: (.+)$/ do |project_name|
   end
 end
 
+Given /^I should clean up the directory: (\w+)$/ do |directory|
+  @cleanup_directories << directory
+end
+
 # When Actions are performed
 When /^I create a project using: compass create ([^\s]+) ?(.+)?$/ do |dir, args|
   @cleanup_directories << dir
@@ -160,8 +164,21 @@ Then /^I am told how to compile my sass stylesheets$/ do
   @last_result.should =~ /You must compile your sass stylesheets into CSS when they change.\nThis can be done in one of the following ways:/
 end
 
-Then /^I should be shown a list of available commands$/ do
-  @last_result.should =~ /^Available commands:$/
+Then /^I should be shown a list of "([^"]+)" commands$/ do |kind|
+  @last_result.should =~ /^#{kind.capitalize} Commands:$/
+  @last_command_list = []
+  found = false
+  indent = nil
+  @last_result.split("\n").each do |line|
+    if line =~ /^#{kind.capitalize} Commands:$/
+      found = true
+    elsif found && line =~ /^\s+/
+      @last_command_list << line
+    elsif found && line =~ /^$|^\w/
+      break
+    end
+  end
+
 end
 
 Then /^the list of commands should describe the ([^ ]+) command$/ do |command|
@@ -196,4 +213,11 @@ Then /^I am told statistics for each file:$/ do |table|
   end
 end
 
+Then /^I should see the following "([^"]+)" commands:$/ do |kind, table|
+
 
+  Then %Q{I should be shown a list of "#{kind}" commands}
+
+  commands = @last_command_list.map{|c| c =~ /^\s+\* ([^ ]+)\s+- [A-Z].+$/; [$1]}
+  table.diff!(commands)
+end

data/features/step_definitions/extension_steps.rb

@@ -0,0 +1,13 @@
+Given /^the "([^\"]*)" directory exists$/ do |directory|
+  FileUtils.mkdir_p directory
+end
+
+Given /^and I have a fake extension at (.*)$/ do |directory|
+  FileUtils.mkdir_p File.join(directory, 'stylesheets')
+  FileUtils.mkdir_p File.join(directory, 'templates/project')
+end
+
+Then /^the list of frameworks includes "([^\"]*)"$/ do |framework|
+  @last_result.split("\n").map{|f| f.strip}.should include(framework)
+end
+

data/lib/compass/app_integration.rb

@@ -1,3 +1,24 @@
 %w(stand_alone rails merb).each do |lib|
   require "compass/app_integration/#{lib}"
 end
+
+module Compass
+  module AppIntegration
+    module Helpers
+      def lookup(project_type)
+        eval "Compass::AppIntegration::#{camelize(project_type)}"
+      rescue NameError
+        raise Compass::Error, "No application integration exists for #{project_type}"
+      end
+
+      protected
+
+      # Stolen from ActiveSupport
+      def camelize(s)
+        s.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+      end
+
+    end
+    extend Helpers
+  end
+end

data/lib/compass/app_integration/rails.rb

@@ -5,4 +5,22 @@ end
 require 'compass/app_integration/rails/runtime' if defined?(ActionController::Base)
 
 
+module Compass
+  module AppIntegration
+    module Rails
+
+      extend self
+
+      def installer(*args)
+        Installer.new(*args)
+      end
+
+      def configuration
+        Compass::Configuration::Data.new('rails').
+          extend(ConfigurationDefaults)
+      end
+
+    end
+  end
+end
 

data/lib/compass/app_integration/rails/configuration_defaults.rb

@@ -3,6 +3,10 @@ module Compass
     module Rails
       module ConfigurationDefaults
 
+        def default_project_type
+          :rails
+        end
+
         def default_images_dir
           File.join("public", "images")
         end
@@ -23,6 +27,10 @@ module Compass
           "/stylesheets"
         end
 
+        def default_extensions_dir
+          "vendor/plugins/compass/extensions"
+        end
+
       end
     end
   end

data/lib/compass/app_integration/rails/installer.rb

@@ -10,10 +10,6 @@ module Compass
     module Rails    
       class Installer < Compass::Installers::ManifestInstaller
 
-        def default_configuration
-          Compass::Configuration::Data.new.extend(ConfigurationDefaults)
-        end
-
         def completed_configuration
           config = {}
           config[:sass_dir] = prompt_sass_dir unless sass_dir_without_default
@@ -22,8 +18,10 @@ module Compass
         end
 
         def write_configuration_files(config_file = nil)
-          config_file ||= targetize('config/compass.config')
+          config_file ||= targetize('config/compass.rb')
+          directory File.dirname(config_file)
           write_file config_file, config_contents
+          directory File.dirname(targetize('config/initializers/compass.rb'))
           write_file targetize('config/initializers/compass.rb'), initializer_contents
         end
 

data/lib/compass/app_integration/stand_alone.rb

@@ -1,3 +1,22 @@
 %w(configuration_defaults installer).each do |lib|
   require "compass/app_integration/stand_alone/#{lib}"
-end
+end
+
+module Compass
+  module AppIntegration
+    module StandAlone
+
+      extend self
+
+      def installer(*args)
+        Installer.new(*args)
+      end
+
+      def configuration
+        Compass::Configuration::Data.new('stand_alone').
+          extend(ConfigurationDefaults)
+      end
+
+    end
+  end
+end

data/lib/compass/app_integration/stand_alone/configuration_defaults.rb

@@ -2,6 +2,10 @@ module Compass
   module AppIntegration
     module StandAlone
       module ConfigurationDefaults
+        def default_project_type
+          :stand_alone
+        end
+
         def sass_dir_without_default
           "src"
         end
@@ -21,4 +25,4 @@ module Compass
 
     end
   end
-end
+end

data/lib/compass/app_integration/stand_alone/installer.rb

@@ -35,10 +35,6 @@ module Compass
           write_configuration_files unless config_files_exist? || !@manifest.generate_config?
         end
 
-        def default_configuration
-          Compass::Configuration::Data.new.extend(Compass::AppIntegration::StandAlone::ConfigurationDefaults)
-        end
-
         def completed_configuration
           nil
         end

data/lib/compass/commands.rb

@@ -6,6 +6,6 @@ require 'compass/commands/registry'
 %w(base generate_grid_background help list_frameworks project_base
    update_project watch_project create_project installer_command
    print_version project_stats stamp_pattern validate_project
-   write_configuration).each do |lib|
+   write_configuration interactive).each do |lib|
   require "compass/commands/#{lib}"
 end

data/lib/compass/commands/create_project.rb

@@ -68,6 +68,8 @@ module Compass
           end
         end
 
+        def primary; true; end
+
         def parse!(arguments)
           parser = option_parser(arguments)
           parse_options!(parser, arguments)

data/lib/compass/commands/generate_grid_background.rb

@@ -66,7 +66,7 @@ Options:
       def initialize(working_path, options)
         super
         assert_project_directory_exists!
-        Compass.add_configuration(options)
+        Compass.add_configuration(options, 'command_line')
       end
 
       def perform

data/lib/compass/commands/help.rb

@@ -11,16 +11,16 @@ Description:
 
 To get help on a particular command please specify the command.
 
-Available commands:
-
 }
-        Compass::Commands.all.sort_by{|c| c.to_s}.each do |command|
-          banner << "  * #{command}"
-          if Compass::Commands[command].respond_to? :description
-            banner << "\t- #{Compass::Commands[command].description(command)}"
-          end
-          banner << "\n"
+        
+        primary_commands = Compass::Commands.all.select do |c|
+          cmd = Compass::Commands[c]
+          cmd.respond_to?(:primary) && cmd.primary
         end
+        other_commands = Compass::Commands.all - primary_commands
+
+        banner << command_list("Primary Commands:", primary_commands)
+        banner << command_list("Other Commands:", other_commands)
  
         banner << "\nAvailable Frameworks & Patterns:\n\n"
         Compass::Frameworks::ALL.each do |framework|
@@ -38,6 +38,18 @@ Available commands:
 
         super
       end
+
+      def command_list(header, commands)
+        list = "#{header}\n"
+        commands.sort_by{|c| c.to_s}.each do |command|
+          list << "  * #{command}"
+          if Compass::Commands[command].respond_to? :description
+            list << "\t- #{Compass::Commands[command].description(command)}"
+          end
+          list << "\n"
+        end
+        list
+      end
     end
     class Help < Base
       register :help

data/lib/compass/commands/installer_command.rb

@@ -6,28 +6,28 @@ module Compass
       include Compass::Installers
 
       def configure!
-        Compass.add_configuration(installer.default_configuration)
-        Compass.add_project_configuration
-        Compass.add_configuration(options)
-        Compass.add_configuration(installer.completed_configuration)
+        if respond_to?(:is_project_creation?) && is_project_creation?
+          Compass.add_configuration(options.delete(:project_type) || :stand_alone)
+        else
+          Compass.add_project_configuration(:project_type => options.delete(:project_type))
+        end
+        Compass.add_configuration(options, 'command_line')
         if File.exists?(Compass.configuration.extensions_path)
           Compass::Frameworks.discover(Compass.configuration.extensions_path)
         end
+        Compass.add_configuration(installer.completed_configuration, 'installer')
+      end
+
+      def app
+        @app ||= Compass::AppIntegration.lookup(Compass.configuration.project_type)
       end
 
       def installer
-        installer_class = if options[:bare]
-          "Compass::Installers::BareInstaller"
+        @installer ||= if options[:bare]
+          Compass::Installers::BareInstaller.new(*installer_args)
         else
-          project_type = options[:project_type] || Compass.configuration.project_type
-          "Compass::AppIntegration::#{camelize(project_type)}::Installer"
+          app.installer(*installer_args)
         end
-        @installer = eval("#{installer_class}.new *installer_args")
-      end
-
-      # Stolen from ActiveSupport
-      def camelize(s)
-        s.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
       end
 
       def installer_args

data/lib/compass/commands/interactive.rb

@@ -0,0 +1,61 @@
+
+require 'compass/commands/project_base'
+require 'compass/commands/update_project'
+
+module Compass
+  module Commands
+    module InteractiveOptionsParser
+      def set_options(opts)
+        opts.banner = %Q{
+          Usage: compass interactive [path/to/project] [options]
+
+          Description:
+            Interactively evaluate SassScript
+
+          Options:
+        }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n")
+
+        super
+      end
+    end
+    class Interactive < ProjectBase
+
+      register :interactive
+
+      def initialize(working_path, options)
+        super
+      end
+
+      def perform
+        require 'sass/repl'
+        Sass::Repl.new.run
+      end
+
+      class << self
+
+        def option_parser(arguments)
+          parser = Compass::Exec::CommandOptionParser.new(arguments)
+          parser.extend(Compass::Exec::GlobalOptionsParser)
+          parser.extend(Compass::Exec::ProjectOptionsParser)
+          parser.extend(InteractiveOptionsParser)
+        end
+
+        def usage
+          option_parser([]).to_s
+        end
+
+        def description(command)
+          "Interactively evaluate SassScript"
+        end
+
+        def parse!(arguments)
+          parser = option_parser(arguments)
+          parser.parse!
+          parser.options
+        end
+
+      end
+
+    end
+  end
+end