diff --git a/features/step_definitions/command_line_steps.rb b/features/step_definitions/command_line_steps.rb index cf92c8c1..c830a883 100644 --- a/features/step_definitions/command_line_steps.rb +++ b/features/step_definitions/command_line_steps.rb @@ -164,9 +164,12 @@ Then /^the list of commands should describe the ([^ ]+) command$/ do |command| @last_result.should =~ /^\s+\* #{command}\s+- [A-Z].+$/ end -Then /^the following configuration properties are set in config\/compass\.rb:$/ do |table| - # table is a Cucumber::Ast::Table - pending +Then /^the following configuration properties are set in ([^ ]+):$/ do |config_file, table| + + config = Compass::Configuration::Data.new_from_file(config_file) + table.hashes.each do |hash| + config.send(hash['property']).should == hash['value'] + end end Then /^my css is validated$/ do diff --git a/lib/compass/commands/write_configuration.rb b/lib/compass/commands/write_configuration.rb index 2aaefb69..1eb865aa 100644 --- a/lib/compass/commands/write_configuration.rb +++ b/lib/compass/commands/write_configuration.rb @@ -2,8 +2,29 @@ require 'compass/commands/project_base' module Compass module Commands + module ConfigurationOptionsParser + def set_options(opts) + opts.banner = %Q{ + Usage: compass config [path/to/config_file.rb] [options] + + Description: + Generate a configuration file for the options specified. + Compass will recognize configuration files in the + following locations relative to the project root: + * #{Compass::Configuration::Helpers::KNOWN_CONFIG_LOCATIONS.join(" + * ")} + Any other location, and you'll need to specify it when working with the command line tool using the -c option. + + Options: + }.strip.split("\n").map{|l| l.gsub(/^ {0,10}/,'')}.join("\n") + + super + end + end class WriteConfiguration < ProjectBase - + + register :config + include InstallerCommand def initialize(working_path, options) @@ -16,6 +37,7 @@ module Compass end def perform + directory projectize(File.dirname(options[:configuration_file])) installer.write_configuration_files(options[:configuration_file]) end @@ -27,6 +49,42 @@ module Compass false 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(ConfigurationOptionsParser) + end + + def usage + option_parser([]).to_s + end + + def description(command) + "Generate a configuration file for the provided command line options." + end + + def parse!(arguments) + parser = option_parser(arguments) + parser.parse! + parse_arguments!(parser, arguments) + parser.options + end + + def parse_arguments!(parser, arguments) + if arguments.size == 1 + parser.options[:configuration_file] = arguments.shift + elsif arguments.size == 0 + # default to the current directory. + else + raise Compass::Error, "Too many arguments were specified." + end + end + + end + end end -end \ No newline at end of file +end