From 01277cd6ead81770d9619802bcce74a0e9e3e147 Mon Sep 17 00:00:00 2001 From: Chris Eppstein Date: Sun, 30 May 2010 12:08:56 -0700 Subject: [PATCH] [Command Line] Allow another configuration file to be used when creating a new project --- lib/compass/commands/installer_command.rb | 6 +----- lib/compass/commands/project_base.rb | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/compass/commands/installer_command.rb b/lib/compass/commands/installer_command.rb index 39298999..013653b1 100644 --- a/lib/compass/commands/installer_command.rb +++ b/lib/compass/commands/installer_command.rb @@ -6,11 +6,7 @@ module Compass include Compass::Installers def configure! - 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 + add_project_configuration Compass.add_configuration(options, 'command_line') Compass.discover_extensions! Compass.add_configuration(installer.completed_configuration, 'installer') diff --git a/lib/compass/commands/project_base.rb b/lib/compass/commands/project_base.rb index b9afab06..dbc792de 100644 --- a/lib/compass/commands/project_base.rb +++ b/lib/compass/commands/project_base.rb @@ -23,7 +23,7 @@ module Compass def configure! add_project_configuration - Compass.add_configuration(options, "cli") + Compass.add_configuration(options, "command_line") Compass.discover_extensions! end