slideshow 1.1.0 → 1.2.0.beta1

data/Manifest.txt

@@ -6,10 +6,12 @@ bin/slideshow
 config/slideshow.builtin.yml
 config/slideshow.yml
 lib/slideshow.rb
-lib/slideshow/commands/fetch.rb
-lib/slideshow/commands/gen.rb
-lib/slideshow/commands/gen_templates.rb
-lib/slideshow/commands/list.rb
+lib/slideshow/cli/commands/fetch.rb
+lib/slideshow/cli/commands/gen.rb
+lib/slideshow/cli/commands/gen_templates.rb
+lib/slideshow/cli/commands/list.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
@@ -28,12 +30,10 @@ lib/slideshow/helpers/syntax/sh_helper.rb
 lib/slideshow/helpers/syntax/uv_helper.rb
 lib/slideshow/helpers/table_helper.rb
 lib/slideshow/helpers/text_helper.rb
-lib/slideshow/manifest.rb
+lib/slideshow/manifest_helpers.rb
 lib/slideshow/markup/markdown.rb
 lib/slideshow/markup/rest.rb
 lib/slideshow/markup/textile.rb
-lib/slideshow/opts.rb
-lib/slideshow/runner.rb
 lib/slideshow/slide.rb
 lib/slideshow/version.rb
 templates/s6.txt

data/Rakefile

@@ -16,12 +16,10 @@ Hoe.spec 'slideshow' do
     ['RedCloth','>= 4.2.9'],
     ['markdown','>= 0.4.0'],
     ['textutils','>= 0.2.0'],
-    ['fetcher','>= 0.1.0'],
-    ['props','>= 0.2.0']
+    ['props','>= 0.2.0'],
+    ['pakman','>= 0.1.0']
   ]
-  
-  self.remote_rdoc_dir = 'doc'
-  
+    
   # switch extension to .rdoc for gihub formatting
   self.readme_file  = 'README.rdoc'
   self.history_file = 'History.rdoc'

data/lib/slideshow.rb

@@ -35,21 +35,22 @@ class Env
 end # class Env
 
 require 'textutils'     # text filters and helpers
+require 'pakman'        # template pack manager
 
 
 # our own code
 require 'slideshow/version'
-require 'slideshow/opts'
 require 'slideshow/headers'
 require 'slideshow/config'
-require 'slideshow/manifest'
+require 'slideshow/manifest_helpers'
 require 'slideshow/slide'
-require 'slideshow/runner'
 
-require 'slideshow/commands/fetch'
-require 'slideshow/commands/gen'
-require 'slideshow/commands/gen_templates'
-require 'slideshow/commands/list'
+require 'slideshow/cli/opts'
+require 'slideshow/cli/runner'
+require 'slideshow/cli/commands/fetch'
+require 'slideshow/cli/commands/gen'
+require 'slideshow/cli/commands/gen_templates'
+require 'slideshow/cli/commands/list'
 
 require 'slideshow/markup/textile'
 require 'slideshow/markup/markdown'

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

@@ -0,0 +1,53 @@
+module Slideshow
+
+class Fetch
+
+### fix: remove opts, use config (wrapped!!)
+  
+  def initialize( logger, opts, config )
+    @logger  = logger
+    @opts    = opts
+    @config  = config
+  end
+
+  attr_reader :logger, :opts, :config
+
+
+  def run
+    logger.debug "fetch_uri=#{opts.fetch_uri}"
+    
+    src = opts.fetch_uri
+    
+    ## check for builtin shortcut (assume no / or \) 
+    if src.index( '/' ).nil? && src.index( '\\' ).nil?
+      shortcut = src.clone
+      src = config.map_fetch_shortcut( src )
+      
+      if src.nil?
+        puts "** Error: No mapping found for fetch shortcut '#{shortcut}'."
+        return
+      end
+      puts "  Mapping fetch shortcut '#{shortcut}' to: #{src}"
+    end
+ 
+    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
+    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
+    uri = URI.parse( src )
+    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+    
+    basename = File.basename( uri.path, '.*' ) # e.g. fullerscreen     (without extension)
+    logger.debug "basename: #{basename}"  
+
+    pakpath = File.expand_path( "#{config.config_dir}/templates/#{basename}" )
+    logger.debug "pakpath: #{pakpath}"
+ 
+    ## note: code moved to its own gem, that is, pakman
+    ## see https://github.com/geraldb/pakman
+ 
+    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+  end # method run
+
+
+end # class Fetch
+
+end # module Slideshow

