slideshow 1.2.5 → 2.0.0

data/Manifest.txt

@@ -12,8 +12,9 @@ lib/slideshow/cli/commands/gen_templates.rb
 lib/slideshow/cli/commands/list.rb
 lib/slideshow/cli/commands/plugins.rb
 lib/slideshow/cli/commands/quick.rb
+lib/slideshow/cli/main.rb
+lib/slideshow/cli/main_utils.rb
 lib/slideshow/cli/opts.rb
-lib/slideshow/cli/runner.rb
 lib/slideshow/config.rb
 lib/slideshow/filters/debug_filter.rb
 lib/slideshow/filters/headers_filter.rb

data/Rakefile

@@ -10,7 +10,7 @@ Hoe.spec 'slideshow' do
 
   self.author  = 'Gerald Bauer'
   self.email   = 'webslideshow@googlegroups.com'
-  
+
   self.extra_deps = [
     ['props','>= 1.0.0'],
     ['markdown','>= 1.0.0'],
@@ -18,7 +18,8 @@ Hoe.spec 'slideshow' do
     ['pakman','>= 0.4.0'],
     ['activesupport', '>= 3.2.6'],
     ['RedCloth','>= 4.2.9'],
-    ['logutils','>=0.6.0']
+    ['logutils','>= 0.6.0'],
+    ['gli', '>= 2.5.6']
   ]
 
   # switch extension to .markdown for gihub formatting

data/bin/slideshow

@@ -3,3 +3,4 @@
 require 'slideshow'
 
 Slideshow.main
+

data/lib/slideshow.rb

@@ -50,7 +50,6 @@ require 'slideshow/plugin_helpers'
 require 'slideshow/slide'
 
 require 'slideshow/cli/opts'
-require 'slideshow/cli/runner'
 require 'slideshow/cli/commands/fetch'
 require 'slideshow/cli/commands/gen'
 require 'slideshow/cli/commands/gen_templates'
@@ -94,7 +93,7 @@ module Slideshow
   end
 
 
-  def self.main
+  def self.main_old
     
     # allow env variable to set RUBYOPT-style default command line options
     #   e.g. -o slides -t <your_template_manifest_here>
@@ -107,6 +106,12 @@ module Slideshow
     Runner.new.run(args)
   end
 
+  def self.main
+    require 'slideshow/cli/main'
+    ## Runner.new.run(ARGV) - old code
+  end
+
+
 end # module Slideshow
 
 # load built-in (optional) helpers/plugins/engines

data/lib/slideshow/cli/commands/fetch.rb

@@ -14,18 +14,13 @@ class Fetch
   attr_reader :opts, :config
 
 
-  def run
-    if opts.fetch_all?
-      config.default_fetch_shortcuts.keys.each do |shortcut|
-        fetch_pak( shortcut )
-      end
-    else
-      fetch_pak( opts.fetch_uri )
+  def fetch_all
+    config.default_fetch_shortcuts.keys.each do |shortcut|
+      fetch( shortcut )
     end
   end
 
-private
-  def fetch_pak( src )
+  def fetch( src )
     
     logger.debug "src=>#{src}<"
     

data/lib/slideshow/cli/main.rb

