standardize on string-named options

This commit is contained in:
Andre Arko 2011-07-26 21:25:48 -07:00
parent 9b00ec1a13
commit 40b3444e71

View file

@ -14,10 +14,10 @@ module Middleman
desc "init NAME", "Create new Middleman project directory NAME" desc "init NAME", "Create new Middleman project directory NAME"
available_templates = Middleman::Templates.registered_names.join(", ") available_templates = Middleman::Templates.registered_names.join(", ")
method_option :template, :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}" method_option "template", :aliases => "-T", :default => "default", :desc => "Optionally use a pre-defined project template: #{available_templates}"
method_option :css_dir, :default => "stylesheets", :desc => 'The path to the css files' method_option "css_dir", :default => "stylesheets", :desc => 'The path to the css files'
method_option :js_dir, :default => "javascripts", :desc => 'The path to the javascript files' method_option "js_dir", :default => "javascripts", :desc => 'The path to the javascript files'
method_option :images_dir, :default => "images", :desc => 'The path to the image files' method_option "images_dir", :default => "images", :desc => 'The path to the image files'
def init(name) def init(name)
key = options[:template].to_sym key = options[:template].to_sym
key = :default unless Middleman::Templates.registered_templates.has_key?(key) key = :default unless Middleman::Templates.registered_templates.has_key?(key)
@ -37,7 +37,7 @@ module Middleman
end end
desc "build", "Builds the static site for deployment" desc "build", "Builds the static site for deployment"
method_option :relative, :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls' method_option "relative", :type => :boolean, :aliases => "-r", :default => false, :desc => 'Override the config.rb file and force relative urls'
def build def build
ENV['MM_ENV'] = "build" ENV['MM_ENV'] = "build"
Middleman::Builder.start Middleman::Builder.start