lib/awestruct/config.rb in awestruct-0.5.4.rc3 vs lib/awestruct/config.rb in awestruct-0.5.4

@@ -17,32 +17,33 @@
 
     attr_accessor :images_dir
     attr_accessor :stylesheets_dir
 
     attr_accessor :verbose
+    attr_accessor :quiet
     attr_accessor :options
 
     def initialize(opts = Awestruct::CLI::Options.new)
-      @dir            = Pathname.new( opts.source_dir )
-      @layouts_dir    = Pathname.new( File.join(@dir, '_layouts') )
-      @config_dir     = Pathname.new( File.join(@dir, '_config') )
-      @input_dir      = Pathname.new( File.join(@dir, '') )
-      @output_dir     = Pathname.new( opts.output_dir )
-      @extension_dir  = Pathname.new( File.join(@dir, '_ext') )
-      @skin_dir       = Pathname.new( File.join(@dir, '_skin') )
-      @tmp_dir        = Pathname.new( File.join(@dir, '_tmp') )
-
+      @dir             = Pathname.new( opts.source_dir )
+      @layouts_dir     = Pathname.new( File.join(@dir, '_layouts') )
+      @config_dir      = Pathname.new( File.join(@dir, '_config') )
+      @input_dir       = @dir
+      @output_dir      = Pathname.new( opts.output_dir )
+      @extension_dir   = Pathname.new( File.join(@dir, '_ext') )
+      @skin_dir        = Pathname.new( File.join(@dir, '_skin') )
+      @tmp_dir         = Pathname.new( File.join(@dir, '_tmp') )
       @images_dir      = Pathname.new( File.join(@dir, 'images') )
       @stylesheets_dir = Pathname.new( File.join(@dir, 'stylesheets') )
+
       @options = opts
 
       # Dir[] doesn't like empty list
       ignore_file = File.join(@dir, ".awestruct_ignore")
       if File.exists?(ignore_file)
         ignore_stmts = IO.read(ignore_file).each_line.map(&:strip)
       end
 
-      @ignore         = (!ignore_stmts.nil? and ignore_stmts.size > 0) ? Dir[*ignore_stmts] : []
+      @ignore = (!ignore_stmts.nil? and ignore_stmts.size > 0) ? Dir[*ignore_stmts] : []
 
       @track_dependencies = false
     end
 
   end