@@ -0,0 +1,267 @@
+# encoding: utf-8
+
+
+require 'gli'
+
+require 'slideshow/cli/main_utils'
+
+
+include GLI::App
+
+program_desc 'Slide Show (S9) - a free web alternative to PowerPoint and Keynote in Ruby'
+
+version Slideshow::VERSION
+
+
+## some setup code 
+
+LogUtils::Logger.root.level = :info   # set logging level to info 
+
+logger = LogUtils::Logger.root
+
+opts    = Slideshow::Opts.new
+config  = Slideshow::Config.new( opts )
+headers = Slideshow::Headers.new( config )  ##  NB: needed for build - move into build - why? why not?
+
+
+config.load
+
+
+## gets all merged in one paragraph - does not honor whitespace
+xxx_program_long_desc = <<EOS
+         
+Slide Show (S9) is a free web alternative to PowerPoint or Keynote in Ruby
+
+Examples:
+  slideshow microformats
+  slideshow microformats.text            # Process slides using Markdown (#{config.known_markdown_extnames.join(', ')})
+  slideshow microformats.textile         # Process slides using Textile (#{config.known_textile_extnames.join(', ')})
+  slideshow microformats.rst             # Process slides using reStructuredText (#{config.known_rest_extnames.join(', ')})
+  slideshow -o slides microformats       # Output slideshow to slides folder
+
+More examles:
+  slideshow -q                           # Generate quickstart slide show sample
+  slideshow -g                           # Generate slide show templates using built-in S6 pack
+
+  slideshow -l                           # List installed slide show templates
+  slideshow -f s5blank                   # Fetch (install) S5 blank starter template from internet
+  slideshow -t s5blank microformats      # Use your own slide show templates (e.g. s5blank)
+
+Further information:
+  http://slideshow-s9.github.io
+
+EOS
+
+
+## "global" options (switches/flags)
+
+desc '(Debug) Show debug messages'
+switch [:verbose], negatable: false    ## todo: use -w for short form? check ruby interpreter if in use too?
+
+desc 'Only show warnings, errors and fatal messages'
+switch [:q, :quiet], negatable: false
+
+
+desc 'Configuration Path'
+arg_name 'PATH'
+default_value opts.config_path
+flag [:c, :config] 
+
+
+desc 'Build slideshow'
+arg_name 'FILE', multiple: true   ## todo/fix: check multiple will not print typeo???
+command [:build, :b] do |c|
+
+  #  cmd.on( '--header NUM', 'Header Level (default is 1)' ) do |n|
+  #    opts.header_level = n.to_i
+  #  end
+
+
+  # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
+        
+  # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
+
+
+  c.desc 'Set Header Level to 1 (default)'
+  c.switch [:h1], negatable: false  # todo: add :1 if it works e.g. -1 why? why not??
+  
+  c.desc 'Set Header Level to 2'
+  c.switch [:h2], negatable: false
+
+  c.desc 'Use only !SLIDE for slide breaks (Showoff Compatible)'
+  c.switch [:slide], negatable: false
+
+  c.desc 'Allow // for slide breaks'
+  c.switch [:takahashi], negatable: false
+
+
+  c.desc 'Output Path'
+  c.arg_name 'PATH'
+  c.default_value opts.output_path
+  c.flag [:o,:output]
+
+  c.desc 'Template Manifest'
+  c.arg_name 'MANIFEST'
+  c.default_value opts.manifest
+  c.flag [:t, :template]
+
+
+  c.action do |g,o,args|
+    logger.debug 'hello from build command'
+    
+    PluginLoader.new( config ).load_plugins  # check for optional plugins/extension in ./lib folder
+
+    finder = FileFinder.new( config )
+
+    args.each do |arg|
+      files = finder.find_files( arg )
+      files.each do |file| 
+       ### fix/todo: reset/clean headers
+        Slideshow::Gen.new( opts, config, headers ).create_slideshow( file )
+      end
+    end
+ 
+  end
+end
+
+
+desc 'List installed template packs'
+command [:list,:ls,:l] do |c|
+
+  c.action do |g,o,args|
+    logger.debug 'hello from list command'
+    
+    Slideshow::List.new( opts, config ).run   ### todo: remove opts (merge access into config)
+  end
+end
+
+
+desc 'Install template pack'
+arg_name 'MANIFEST', multiple: true
+command [:install,:i] do |c|
+
+  c.desc "Template Packs (#{config.default_fetch_shortcuts.keys.join(', ')})"
+  c.switch [:a,:all], negatable: false
+
+  c.action do |g,o,args|
+    logger.debug 'hello from install command'
+    
+    if opts.fetch_all?
+      Slideshow::Fetch.new( opts, config ).fetch_all  ## todo: remove opts merge into config
+    end
+    
+    args.each do |arg|
+      Slideshow::Fetch.new( opts, config ).fetch( arg )  ## todo: remove opts merge into config
+    end
+  end
+end
+
+
+######
+# add command :g,:gen,:generate ??? why? why not?  better just git clone repos
+#  or use command copy?
+#
+#   cmd.on( '-g', '--generate',  'Generate Slide Show Templates (using built-in S6 Pack)' ) { opts.generate = true }
+#
+#  GenTemplates.new( opts, config ).run  ###  todo: remove opts
+
+
+desc 'Generate quick starter sample'
+command [:new,:n] do |c|
+
+  c.desc 'Output Path'
+  c.arg_name 'PATH'
+  c.default_value opts.output_path
+  c.flag [:o,:output]
+
+  c.desc 'Template Manifest'
+  c.arg_name 'MANIFEST'
+  c.default_value opts.quick_manifest
+  c.flag [:t, :template]
+
+
+  c.action do |g,o,args|
+    logger.debug 'hello from new command'
+
+    ##  use quick_manifest (default) otherwise pass along/use args
+    Slideshow::Quick.new( opts, config ).run  ### todo: remove opts
+
+  end
+end
+
+desc '(Debug) Show more version info'
+skips_pre
+command [:about,:a] do |c|
+  c.action do
+    logger.debug 'hello from about command'
+
+    SysInfo.new( config ).dump
+  end
+end
+
+desc '(Debug) List plugin scripts in load path'
+command [:plugins,:plugin,:p] do |c|
+  c.action do
+    logger.debug 'hello from plugin command'
+
+    Slideshow::Plugins.new( opts, config ).run  ### todo: remove opts (merge access into config)
+  end
+end
+
+desc '(Debug) Show global options, options, arguments for test command'
+command :test do |c|
+  c.action do |g,o,args|
+    puts 'hello from test command'
+    puts 'g/global_options:'
+    pp g
+    puts 'o/options:'
+    pp o
+    puts 'args:'
+    pp args
+  end
+end
+
+
+
+pre do |g,c,o,args|
+  opts.merge_gli_options!( g )
+  opts.merge_gli_options!( o )
+
+  puts Slideshow.generator
+
+  if opts.verbose?
+    LogUtils::Logger.root.level = :debug
+
+    # dump Slideshow settings
+    config.dump
+    puts
+      
+    # dump Markdown settings
+    Markdown.dump
+    puts
+  end
+
+  logger.debug "   executing command #{c.name}"
+  true
+end
+
+post do |global,c,o,args|
+  logger.debug "   executed command #{c.name}"
+  true
+end
+
+
+on_error do |e|
+  puts
+  puts "*** error: #{e.message}"
+  puts
+
+  ## todo/fix: find a better way to print; just raise exception e.g. raise e  - why? why not??
+  ## puts e.backtrace.inspect  if opts.verbose?
+  raise e   if opts.verbose?
+
+  false # skip default error handling
+end
+
+
+exit run(ARGV)