data/lib/slideshow/{commands → cli/commands}/gen.rb

@@ -1,8 +1,11 @@
 module Slideshow
 
+## fix:/todo: move generation code out of command into its own class
+##   not residing/depending on cli
+
 class Gen
 
-  include Manifest   # gets us methods like installed_template_manifests, etc.
+  include ManifestHelper
 
 ### fix: remove opts, use config (wrapped!!)
 
@@ -163,7 +166,7 @@ class Gen
     
     # check if file exists (if yes use custom template package!) - allows you to override builtin package with same name 
     if File.exists?( manifest_path_or_name )
-      manifest = load_manifest( manifest_path_or_name )
+      manifest = Pakman::Manifest.load_file( logger, manifest_path_or_name )
     else
       # check for builtin manifests
       manifests = installed_template_manifests
@@ -175,7 +178,7 @@ class Gen
         exit 2
       end
         
-      manifest = load_manifest( matches[0][1] )
+      manifest = Pakman::Manifest.load_file( logger, matches[0][1] )
     end
   
 
@@ -250,6 +253,9 @@ class Gen
   end
 
 
+  ###
+  ## fix: move code into Pakman::Gen/Generator or Templater
+
   #### fix/todo:
   ##
   ## check for .erb file extension for trigger for erb processing

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

@@ -0,0 +1,53 @@
+module Slideshow
+
+class GenTemplates
+
+
+### fix: remove opts, use config (wrapped!!)
+
+  def initialize( logger, opts, config )
+    @logger  = logger
+    @opts    = opts
+    @config  = config
+  end
+
+  attr_reader :logger, :opts, :config
+
+  def run
+    manifest_name = opts.manifest
+    logger.debug "manifest=#{manifest_name}"
+    
+    manifests = installed_generator_manifests
+    
+    # check for builtin generator manifests
+    matches = manifests.select { |m| m[0] == manifest_name+".gen" }
+    
+    if matches.empty?
+      puts "*** error: unknown template manifest '#{manifest_name}'"
+      # todo: list installed manifests
+      exit 2
+    end
+        
+    manifestsrc = matches[0][1]
+    pakpath     = opts.output_path
+    
+    Pakman::Copier.new( logger ).copy_pak( manifestsrc, pakpath )
+  end
+
+private
+
+  def installed_generator_manifests
+    # 1) search gem/templates 
+
+    builtin_patterns = [
+      "#{Slideshow.root}/templates/*.txt.gen"
+    ]
+
+    ## note: code moved to its own gem, that is, pakman
+    ## see https://github.com/geraldb/pakman
+
+    Pakman::Finder.new( logger ).find_manifests( builtin_patterns )
+  end
+
+end # class GenTemplates
+end # module Slideshow

data/lib/slideshow/{commands → cli/commands}/list.rb

@@ -2,7 +2,7 @@ module Slideshow
 
 class List
 
-  include Manifest   # gets us methods like installed_template_manifests, etc.
+  include ManifestHelper
 
 ### fix: remove opts, use config (wrapped!!)
   
@@ -14,19 +14,22 @@ class List
 
   attr_reader :logger, :opts, :config
 
-
   def run
     manifests = installed_template_manifests
     
     puts ''
