runner.rb in logi-0.1.1

- old
+ new

@@ -10,17 +10,19 @@
      ['-V, --verbose'    , ' Verbose mode (default)'],
      ['-q, --quiet'      , '   Quiet mode'          ],
      ['-h, --help'       , 'Print this message'     ],
      ['-v, --version'    , 'Print the version'      ],
      ['defaults:'        , ''                       ],
-     ['  root directory' , Logi::Config.  default_root_path],
-     ['  post directory' , Logi::Config.  default_post_path],
-     ['layout directory' , Logi::Config.default_layout_path],
-     ['output directory' , Logi::Config.default_output_path],
-     ['    post command' , Logi::Config.default_command    ],
+     ['  root directory' , Logi::Default.  default_root_path],
+     ['  post directory' , Logi::Default.  default_post_path],
+     ['layout directory' , Logi::Default.default_layout_path],
+     ['output directory' , Logi::Default.default_output_path],
+     ['    post command' , Logi::Default.default_command    ],
      ['     layout file' , Logi::Logger.strip_path(
-                             Logi::Config.default_layout)  ]]
+                             Logi::Default.default_layout)  ],
+     ['    example site' , Logi::Logger.strip_path(
+                             Logi::Default.example_directory)]]
   end
 
   def run argv=ARGV
     options = parse(argv)
     require 'logi' # lazily load logi since we might exit earlier
@@ -30,32 +32,32 @@
   def parse argv
     options = {}
     until argv.empty?
       case arg = argv.shift
       when /^-c/, '--color'
-        options[:nocolor] = false
+        ENV['LOGI_NOCOLOR'] = (options[:nocolor] = false).to_s
         parse_next(argv, arg)
 
       when /^-n/, '--no-color'
-        options[:nocolor] = true
+        ENV['LOGI_NOCOLOR'] = (options[:nocolor] = true).to_s
         parse_next(argv, arg)
 
       when /^-V/, '--verbose'
-        options[:quiet] = false
+        ENV['LOGI_QUIET'] = (options[:quiet] = false).to_s
         parse_next(argv, arg)
 
       when /^-q/, '--quiet'
-        options[:quiet] = true
+        ENV['LOGI_QUIET'] = (options[:quiet] = true).to_s
         parse_next(argv, arg)
 
       when /^-h/, '--help'
         puts(help)
         exit
 
       when /^-v/, '--version'
-        require 'rib/version'
-        puts(Rib::VERSION)
+        require 'logi/version'
+        puts(Logi::VERSION)
         exit
 
       else
         options[:root] = File.expand_path(arg)
       end
@@ -66,13 +68,13 @@
   def parse_next argv, arg
     argv.unshift("-#{arg[2..-1]}") if arg.size > 2
   end
 
   def help
-    require 'logi/config'
+    require 'logi/default'
     require 'logi/logger'
     optt = options.transpose
-    maxn = optt.first.map(&:size).max
+    maxn =  optt.first.map(&:size).max
     maxd = [optt.last .map(&:size).max, `tput cols`.to_i - maxn - 4].min
     "Usage: logi [OPTIONS] [PATH to logi root]\n" +
     options.map{ |(name, desc)|
       if name.end_with?(':')
         name