data/lib/slideshow/cli/main_utils.rb

@@ -0,0 +1,106 @@
+# encoding: utf-8
+
+class PluginLoader
+  include LogUtils::Logging
+  include Slideshow::PluginHelper  # e.g. gets us load_plugins machinery
+
+  def initialize( config )
+    @config = config
+  end
+
+  attr_reader :config
+end
+
+
+class FileFinder
+  include LogUtils::Logging
+
+  def initialize( config )
+    @config = config
+  end
+  
+  attr_reader :config
+
+  def find_file_with_known_extension( fn )
+    dirname  = File.dirname( fn )
+    basename = File.basename( fn, '.*' )
+    extname  = File.extname( fn )
+    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+    config.known_extnames.each do |e|
+      newname = File.join( dirname, "#{basename}#{e}" )
+      logger.debug "File.exists? #{newname}"
+      return newname if File.exists?( newname )
+    end  # each extension (e)
+      
+    nil   # not found; return nil
+  end
+
+
+  def find_files( file_or_dir_or_pattern )
+    filtered_files = []
+ 
+    ## for now process/assume only single file
+    
+    ## (check for missing extension)
+    if File.exists?( file_or_dir_or_pattern )
+      file = file_or_dir_or_pattern
+      logger.debug "  adding file '#{file}'..."
+      filtered_files << file
+    else  # check for existing file w/ missing extension
+      file = find_file_with_known_extension( file_or_dir_or_pattern )
+      if file.nil?
+        puts "  skipping missing file '#{file_or_dir_or_pattern}{#{config.known_extnames.join(',')}}'..."
+      else
+        logger.debug "  adding file '#{file}'..."
+        filtered_files << file
+      end
+    end
+    
+    filtered_files 
+  end # method find_files
+end # class FileFinder
+
+
+class SysInfo
+  def initialize( config )
+    @config = config
+  end
+  
+  attr_reader :config
+  
+  def dump
+  puts <<EOS
+
+#{Slideshow.generator}
+
+Gems versions:
+  - pakman #{Pakman::VERSION}
+  - fetcher #{Fetcher::VERSION}
+  - markdown #{Markdown::VERSION}
+  - textutils #{TextUtils::VERSION}
+  - props #{Props::VERSION}
+
+        Env home: #{Env.home}
+Slideshow config: #{config.config_dir}
+ Slideshow cache: #{config.cache_dir}
+  Slideshow root: #{Slideshow.root}
+
+EOS
+
+  # dump Slideshow settings
+  config.dump
+  puts
+      
+  # dump Markdown settings
+  Markdown.dump
+  puts
+      
+  # todo:
+  # add verison for rubygems
+
+  ## todo: add more gem version info
+  #- redcloth
+  #- kramdown
+  end
+end # class SysInfo