-    puts 'Installed templates include:'
+    puts 'Installed template packs in search path'
+    
+    installed_template_manifest_patterns.each_with_index do |pattern,i|
+      puts "    [#{i+1}] #{pattern}"
+    end
+    puts '  include:'
     
     manifests.each do |manifest|
-      puts "  #{manifest[0]} (#{manifest[1]})"
+      puts "%16s (%s)" % [manifest[0], manifest[1]]
     end
   end
 
-
 end # class List
 
 end # class Slideshow

data/lib/slideshow/{opts.rb → cli/opts.rb}

@@ -68,9 +68,9 @@ class Opts
   def config_path=(value)
     @config_path = value
   end
-  
+    
   def config_path
-    @config_path
+    @config_path || File.join( Env.home, '.slideshow' )
   end
     
   def output_path=(value)

data/lib/slideshow/{runner.rb → cli/runner.rb}

@@ -14,25 +14,23 @@ class Runner
   attr_reader :logger, :opts, :config, :headers
 
 
-
-def load_plugins
-    
-  patterns = []
-  patterns << "#{config.config_dir}/lib/**/*.rb"
-  patterns << 'lib/**/*.rb' unless Slideshow.root == File.expand_path( '.' )  # don't include lib if we are in repo (don't include slideshow/lib)
+  def load_plugins
+    patterns = []
+    patterns << "#{config.config_dir}/lib/**/*.rb"
+    patterns << 'lib/**/*.rb' unless Slideshow.root == File.expand_path( '.' )  # don't include lib if we are in repo (don't include slideshow/lib)
   
-  patterns.each do |pattern|
-    pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
-    Dir.glob( pattern ) do |plugin|
-      begin
-        puts "Loading plugins in '#{plugin}'..."
-        require( plugin )
-      rescue Exception => e
-        puts "** error: failed loading plugins in '#{plugin}': #{e}"
+    patterns.each do |pattern|
+      pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
+      Dir.glob( pattern ) do |plugin|
+        begin
+          puts "Loading plugins in '#{plugin}'..."
+          require( plugin )
+        rescue Exception => e
+          puts "** error: failed loading plugins in '#{plugin}': #{e}"
+        end
       end
     end
-  end
-end
+  end  # method load_plugins
 
 
   def find_file_with_known_extension( fn )
@@ -52,7 +50,6 @@ end
 
 
   def find_files( file_or_dir_or_pattern )
-
     filtered_files = []
  
     ## for now process/assume only single file
@@ -72,21 +69,22 @@ end
       end
     end
     
-    filtered_files
-    
+    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' ) { |path| opts.output_path = path }
+    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 s6.txt)" ) do |t|
+    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
@@ -104,30 +102,32 @@ def run( args )
         
     # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
 
-    cmd.on( '-c', '--config PATH', 'Configuration Path (default is ~/.slideshow)' ) do |path|
-      opts.config_path = path
-    end
-
     cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
       opts.fetch_uri = uri
     end
 
-    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.generate = true }
-    
     cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
 
-    # todo: find different letter for debug trace switch (use v for version?)
-    cmd.on( "-v", "--verbose", "Show debug trace" )  do
-       logger.datetime_format = "%H:%H:%S"
-       logger.level = Logger::DEBUG
+    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', 'Generate Quickstart Slide Show Sample') {  }
     
-    ## todo: add --version
 
-    cmd.on( '--version', "Show version" ) do
+    cmd.on( '-v', '--version', "Show version" ) do
       puts Slideshow.generator
       exit
     end
+
+    cmd.on( "--verbose", "Show debug trace" )  do
+       logger.datetime_format = "%H:%H:%S"
+       logger.level = Logger::DEBUG
+    end
+    
  
     cmd.on_tail( "-h", "--help", "Show this message" ) do
          puts <<EOS
@@ -138,12 +138,13 @@ Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
 
 Examples:
   slideshow microformats
