github-migration/compass
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

centralize the config setup and parsing for commands.

Browse Source
This commit is contained in:
Chris Eppstein 2009-04-06 00:34:27 -07:00
parent c36f63fd92
commit 6c0a301d91
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/compass/commands/generate_grid_background.rb
View File

@ -12,9 +12,6 @@ module Compass
end end
def perform def perform
read_project_configuration
Compass.configuration.set_maybe(options)
Compass.configuration.set_defaults!
column_width, gutter_width = options[:grid_dimensions].split(/\+/).map{|d| d.to_i} column_width, gutter_width = options[:grid_dimensions].split(/\+/).map{|d| d.to_i}
unless GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :output_path => projectize(project_images_subdirectory), :working_path => self.working_path)).generate! unless GridBuilder.new(options.merge(:column_width => column_width, :gutter_width => gutter_width, :output_path => projectize(project_images_subdirectory), :working_path => self.working_path)).generate!
puts "ERROR: Some library dependencies appear to be missing." puts "ERROR: Some library dependencies appear to be missing."

3
lib/compass/commands/project_base.rb
View File

@ -13,6 +13,9 @@ module Compass
super(working_path, options) super(working_path, options)
self.project_name = determine_project_name(working_path, options) self.project_name = determine_project_name(working_path, options)
Compass.configuration.project_path = determine_project_directory(working_path, options) Compass.configuration.project_path = determine_project_directory(working_path, options)
read_project_configuration
Compass.configuration.set_maybe(options)
Compass.configuration.set_defaults!
end end
protected protected

3
lib/compass/commands/update_project.rb
View File

@ -11,9 +11,6 @@ module Compass
end end
def perform def perform
read_project_configuration
Compass.configuration.set_maybe(options)
Compass.configuration.set_defaults!
Compass::Compiler.new(working_path, Compass::Compiler.new(working_path,
projectize(Compass.configuration.sass_dir), projectize(Compass.configuration.sass_dir),
projectize(Compass.configuration.css_dir), projectize(Compass.configuration.css_dir),

3
lib/compass/commands/write_configuration.rb
View File

@ -10,9 +10,6 @@ module Compass
end end
def perform def perform
read_project_configuration
Compass.configuration.set_maybe(options)
Compass.configuration.set_defaults!
config_file = projectize("config.rb") config_file = projectize("config.rb")
if File.exists?(config_file) if File.exists?(config_file)
if options[:force] if options[:force]