data/lib/slideshow/cli/opts.rb

@@ -3,6 +3,27 @@ module Slideshow
 
 class Opts
 
+  def merge_gli_options!( options={} )
+    @header_level = 1   if options[:h1] == true
+    @header_level = 2   if options[:h2] == true
+    
+    @slide     = true   if options[:slide] == true
+    @takahashi = true   if options[:slide] == true
+    
+    @verbose = true     if options[:verbose] == true
+    
+    @fetch_all = true   if options[:all] == true
+    
+    @config_path = options[:config]    if options[:config].present?
+    @output_path = options[:output]    if options[:output].present?
+    
+    @manifest       =   options[:template]  if options[:template].present?
+    
+    ## NB: will use :template option too
+    @quick_manifest =   options[:template]  if options[:template].present?
+  end
+
+
   def header_level=(value)
     @header_level = value.to_i
   end
@@ -40,14 +61,6 @@ class Opts
   end
 
 
-  def quick=(boolean)
-    @quick = boolean
-  end
-
-  def quick?
-    return false if @quick.nil?   # default generate flag is false
-    @quick == true
-  end
 
   def quick_manifest=(value)
     @quick_manifest = value
@@ -58,33 +71,6 @@ class Opts
   end
 
 
-  def plugins=(boolean)
-    @plugins = boolean
-  end
-
-  def plugins?
-    return false if @plugins.nil?   # default generate flag is false
-    @plugins == true
-  end
-
-
-  def generate=(boolean)
-    @generate = boolean
-  end
-
-  def generate?
-    return false if @generate.nil?   # default generate flag is false
-    @generate == true
-  end
-  
-  def list=(boolean)
-    @list = boolean
-  end
-  
-  def list?
-    return false if @list.nil?  # default list flag is false
-    @list == true
-  end
 
   def fetch_all=(boolean)
     @fetch_all = boolean
@@ -95,17 +81,6 @@ class Opts
     @fetch_all == true
   end
 
-  def fetch_uri=(value)
-    @fetch_uri = value
-  end
-
-  def fetch_uri
-    @fetch_uri || '-fetch uri required-'
-  end
-  
-  def fetch?
-    @fetch_uri.nil? ? false : true
-  end
 
 
   def includes=(value)
@@ -120,7 +95,8 @@ class Opts
   def has_includes?
     @includes.nil? ? false : true
   end
-  
+
+
   def manifest=(value)
     @manifest = value
   end
@@ -128,7 +104,8 @@ class Opts
   def manifest
     @manifest || 's6'
   end
-  
+
+
   def config_path=(value)
     @config_path = value
   end
@@ -136,11 +113,11 @@ class Opts
   def config_path
     @config_path || File.join( Env.home, '.slideshow' )
   end
-    
+
   def output_path=(value)
     @output_path = value
   end
-  
+
   def output_path
     @output_path || '.'
   end

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.2.5'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slideshow
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &84536570 !ruby/object:Gem::Requirement
+  requirement: &82743930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84536570
+  version_requirements: *82743930
 - !ruby/object:Gem::Dependency
   name: markdown