-  slideshow microformats.textile         # Process slides using Textile
-  slideshow microformats.text            # Process slides using Markdown
-  slideshow microformats.rst             # Process slides using reStructuredText
+  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
@@ -160,8 +161,6 @@ EOS
 
   opt.parse!( args )
   
-  config.load
-
   puts Slideshow.generator
 
   if opts.list?

data/lib/slideshow/config.rb

@@ -22,12 +22,7 @@ class Config
 
   def config_dir
     unless @config_dir  # first time? calculate config_dir value to "cache"
-      
-      if opts.config_path
-        @config_dir = opts.config_path
-      else
-        @config_dir = cache_dir
-      end
+      @config_dir = opts.config_path
     
       # make sure path exists
       FileUtils.makedirs( @config_dir ) unless File.directory? @config_dir

data/lib/slideshow/manifest_helpers.rb

@@ -0,0 +1,38 @@
+module Slideshow
+
+module ManifestHelper
+
+  ## shared methods for handling manifest lookups
+  
+  def installed_template_manifest_patterns
+    # 1) search ./templates
+    # 2) search config_dir/templates
+    # 3) search gem/templates
+
+    builtin_patterns = [
+      "#{Slideshow.root}/templates/*.txt"
+    ]
+    config_patterns  = [
+      "#{config.config_dir}/templates/*.txt",
+      "#{config.config_dir}/templates/*/*.txt"
+    ]
+    current_patterns = [
+      "templates/*.txt",
+      "templates/*/*.txt"
+    ]
+    
+    patterns = []
+    patterns += current_patterns  unless Slideshow.root == File.expand_path( '.' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
+    patterns += config_patterns
+    patterns += builtin_patterns    
+  end
+
+  def installed_template_manifests
+    ## note: code moved to its own gem, that is, pakman
+    ## see https://github.com/geraldb/pakman
+  
+    Pakman::Finder.new( logger ).find_manifests( installed_template_manifest_patterns )
+  end
+    
+end # module Manifest
+end # module Slideshow

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.1.0'
+  VERSION = '1.2.0.beta1'
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  hash: -399806770
+  prerelease: 6
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - beta
+  - 1
+  version: 1.2.0.beta1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-17 00:00:00 Z
+date: 2012-06-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -66,35 +68,35 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: fetcher
+  name: props
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 0
-        - 1
+        - 2
         - 0
-        version: 0.1.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: props
+  name: pakman
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 27
         segments: 
         - 0
-        - 2
+        - 1
         - 0
-        version: 0.2.0
+        version: 0.1.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -151,10 +153,12 @@ files:
 - config/slideshow.builtin.yml
 - config/slideshow.yml
 - lib/slideshow.rb
-- lib/slideshow/commands/fetch.rb
-- lib/slideshow/commands/gen.rb
-- lib/slideshow/commands/gen_templates.rb
-- lib/slideshow/commands/list.rb
+- lib/slideshow/cli/commands/fetch.rb
+- lib/slideshow/cli/commands/gen.rb
+- lib/slideshow/cli/commands/gen_templates.rb
+- lib/slideshow/cli/commands/list.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
@@ -173,12 +177,10 @@ files:
 - lib/slideshow/helpers/syntax/uv_helper.rb
 - lib/slideshow/helpers/table_helper.rb
 - lib/slideshow/helpers/text_helper.rb
-- lib/slideshow/manifest.rb
+- lib/slideshow/manifest_helpers.rb
 - lib/slideshow/markup/markdown.rb
 - lib/slideshow/markup/rest.rb
 - lib/slideshow/markup/textile.rb
-- lib/slideshow/opts.rb
-- lib/slideshow/runner.rb
 - lib/slideshow/slide.rb
 - lib/slideshow/version.rb
 - templates/s6.txt
@@ -220,12 +222,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: slideshow

data/lib/slideshow/commands/fetch.rb

@@ -1,101 +0,0 @@
-module Slideshow
-
-class Fetch
-
-  include Manifest   # gets us methods like installed_template_manifests, etc.
-
-### fix: remove opts, use config (wrapped!!)
-  
-  def initialize( logger, opts, config )
-    @logger  = logger
-    @opts    = opts
-    @config  = config
-  end
-
-  attr_reader :logger, :opts, :config
-
-  def fetch_file( dest, src )
-    
-     ## note: code moved to its own gem, that is, fetcher
-     ## see https://github.com/geraldb/fetcher
-    
-    # nb: in new method src comes first (and dest second - might be optional in the future)
-    Fetcher::Worker.new( logger ).copy( src, dest )
-  end
-  
-  
-  def run
-    logger.debug "fetch_uri=#{opts.fetch_uri}"
-    
-    src = opts.fetch_uri
-    
-    ## check for builtin shortcut (assume no / or \) 
-    if src.index( '/' ).nil? && src.index( '\\' ).nil?
-      shortcut = src.clone
-      src = config.map_fetch_shortcut( src )
-      
-      if src.nil?
-        puts "** Error: No mapping found for fetch shortcut '#{shortcut}'."
-        return
-      end
-      puts "  Mapping fetch shortcut '#{shortcut}' to: #{src}"
-    end
-    
-    
-    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
-    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
-    uri = URI.parse( src )
-  
-    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
-  
-    dirname  = File.dirname( uri.path )
-    basename = File.basename( uri.path, '.*' ) # e.g. fullerscreen     (without extension)
-    filename = File.basename( uri.path )       # e.g. fullerscreen.txt (with extension)
-
-    logger.debug "dirname: #{dirname}"
-    logger.debug "basename: #{basename}, filename: #{filename}"
-
-    dlbase = "#{uri.scheme}://#{uri.host}:#{uri.port}#{dirname}"
-    pkgpath = File.expand_path( "#{config.config_dir}/templates/#{basename}" )
-  
-    logger.debug "dlpath: #{dlbase}"
-    logger.debug "pkgpath: #{pkgpath}"
-  
-    FileUtils.makedirs( pkgpath ) unless File.directory? pkgpath
-   
-    puts "Fetching template package '#{basename}'"
-    puts "  : from '#{dlbase}'"
-    puts "  : saving to '#{pkgpath}'"
-  
-    # download manifest
-    dest = "#{pkgpath}/#{filename}"
-
-    puts "  Downloading manifest '#{filename}'..."
-
-    fetch_file( dest, src )
-
-    manifest = load_manifest_core( dest )
-      
-    # download templates listed in manifest
-    manifest.each do |values|
-      values[1..-1].each do |file|
-      
-        dest = "#{pkgpath}/#{file}"
-
-        # make sure path exists
-        destpath = File.dirname( dest )
-        FileUtils.makedirs( destpath ) unless File.directory? destpath
-    
-        src = "#{dlbase}/#{file}"
-    
-        puts "  Downloading template '#{file}'..."
-        fetch_file( dest, src )
-      end
-    end   
-    puts "Done."
-  end  
-
-
-end # class Fetch
-
-end # module Slideshow

data/lib/slideshow/commands/gen_templates.rb

@@ -1,66 +0,0 @@
-module Slideshow
-
-class GenTemplates
-
-  include Manifest   # gets us methods like installed_template_manifests, etc.
-
-### fix: remove opts, use config (wrapped!!)
-
-  def initialize( logger, opts, config )
-    @logger  = logger
-    @opts    = opts
-    @config  = config
-  end
-
-  attr_reader :logger, :opts, :config
-
-
-
-  def with_output_path( dest, output_path )
-    dest_full = File.expand_path( dest, output_path )
-    logger.debug "dest_full=#{dest_full}"
-      
-    # make sure dest path exists
-    dest_path = File.dirname( dest_full )
-    logger.debug "dest_path=#{dest_path}"
-    FileUtils.makedirs( dest_path ) unless File.directory? dest_path
-    dest_full
-  end
-
-
-  def run
-    manifest_name = opts.manifest
-    logger.debug "manifest=#{manifest_name}"
-    
-    manifests = installed_generator_manifests
-    
-    # check for builtin generator manifests
-    matches = manifests.select { |m| m[0] == manifest_name+".gen" }
-    
-    if matches.empty?
-      puts "*** error: unknown template manifest '#{manifest_name}'"
-      # todo: list installed manifests
-      exit 2
-    end
-        
-    manifest = load_manifest( matches[0][1] )
-
-    # expand output path in current dir and make sure output path exists
-    outpath = File.expand_path( opts.output_path ) 
-    logger.debug "outpath=#{outpath}"
-    FileUtils.makedirs( outpath ) unless File.directory? outpath
-
-    manifest.each do |entry|
-      dest   = entry[0]
-      source = entry[1]
-                  
-      puts "Copying to #{dest} from #{source}..."
-      FileUtils.copy( source, with_output_path( dest, outpath ) )
-    end
-    
-    puts "Done."
-  end
-
-end # class GenTemplates
-
-end # class Slideshow

data/lib/slideshow/manifest.rb

@@ -1,101 +0,0 @@
-module Slideshow
-  module Manifest
-  
-  def load_manifest_core( path )
-    manifest = []
-  
-    File.open( path ).readlines.each_with_index do |line,i|
-      case line
-      when /^\s*$/
-        # skip empty lines
-      when /^\s*#.*$/
-        # skip comment lines
-      else
-        logger.debug "line #{i+1}: #{line.strip}"
-        values = line.strip.split( /[ <,+]+/ )
-        
-        # add source for shortcuts (assumes relative path; if not issue warning/error)
-        values << values[0] if values.size == 1
-                
-        manifest << values
-      end      
-    end
-
-    manifest
-  end
-
-  def load_manifest( path )
-        
-    filename = path
- 
-    puts "  Loading template manifest #{filename}..."  
-    manifest = load_manifest_core( filename )
-    
-    # post-processing
-    # normalize all source paths (1..-1) /make full path/add template dir
-
-    templatesdir = File.dirname( path )
-    logger.debug "templatesdir=#{templatesdir}"
-
-    manifest.each do |values|
-      (1..values.size-1).each do |i|
-        values[i] = "#{templatesdir}/#{values[i]}"
-        logger.debug "  path[#{i}]=>#{values[i]}<"
-      end
-    end
-             
-    manifest
-  end
-
-  def find_manifests( patterns )
-    manifests = []
-    
-    patterns.each do |pattern|
-      pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
-      logger.debug "Checking #{pattern}"
-      Dir.glob( pattern ) do |file|
-        logger.debug "  Found manifest: #{file}"
-        manifests << [ File.basename( file ), file ]
-      end    
-    end
-    
-    manifests
-  end
-  
-  def installed_generator_manifests
-    # 1) search gem/templates 
-
-    builtin_patterns = [
-      "#{Slideshow.root}/templates/*.txt.gen"
-    ]
-
-    find_manifests( builtin_patterns )
-  end
-
-  def installed_template_manifests
-    # 1) search ./templates
-    # 2) search config_dir/templates
-    # 3) search gem/templates
-
-    builtin_patterns = [
-      "#{Slideshow.root}/templates/*.txt"
-    ]
-    config_patterns  = [
-      "#{config.config_dir}/templates/*.txt",
-      "#{config.config_dir}/templates/*/*.txt"
-    ]
-    current_patterns = [
-      "templates/*.txt",
-      "templates/*/*.txt"
-    ]
-    
-    patterns = []
-    patterns += current_patterns  unless Slideshow.root == File.expand_path( '.' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
-    patterns += config_patterns
-    patterns += builtin_patterns
- 
-    find_manifests( patterns )
-  end
-    
-  end # module  Manifest
-end # module Slideshow