lib/awestruct/cli/invoker.rb in awestruct-0.5.4.beta1 vs lib/awestruct/cli/invoker.rb in awestruct-0.5.4.rc

@@ -1,15 +1,9 @@
-require 'awestruct/cli/options'
-
-require 'awestruct/cli/init'
-require 'awestruct/cli/generate'
-require 'awestruct/cli/auto'
-require 'awestruct/cli/server'
-require 'awestruct/logger'
-
 require 'pathname'
 require 'logger'
+require 'awestruct/logger'
+require 'awestruct/cli/options'
 
 module Awestruct
   module CLI
     class Invoker
 
@@ -32,10 +26,16 @@
         logging_path = Pathname.new '.awestruct'
         logging_path.mkdir unless logging_path.exist?
         $LOG = Logger.new(Awestruct::AwestructLoggerMultiIO.new(@options.verbose, STDOUT, File.open('.awestruct/debug.log', 'w')))
         $LOG.level = @options.verbose ? Logger::DEBUG : Logger::INFO
         $LOG.formatter = Awestruct::AwestructLogFormatter.new
+
+        # these requires are deferred until after $LOG is set
+        require 'awestruct/cli/init'
+        require 'awestruct/cli/generate'
+        require 'awestruct/cli/auto'
+        require 'awestruct/cli/server'
       end
 
       def invoke!
         load_profile() unless ( options.init )
 
@@ -98,11 +98,12 @@
         FileUtils.rm_rf( File.join( config.dir, '.awestruct', 'dependency-cache' ) )
         FileUtils.rm_rf( config.output_dir )
       end
 
       def invoke_generate()
-        @success = Awestruct::CLI::Generate.new( config, options.profile, options.base_url, 'http://localhost:4242', options.force ).run
+        base_url = profile['base_url'] || options.base_url
+        @success = Awestruct::CLI::Generate.new( config, options.profile, base_url, Options::DEFAULT_BASE_URL, options.force ).run
       end
 
       def invoke_deploy()
         require 'awestruct/cli/deploy'
 
@@ -119,10 +120,10 @@
       def invoke_auto()
         Awestruct::CLI::Auto.new( config ).run
       end
 
       def invoke_server()
-        run_in_thread( Awestruct::CLI::Server.new( './_site', options.bind_addr, options.port ) )
+        run_in_thread( Awestruct::CLI::Server.new( options.output_dir, options.bind_addr, options.port ) )
       end
 
 
       private