-  requirement: &84536350 !ruby/object:Gem::Requirement
+  requirement: &82743710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *84536350
+  version_requirements: *82743710
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &84536130 !ruby/object:Gem::Requirement
+  requirement: &82743490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *84536130
+  version_requirements: *82743490
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &84535910 !ruby/object:Gem::Requirement
+  requirement: &82743270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *84535910
+  version_requirements: *82743270
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &84535700 !ruby/object:Gem::Requirement
+  requirement: &82743060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *84535700
+  version_requirements: *82743060
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &84535480 !ruby/object:Gem::Requirement
+  requirement: &82742840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *84535480
+  version_requirements: *82742840
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &84535260 !ruby/object:Gem::Requirement
+  requirement: &82742620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *84535260
+  version_requirements: *82742620
+- !ruby/object:Gem::Dependency
+  name: gli
+  requirement: &82758790 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.6
+  type: :runtime
+  prerelease: false
+  version_requirements: *82758790
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &84535040 !ruby/object:Gem::Requirement
+  requirement: &82758570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +109,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *84535040
+  version_requirements: *82758570
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &84534820 !ruby/object:Gem::Requirement
+  requirement: &82758350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,7 +120,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *84534820
+  version_requirements: *82758350
 description: ! "The Slide Show (S9) Ruby gem lets you create slide shows and author
   slides in plain text\r\nusing a wiki-style markup language that's easy-to-write
   and easy-to-read.\r\nThe Slide Show (S9) project also collects and welcomes themes
@@ -137,8 +148,9 @@ files:
 - lib/slideshow/cli/commands/list.rb
 - lib/slideshow/cli/commands/plugins.rb
 - lib/slideshow/cli/commands/quick.rb
+- lib/slideshow/cli/main.rb
+- lib/slideshow/cli/main_utils.rb
 - lib/slideshow/cli/opts.rb
-- lib/slideshow/cli/runner.rb
 - lib/slideshow/config.rb
 - lib/slideshow/filters/debug_filter.rb
 - lib/slideshow/filters/headers_filter.rb

data/lib/slideshow/cli/runner.rb

