cli.rb in caramelize-0.1.0

- old
+ new

@@ -1,5 +1,6 @@
+#Encoding: UTF-8
 require 'cmdparse'
 require 'caramelize/version'
 
 module Caramelize
   autoload :ContentTransferer, 'caramelize/content_transferer'
@@ -13,27 +14,22 @@
     # This is the command parser class used for handling the webgen command line interface. After
     # creating an instance, the inherited #parse method can be used for parsing the command line
     # arguments and executing the requested command.
     class CommandParser < CmdParse::CommandParser
 
-      # The website directory. Default: the current working directory.
-      attr_reader :directory
-
       # The verbosity level. Default: <tt>:normal</tt>
       attr_reader :verbosity
 
       # Create a new CommandParser class. T
       def initialize 
         super(true)
-        @directory = nil
         @verbosity = :normal
 
         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.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)
@@ -42,27 +38,28 @@
       KNOWN_CONFIG_LOCATIONS = ['config/caramel.rb', "config/caramel.config", "caramel.rb", "src/caramel.rb"]
 
       # Finds the configuration file, if it exists in a known location.
       def detect_configuration_file(config_path = nil)
         possible_files = KNOWN_CONFIG_LOCATIONS
+        possible_files << config_path if config_path
         possible_files.detect{|f| File.exists?(f)}
       end
       
       # Utility method for sub-commands to transfer wiki contents
-      def transfer_content
-        
+      def transfer_content config_file = ""
         time_start = Time.now
         
-        file = detect_configuration_file
+        file = detect_configuration_file config_file
+        puts "Read config file: #{file}" if @verbosity == :verbose
         if file && File.exists?(file)
           instance_eval(File.read(file), file || '<eval>')
           original_wiki = input_wiki
           
-          ContentTransferer.execute original_wiki, {:verbosity => @verbosity}
+          ContentTransferer.execute(original_wiki, {:verbosity => @verbosity})
           
           time_end = Time.now
           
-          puts "Time required: #{time_end - time_start} s" if @verbosity
+          puts "Time required: #{time_end - time_start} s" if @verbosity == :verbose
         else
           puts "No config file found."
         end
         
       end
\ No newline at end of file