lib/caramelize/cli.rb in caramelize-0.0.1 vs lib/caramelize/cli.rb in caramelize-0.0.2

- old
+ new

@@ -28,11 +28,11 @@ self.program_name = "caramelize" self.program_version = Caramelize::VERSION self.options = CmdParse::OptionParserWrapper.new do |opts| opts.separator "Global options:" - opts.on("--config DIR", "-d", String, "The config file (default: caramel.conf)") {|p| @directory = p} + opts.on("--config DIR", "-d", String, "The config file (default: caramel.rb)") {|p| @directory = p} opts.on("--verbose", "-v", "Print more output") { @verbosity = :verbose } opts.on("--quiet", "-q", "No output") { @verbosity = :quiet } end self.add_command(CmdParse::HelpCommand.new) self.add_command(CmdParse::VersionCommand.new) @@ -44,27 +44,14 @@ def detect_configuration_file(config_path = nil) possible_files = KNOWN_CONFIG_LOCATIONS possible_files.detect{|f| File.exists?(f)} end - # Utility method for sub-commands to create a default config file - def create_config - # TODO create dummy config - #if !defined?(@website) - #@config = Webgen::Website.new(@directory) do |config| - # config['logger.mask'] = @log_filter - #end - #end - #@config - end - # Utility method for sub-commands to transfer wiki contents def transfer_content - # TODO maybe move to mixin time_start = Time.now - # TODO outsource to config file = detect_configuration_file if file && File.exists?(file) instance_eval(File.read(file), file || '<eval>') original_wiki = input_wiki \ No newline at end of file