@@ -1,243 +0,0 @@
-module Slideshow
-
-class Runner
-
-  include LogUtils::Logging
-
-  include PluginHelper
-
-
-  def initialize
-    @opts    = Opts.new
-    @config  = Config.new( @opts )
-    @headers = Headers.new( @config )
-    
-    ## todo/fix: move into slideshow loader script - why? why not?
-    LogUtils::Logger.root.level = :info
-  end
-
-  attr_reader :opts, :config, :headers
-
-
-  def find_file_with_known_extension( fn )
-    dirname  = File.dirname( fn )
-    basename = File.basename( fn, '.*' )
-    extname  = File.extname( fn )
-    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-    config.known_extnames.each do |e|
-      newname = File.join( dirname, "#{basename}#{e}" )
-      logger.debug "File.exists? #{newname}"
-      return newname if File.exists?( newname )
-    end  # each extension (e)
-      
-    nil   # not found; return nil
-  end
-
-
-  def find_files( file_or_dir_or_pattern )
-    filtered_files = []
- 
-    ## for now process/assume only single file
-    
-    ## (check for missing extension)
-    if File.exists?( file_or_dir_or_pattern )
-      file = file_or_dir_or_pattern
-      logger.debug "  adding file '#{file}'..."
-      filtered_files << file
-    else  # check for existing file w/ missing extension
-      file = find_file_with_known_extension( file_or_dir_or_pattern )
-      if file.nil?
-        puts "  skipping missing file '#{file_or_dir_or_pattern}{#{config.known_extnames.join(',')}}'..."
-      else
-        logger.debug "  adding file '#{file}'..."
-        filtered_files << file
-      end
-    end
-    
-    filtered_files 
-  end # method find_files
-
-
-
-def run( args )
-
-  config.load
-
-  opt=OptionParser.new do |cmd|
-    
-    cmd.banner = "Usage: slideshow [options] name"
-        
-    cmd.on( '-o', '--output PATH', "Output Path (default is #{opts.output_path})" ) { |path| opts.output_path = path }
-    
-    cmd.on( "-t", "--template MANIFEST", "Template Manifest (default is #{opts.manifest})" ) do |t|
-      # todo: do some checks on passed in template argument
-      opts.manifest = t
-    end
-
-
-  #  cmd.on( '--header NUM', 'Header Level (default is 1)' ) do |n|
-  #    opts.header_level = n.to_i
-  #  end
-
-    cmd.on( '--h1', 'Set Header Level to 1 (default)' ) { opts.header_level = 1 }
-    cmd.on( '--h2', 'Set Header Level to 2' ) { opts.header_level = 2 }
-
-    cmd.on( '--slide', 'Use only !SLIDE for slide breaks (Showoff Compatible)' ) do
-      opts.slide = true
-    end
-
-    cmd.on( '--takahashi', 'Allow // for slide breaks' ) do
-      opts.takahashi = true
-    end
-
-
-    # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
-        
-    # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
-
-    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
-      opts.fetch_uri = uri
-    end
-
-    cmd.on( '--all', "Fetch Template Packs (#{config.default_fetch_shortcuts.keys.join(', ')})" ) do
-      opts.fetch_all = true
-    end
-
-    cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
-
-    cmd.on( '-c', '--config PATH', "Configuration Path (default is #{opts.config_path})" ) do |path|
-      opts.config_path = path
-    end
-
-    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (using built-in S6 Pack)' ) { opts.generate = true }
-    
-    ## fix:/todo: add generator for quickstart
-    cmd.on( '-q', '--quick [MANIFEST]', "Generate Quickstart Slide Show Sample (default is #{opts.quick_manifest})") do |q|
-       opts.quick = true
-       opts.quick_manifest = q   if q.nil? == false
-    end
-
-    cmd.on( '-v', '--version', "Show version" ) do
-      puts Slideshow.generator
-      exit
-    end
-    
- 
-    cmd.on( "-h", "--help", "Show this message" ) do
-         puts <<EOS
-         
-Slide Show (S9) is a free web alternative to PowerPoint or Keynote in Ruby
-
-#{cmd.help}
-
-Examples:
-  slideshow microformats
-  slideshow microformats.text            # Process slides using Markdown (#{config.known_markdown_extnames.join(', ')})
-  slideshow microformats.textile         # Process slides using Textile (#{config.known_textile_extnames.join(', ')})
-  slideshow microformats.rst             # Process slides using reStructuredText (#{config.known_rest_extnames.join(', ')})
-  slideshow -o slides microformats       # Output slideshow to slides folder
-
-More examles:
-  slideshow -q                           # Generate quickstart slide show sample
-  slideshow -g                           # Generate slide show templates using built-in S6 pack
-
-  slideshow -l                           # List installed slide show templates
-  slideshow -f s5blank                   # Fetch (install) S5 blank starter template from internet
-  slideshow -t s5blank microformats      # Use your own slide show templates (e.g. s5blank)
-
-Further information:
-  http://slideshow-s9.github.io
-
-EOS
-         exit
-    end
-    
-    cmd.on( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
-
-    cmd.on( '--about', "(Debug) Show more version info" ) do
-      puts <<EOS
-
-#{Slideshow.generator}
-
-Gems versions:
-  - pakman #{Pakman::VERSION}
-  - fetcher #{Fetcher::VERSION}
-  - markdown #{Markdown::VERSION}
-  - textutils #{TextUtils::VERSION}
-  - props #{Props::VERSION}
-
-        Env home: #{Env.home}
-Slideshow config: #{config.config_dir}
- Slideshow cache: #{config.cache_dir}
-  Slideshow root: #{Slideshow.root}
-
-EOS
-
-      # dump Slideshow settings
-      config.dump
-      puts
-      
-      # dump Markdown settings
-      Markdown.dump
-      puts
-      
-# todo:
-# add verison for rubygems
-
-## todo: add more gem version info
-#- redcloth
-#- kramdown
-
-      exit
-    end
-
-
-    cmd.on( "--verbose", "(Debug) Show debug trace" )  do
-       LogUtils::Logger.root.level = :debug
-       opts.verbose = true
-    end
-
-  end
-
-  opt.parse!( args )
-  
-  puts Slideshow.generator
-
-  if opts.verbose?
-    # dump Slideshow settings
-    config.dump
-    puts
-      
-    # dump Markdown settings
-    Markdown.dump
-    puts
-  end
-
-  if opts.list?
-    List.new( opts, config ).run   ### todo: remove opts (merge access into config)
-  elsif opts.plugins?
-    Plugins.new( opts, config ).run  ### todo: remove opts (merge access into config)
-  elsif opts.generate?
-    GenTemplates.new( opts, config ).run  ###  todo: remove opts
-  elsif opts.quick?
-    Quick.new( opts, config ).run  ### todo: remove opts
-  elsif opts.fetch? || opts.fetch_all?
-    Fetch.new( opts, config ).run  ### todo: remove opts
-  else
-    load_plugins  # check for optional plugins/extension in ./lib folder
-
-    args.each do |arg|
-      files = find_files( arg )
-      files.each do |file| 
-       ### fix/todo: reset/clean headers
-        Gen.new( opts, config, headers ).create_slideshow( file )
-      end
-    end
-  end
-end
-
-
-end # class Runner
-
-end # module Slideshow