diff --git a/lib/awestruct/cli/init.rb b/lib/awestruct/cli/init.rb index 2d0c9844..d429d7eb 100644 --- a/lib/awestruct/cli/init.rb +++ b/lib/awestruct/cli/init.rb @@ -22,7 +22,7 @@ def self.framework_path(path, framework = nil) mkdir('stylesheets') } - def initialize(opts = Awestruct::CLI::Options.new, framework = 'compass', scaffold = true) + def initialize(dir = Dir.pwd, framework = 'compass', scaffold = true) @dir = dir @framework = framework @scaffold = scaffold diff --git a/lib/awestruct/cli/invoker.rb b/lib/awestruct/cli/invoker.rb index edb2317a..9db3eac3 100644 --- a/lib/awestruct/cli/invoker.rb +++ b/lib/awestruct/cli/invoker.rb @@ -1,13 +1,7 @@ -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 @@ -34,6 +28,12 @@ def initialize(*options) $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!