slideshow-models 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae6fbc86bac566ecfa4b2906afc0c11d243e061d
-  data.tar.gz: eee81eb2a0456e3e284e0100007b06e1d25aef94
+  metadata.gz: 203fe3dd4ab5456281b10e0a77d275df5c0f093b
+  data.tar.gz: f4814e971e3d9a517600c5a2f5de17cf8bcf74f9
 SHA512:
-  metadata.gz: ef4318d385ef0a99775c3e9194ab63a2ed0e5fd3752ded64407906d852bfdda5bc91e6464f3457e6086cdb397fe2e3c1dd2f404f000c381854ae7789c0953e1c
-  data.tar.gz: 98d0cf267ff810f4b5922038e577db9d378ed5a46c0e086eb841af70cdd4bdeb1957b29191d1606b3c008ff4a10d7c9c3a370bba366ad9b45e08e7aa474eb90a
+  metadata.gz: 9e764b6fab1cc4240db3ac3f7459a2c0cf3ff77812e861710681671d7cfc4efeb0ce4ee2987416af79f3cf1cb014b6555ae23db4c82a6241b0468fcf4951c297
+  data.tar.gz: 49c0596b58f3414dfdaef751e133ade4fc806a8739c50d637675906d24ed9132527d291b21df5ec5ce84ae8d193c8dbedf6bad2248833ae1e1c3046c0f708ed0

data/Manifest.txt

@@ -2,14 +2,17 @@ HISTORY.md
 Manifest.txt
 README.md
 Rakefile
-config/slideshow.builtin.yml
 config/slideshow.index.yml
 config/slideshow.yml
+lib/slideshow/commands/build.rb
 lib/slideshow/commands/fetch.rb
 lib/slideshow/commands/gen.rb
 lib/slideshow/commands/list.rb
+lib/slideshow/commands/manifest_finder.rb
+lib/slideshow/commands/merge.rb
 lib/slideshow/commands/plugins.rb
 lib/slideshow/commands/quick.rb
+lib/slideshow/commands/update.rb
 lib/slideshow/config.rb
 lib/slideshow/drops.rb
 lib/slideshow/filters/debug_filter.rb
@@ -39,7 +42,7 @@ test/samples/test.md
 test/samples/test_content_for.md
 test/templates/test/test.html
 test/templates/test/test.txt
-test/test_gen.rb
+test/test_build.rb
 test/test_kramdown.rb
 test/test_slide.rb
 test/test_version.rb

data/config/slideshow.index.yml

@@ -12,7 +12,7 @@
 #   maps shortcut to URI
 
 
-s6blank: https://raw.github.com/slideshow-templates/slideshow-s6-blank/master/s6blank.txt
+s6blank: https://raw.github.com/slideshow-templates/slideshow-s6-blank/gh-pages/s6blank.txt
 
 s6syntax: https://raw.github.com/slideshow-templates/slideshow-s6-syntax-highlighter/master/s6syntax.txt
 
@@ -31,12 +31,12 @@ csss:
 - https://raw.github.com/slideshow-templates/slideshow-csss/master/csss.txt.quick
 
 deck.js:
-- https://raw.github.com/slideshow-templates/slideshow-deck.js/master/deck.js.txt
-- https://raw.github.com/slideshow-templates/slideshow-deck.js/master/deck.js.txt.quick
+- https://raw.github.com/slideshow-templates/slideshow-deck.js/gh-pages/deck.js.txt
+- https://raw.github.com/slideshow-templates/slideshow-deck.js/gh-pages/deck.js.txt.quick
 
 impress.js:
-- https://raw.github.com/slideshow-templates/slideshow-impress.js/master/impress.js.txt
-- https://raw.github.com/slideshow-templates/slideshow-impress.js/master/impress.js.txt.quick
+- https://raw.github.com/slideshow-templates/slideshow-impress.js/gh-pages/impress.js.txt
+- https://raw.github.com/slideshow-templates/slideshow-impress.js/gh-pages/impress.js.txt.quick
 
 shower: https://raw.github.com/slideshow-templates/slideshow-shower/master/shower.txt
 

data/lib/slideshow/commands/build.rb

@@ -0,0 +1,210 @@
+# encoding: utf-8
+
+module Slideshow
+
+
+class Build
+  
+  include LogUtils::Logging
+
+
+  def initialize( config )
+    @config  = config
+    @headers = Headers.new( config )    
+
+    ## todo: check if we need to use expand_path - Dir.pwd always absolute (check ~/user etc.)
+    @usrdir = File.expand_path( Dir.pwd )  # save original (current) working directory 
+  end
+
+  attr_reader :usrdir   # original working dir (user called slideshow from)
+  attr_reader :config, :headers
+   
+   
+  def process_files( args )
+
+     ###
+     #  returns a hash of merged buffers e.g.
+     #  { text: '...',
+     #     js:   '...',
+     #     css:  '...',
+     #  }
+     #  
+    
+    buffers = {}   
+    
+    args.each do |fn|
+
+      dirname  = File.dirname( fn )
+      basename = File.basename( fn, '.*' )
+      extname  = File.extname( fn )
+      
+      logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+      content = File.read_utf8( fn )
+
+      if extname.downcase == 'css'
+        key = :css    # buffer key
+      elsif extname.downcase == 'js'
+        key = :js
+      else  ## assume main text/content
+        ##
+        ##  todo/check:  process text files with gen(erator) one-by-one later? why? why not?
+        #     for now process as one block all together (use sourcedir of first text file)
+        key = :text
+      end
+      
+      if buffers[ key ].nil?   ## first entry
+        h = { contents: [content],
+              files:    [fn],
+            }
+        buffers[ key ] = h
+      else                    ## second, third, etc. entry
+        h = buffers[ key ]
+        h[:contents] << content
+        h[:files]    << fn
+      end
+    end
+  
+    buffers
+  end # process files
+
+  
+  def create_slideshow( args )
+
+    ## first check if manifest exists / available / valid
+    manifestsrc = ManifestFinder.new( config ).find_manifestsrc( config.manifest )
+
+
+    # expand output path in current dir and make sure output path exists
+    outdir = File.expand_path( config.output_path, usrdir )
+    logger.debug "setting outdir to >#{outdir}<"
+    
+    FileUtils.makedirs( outdir ) unless File.directory? outdir
+
+
+    if args.is_a? String
+      args = [args]    ## for now for testing always assume array
+    end      
+    
+    buffers = process_files( args )
+
+    puts "buffers:"
+    pp buffers
+
+
+    ###  todo/fix:
+    ##  reset headers too - why? why not?
+     
+    # shared variables for templates (binding)
+    content_for = {}  # reset content_for hash
+    # give helpers/plugins a session-like hash
+    session     = {}  # reset session hash for plugins/helpers
+
+    name = 'untitled'     ## default name (auto-detect from first file e.g. rest.txt => rest etc.)
+
+    content = ''
+
+    ## check for css and js buffers
+    ##    todo/fix: check if content_for key is a symbol or just a string !!!!!!
+    if buffers[:css]
+      ## concat files (separate with newlines)
+      content_for[:css] = buffers[:css][:contents].join( "\n\n" )
+    end
+
+    if buffers[:js]
+      ## concat files (separate with newlines)
+      content_for[:js] = buffers[:js][:contents].join( "\n\n" )
+    end
+
+
+    gen = Gen.new( @config,
+                   @headers,
+                   session,
+                   content_for )
+
+    chunk_size = buffers[:text] ? buffers[:text][:contents].size : 0
+    
+    (0...chunk_size).each do |i|
+      
+      chunk   = buffers[:text][:contents][i]
+      fn      = buffers[:text][:files][i]
+
+      dirname  = File.dirname( fn )
+      basename = File.basename( fn, '.*' )
+      extname  = File.extname( fn )
+      logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
+
+      ## for now use first text file for (auto-)caluclation name and source folder
+      if i==0
+        name = basename
+        puts "Preparing slideshow '#{basename}'..."
+      end
+
+      puts "  [#{i+1}/#{chunk_size}] Generating '#{basename}' (#{dirname})..."
+
+
+      # change working dir to sourcefile dir
+      # todo: add a -c option to commandline? to let you set cwd?
+
+      srcdir = File.expand_path( dirname, usrdir )
+      logger.debug "setting srcdir to >#{srcdir}<"
+    
+      logger.debug "changing cwd to src - new >#{srcdir}<, old >#{Dir.pwd}<"
+      Dir.chdir srcdir
+
+
+      ####################
+      ## todo/fix: move ctx to Gen.initialize - why? why not?
+      #    move outdir, usrdir, name to Gen.initialize ??
+      #    add basename, dirname ?
+      gen_ctx = {
+        name:    name,
+        srcdir:  srcdir,
+        outdir:  outdir,
+        usrdir:  usrdir,
+      }
+
+      chunk = gen.render( chunk, gen_ctx )
+
+      if i==0   ## first chunk
+        content << chunk
+      else      ## follow-up chunk (start off with two newlines)
+        content << "\n\n"
+        content << chunk
+      end
+    end   # each buffer.text.contents
+
+
+    logger.debug "restoring cwd to usr - new >#{usrdir}<, old >#{Dir.pwd}<"
+    Dir.chdir( usrdir )
+
+
+    # post-processing (all-in-one HTML with directive as HTML comments)
+    deck = Deck.new( content, header_level: config.header_level,
+                              use_slide:    config.slide? )
+
+
+  ## note: merge for now requires resetting to
+  ##         original working dir (user called slideshow from)
+  merge = Merge.new( config )
+    
+  merge_ctx = {
+    manifestsrc: manifestsrc,
+    outdir:      outdir,
+    name:        name,
+  }
+  
+  merge.merge( deck,
+               merge_ctx,
+               headers,
+               content_for )
+
+
+  puts 'Done.'
+end # method create_slideshow
+
+
+end # class Build
+
+end # class Slideshow
+

data/lib/slideshow/commands/fetch.rb

@@ -21,24 +21,6 @@ class Fetch
   end
 
 
-  def update   # update shortcut index
-    dest =  config.shortcut_index_file
-    
-    destfull = File.expand_path( dest )
-    destpath = File.dirname( destfull )
-    FileUtils.makedirs( destpath ) unless File.directory?( destpath )
-
-    logger.debug "destfull=>#{destfull}<"
-    logger.debug "destpath=>#{destpath}<"
-
-    ## todo/fix: use a config setting for index url (do NOT hard core)
-    src = 'https://raw.github.com/slideshow-s9/registry/master/slideshow.index.yml'
-
-    puts "Updating shortcut index - downloading '#{src}'..."
-    ::Fetcher::Worker.new.copy( src, destfull )
-  end
-
-
   def fetch( shortcut_or_source )
 
     logger.debug "fetch >#{shortcut_or_source}<"

data/lib/slideshow/commands/gen.rb

@@ -5,29 +5,61 @@ module Slideshow
 ## fix:/todo: move generation code out of command into its own class
 ##   not residing/depending on cli
 
-class Gen     ## todo: rename command to build
+class Gen       ## rename to GenCtx  (Context) - why? why not?
 
   include LogUtils::Logging
 
-  include ManifestHelper
 
-
-  def initialize( config )
-    @config  = config
-    @headers = Headers.new( config )    
-
-    ## todo: check if we need to use expand_path - Dir.pwd always absolute (check ~/user etc.)
-    @usrdir = File.expand_path( Dir.pwd )  # save original (current) working directory 
+  def initialize( config, headers, session={}, content_for={} )
+    @config      = config
+    @headers     = headers
+    
+    @session     = session
+    @content_for = content_for
   end
 
+  attr_reader :config, :headers
+  attr_reader :session      # give helpers/plugins a session-like hash
+
+  ## todo/check: usrdir needed for something (e.g. why keep it?) - remove? why? why not??
   attr_reader :usrdir   # original working dir (user called slideshow from)
-  attr_reader :srcdir, :outdir, :pakdir    # NB: "initalized" in create_slideshow
+  attr_reader :srcdir, :outdir    # NB: "initalized" in create_slideshow
+
+
+  def render( content, ctx )
+    
+    ####################
+    ## todo/fix: move ctx to Gen.initialize - why? why not?
+    @name     = ctx[:name]
+
+    @outdir   = ctx[:outdir]
+    @srcdir   = ctx[:srcdir]
+    @usrdir   = ctx[:usrdir]
+    
+    # run text filters
+  
+    config.text_filters.each do |filter|
+      mn = filter.tr( '-', '_' ).to_sym  # construct method name (mn)
+      puts "  run filter #{mn}..."
+      content = send( mn, content )   # call filter e.g.  include_helper_hack( content )  
+    end
+
+    if config.takahashi?
+      content = takahashi_slide_breaks( content )
+    end
+
+    # convert light-weight markup to hypertext
+
+    content = markdown_to_html( content )
+    content
+  end  # method render
 
 
-  attr_reader :config, :headers
-  attr_reader :session      # give helpers/plugins a session-like hash
 
- 
+  ###
+  # some markdown guard helpers
+  #   (e.g. guard text/mark text for do NOT convert)
+
   def guard_text( text )
     # todo/fix 2: note we need to differentiate between blocks and inline
     #   thus, to avoid runs - use guard_block (add a leading newline to avoid getting include in block that goes before)
@@ -56,171 +88,7 @@ class Gen     ## todo: rename command to build
   end
 
 
-  def create_slideshow( fn )
-
-    manifest_path_or_name = config.manifest
-    
-    # add .txt file extension if missing (for convenience)
-    if manifest_path_or_name.downcase.ends_with?( '.txt' ) == false
-      manifest_path_or_name << '.txt'
-    end
-  
-    logger.debug "manifest=#{manifest_path_or_name}"
-    
-    # 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 )
-      manifestsrc = manifest_path_or_name
-    else
-      # check for builtin manifests
-      manifests = installed_template_manifests
-      matches = manifests.select { |m| m[0] == manifest_path_or_name } 
-
-      if matches.empty?
-        puts "*** error: unknown template manifest '#{manifest_path_or_name}'"
-        # todo: list installed manifests
-        exit 2
-      end
-        
-      manifestsrc = matches[0][1]
-    end
-
-    ### todo: use File.expand_path( xx, relative_to ) always with second arg
-    ##   do NOT default to cwd (because cwd will change!)
-    
-    # Reference src with absolute path, because this can be used with different pwd
-    manifestsrc = File.expand_path( manifestsrc, usrdir )
-
-    # expand output path in current dir and make sure output path exists
-    @outdir = File.expand_path( config.output_path, usrdir )
-    logger.debug "setting outdir to >#{outdir}<"
-    FileUtils.makedirs( outdir ) unless File.directory? outdir
-
-    dirname  = File.dirname( fn )
-    basename = File.basename( fn, '.*' )
-    extname  = File.extname( fn )
-    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-    # change working dir to sourcefile dir
-    # todo: add a -c option to commandline? to let you set cwd?
-
-    @srcdir = File.expand_path( dirname, usrdir )
-    logger.debug "setting srcdir to >#{srcdir}<"
-
-    unless usrdir == srcdir
-      logger.debug "changing cwd to src - new >#{srcdir}<, old >#{Dir.pwd}<"
-      Dir.chdir srcdir
-    end
-
-    puts "Preparing slideshow '#{basename}'..."
-   
-  ###  todo/fix:
-  ##  reset headers too - why? why not?
-     
-  # shared variables for templates (binding)
-  @content_for = {}  # reset content_for hash
-
-  @name        = basename
-  @extname     = extname
-
-  @session     = {}  # reset session hash for plugins/helpers
-
-  inname  =  "#{basename}#{extname}"
-
-  logger.debug "inname=#{inname}"
-    
-  content = File.read_utf8( inname )
-
-  # run text filters
-  
-  config.text_filters.each do |filter|
-    mn = filter.tr( '-', '_' ).to_sym  # construct method name (mn)
-    puts "  run filter #{mn}..."
-    content = send( mn, content )   # call filter e.g.  include_helper_hack( content )  
-  end
-
-
-  if config.takahashi?
-    content = takahashi_slide_breaks( content )
-  end
-
-
-  # convert light-weight markup to hypertext
-
-  content = markdown_to_html( content )
-
-
-  # post-processing
-  deck = Deck.new( content, header_level: config.header_level,
-                            use_slide:    config.slide? )
-
-
-  ### todo/fix: move merge to its own
-  ##     class e.g. commands/merge.rb or something
-  ##     or use Merger - why? why not?
-
-
-  #### pak merge
-  #  nb: change cwd to template pak root
-
-  @pakdir = File.dirname( manifestsrc )  # template pak root - make availabe too in erb via binding
-  logger.debug " setting pakdir to >#{pakdir}<"
-
-  #  todo/fix: change current work dir (cwd) in pakman gem itself
-  #   for now lets do it here
-
-  logger.debug "changing cwd to pak - new >#{pakdir}<, old >#{Dir.pwd}<"
-  Dir.chdir( pakdir )
-
-
-  pakpath     = outdir
-
-  logger.debug( "manifestsrc >#{manifestsrc}<, pakpath >#{pakpath}<" )
-
-  ###########################################
-  ## fix: !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  ## todo: setup hash for binding
-  ctx = { 'name'    => @name,
-          'headers' => HeadersDrop.new( @headers ), 
-          'content' => deck.content,
-          'slides'  => deck.slides.map { |slide| SlideDrop.new(slide) },  # strutured content - use LiquidDrop - why? why not?
-          ## todo/fix: add content_for hash
-          ## and some more -- ??
-        }
-  
-  ## add content_for entries e.g.
-  ##    content_for :js  =>  more_content_for_js or content_for_js or extra_js etc.
-  ##  for now allow all three aliases
-
-  puts "content_for:"
-  pp @content_for
-
-  @content_for.each do |k,v|
-    puts "  (auto-)add content_for >#{k.to_s}< to ctx:"
-    puts v
-    ctx[ "more_content_for_#{k}"] = v
-    ctx[ "content_for_#{k}" ] = v
-    ctx[ "extra_#{k}" ] = v
-  end
-  
-  puts "ctx:"
-  pp ctx
-
-
-  Pakman::LiquidTemplater.new.merge_pak( manifestsrc, pakpath, ctx, basename )
-
-  logger.debug "restoring cwd to src - new >#{srcdir}<, old >#{Dir.pwd}<"
-  Dir.chdir( srcdir )
-
-  ## pop/restore org (original) working folder/dir
-  unless usrdir == srcdir
-    logger.debug "restoring cwd to usr - new >#{usrdir}<, old >#{Dir.pwd}<"
-    Dir.chdir( usrdir )
-  end
-
-  puts "Done."
-end # method create_slideshow
-
-
 end # class Gen
 
-end # class Slideshow
+end # class Slideshow
+

data/lib/slideshow/commands/manifest_finder.rb

@@ -0,0 +1,60 @@
+# encoding: utf-8
+
+module Slideshow
+
+class ManifestFinder
+  
+  include LogUtils::Logging
+
+  include ManifestHelper
+
+
+  def initialize( config )
+    @config = config
+    @usrdir = File.expand_path( Dir.pwd )  # save original (current) working directory     
+  end
+  
+  attr_reader :config
+  attr_reader :usrdir   # original working dir (user called slideshow from)
+
+
+  def find_manifestsrc( manifest_arg )    ## rename - just use find_manifest ??
+    
+    manifest_path_or_name = manifest_arg.dup   ## make a copy
+    
+    # add .txt file extension if missing (for convenience)
+    if manifest_path_or_name.downcase.ends_with?( '.txt' ) == false
+      manifest_path_or_name << '.txt'
+    end
+  
+    logger.debug "manifest=#{manifest_path_or_name}"
+    
+    # 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 )
+      manifestsrc = manifest_path_or_name
+    else
+      # check for builtin manifests
+      manifests = installed_template_manifests
+      matches = manifests.select { |m| m[0] == manifest_path_or_name } 
+
+      if matches.empty?
+        puts "*** error: unknown template manifest '#{manifest_path_or_name}'"
+        # todo: list installed manifests
+        exit 2
+      end
+        
+      manifestsrc = matches[0][1]
+    end
+
+    ### todo: use File.expand_path( xx, relative_to ) always with second arg
+    ##   do NOT default to cwd (because cwd will change!)
+    
+    # Reference src with absolute path, because this can be used with different pwd
+    manifestsrc = File.expand_path( manifestsrc, usrdir )
+    manifestsrc
+  end
+  
+
+end # class ManifestFinder
+
+end # class Slideshow

data/lib/slideshow/commands/merge.rb

@@ -0,0 +1,96 @@
+# encoding: utf-8
+
+module Slideshow
+
+
+class Merge
+
+  include LogUtils::Logging
+
+
+  def initialize( config )
+    @config  = config
+    
+    ## todo: check if we need to use expand_path - Dir.pwd always absolute (check ~/user etc.)
+    @usrdir = File.expand_path( Dir.pwd )  # save original (current) working directory 
+  end
+
+  attr_reader :config
+  attr_reader :usrdir   # original working dir (user called slideshow from)
+
+
+  def merge( deck, ctx, headers, content_for )
+
+    manifestsrc = ctx[:manifestsrc]
+    name        = ctx[:name]
+    outdir      = ctx[:outdir]
+    
+    ## note:
+    ##   assumes name == basename  (e.g. name without extension and directory)
+    ##    rename name to basename - why? why not??
+    
+    ## note: assumes working directory is (default) work directory
+    ##         e.g. original working dir (user called slideshow from)
+
+
+    puts "Merging slideshow '#{name}'..."
+   
+
+  #### pak merge
+  #  nb: change cwd to template pak root
+
+  @pakdir = File.dirname( manifestsrc )  # template pak root - make availabe too in erb via binding
+  logger.debug " setting pakdir to >#{@pakdir}<"
+
+  #  todo/fix: change current work dir (cwd) in pakman gem itself
+  #   for now lets do it here
+
+  logger.debug "changing cwd to pak - new >#{@pakdir}<, old >#{Dir.pwd}<"
+  Dir.chdir( @pakdir )
+
+
+  logger.debug( "manifestsrc >#{manifestsrc}<, outdir >#{outdir}<" )
+
+
+  ###########################################
+  ## setup hash for binding
+  assigns = { 'name'    => name,
+              'headers' => HeadersDrop.new( headers ), 
+              'content' => deck.content,
+              'slides'  => deck.slides.map { |slide| SlideDrop.new(slide) },  # strutured content - use LiquidDrop - why? why not?
+        }
+  
+  ## add content_for entries e.g.
+  ##    content_for :js  =>  more_content_for_js or content_for_js or extra_js etc.
+  ##  for now allow all three aliases
+
+  puts "content_for:"
+  pp content_for
+
+  content_for.each do |k,v|
+    puts "  (auto-)add content_for >#{k.to_s}< to ctx:"
+    puts v
+    assigns[ "more_content_for_#{k}"] = v
+    assigns[ "content_for_#{k}" ] = v
+    assigns[ "extra_#{k}" ] = v
+  end
+  
+  puts "assigns:"
+  pp assigns
+
+
+  Pakman::LiquidTemplater.new.merge_pak( manifestsrc, outdir, assigns, name )
+
+
+  ## pop/restore org (original) working folder/dir
+  unless usrdir == @pakdir
+    logger.debug "restoring cwd to usr - new >#{usrdir}<, old >#{Dir.pwd}<"
+    Dir.chdir( usrdir )
+  end
+end # method merge
+
+
+
+end # class Merge
+
+end # class Slideshow

data/lib/slideshow/commands/update.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+
+module Slideshow
+
+
+###
+#  update/fetch shortcut/registry slideshow.index.yml
+#    
+
+# todo/why/why not??
+#   - *ALWAYS* fetch index before an "online" fetch operation?
+#     why cache or use built-in version?
+#     use cached/built-in version only as fallback?
+
+
+
+class Update
+
+  
+  include LogUtils::Logging
+  
+  def initialize( config )
+    @config  = config
+  end
+
+  attr_reader :config
+
+
+  def update   # update shortcut index
+    dest =  config.shortcut_index_file
+    
+    destfull = File.expand_path( dest )
+    destpath = File.dirname( destfull )
+    FileUtils.makedirs( destpath ) unless File.directory?( destpath )
+
+    logger.debug "destfull=>#{destfull}<"
+    logger.debug "destpath=>#{destpath}<"
+
+    ## todo/fix: use a config setting for index url (do NOT hard core)
+    src = 'https://raw.github.com/slideshow-s9/registry/master/slideshow.index.yml'
+
+    puts "Updating shortcut index - downloading '#{src}'..."
+    ::Fetcher::Worker.new.copy( src, destfull )
+  end
+
+end # class Update
+
+end # module Slideshow
+

data/lib/slideshow/config.rb

@@ -111,12 +111,6 @@ class Config
   def load
     
     # load builtin config file @  <gem>/config/slideshow.yml
-    #
-    # NB: builtin use a different hierachy (not linked to default/home/user/cli props)
-    #     for now builtin has no erb processing
-    #     user cannot override builtin settings (only defaults see below)
-    props_builtin_file  = File.join( Slideshow.root, 'config', 'slideshow.builtin.yml' )
-    @props_builtin = Props.load_file( props_builtin_file )
 
     props_default_file  = File.join( Slideshow.root, 'config', 'slideshow.yml' )
     @props = @props_default = Props.load_file_with_erb( props_default_file, binding() )
@@ -141,9 +135,9 @@ class Config
     load_shortcuts
   end
 
+
   def dump  # dump settings for debugging
     puts "Slideshow settings:"
-    @props_builtin.dump  if @props_builtin
     @props_default.dump  if @props_default
     @props_home.dump     if @props_home
     @props_work.dump     if @props_work
@@ -170,23 +164,6 @@ class Config
     @props.fetch_from_section( 'analytics', 'google', nil )
   end
 
-  def helper_renames
-    ## NB: for now user cannot override/extent renames
-    @props_builtin['helper']['renames']
-  end
-
-  def helper_unparsed
-    ## NB: for now user cannot override/extent unparsed helpers
-    # use unparsed params (passed along a single string)
-    @props_builtin['helper']['unparsed']
-  end
-  
-  def helper_exprs
-    ## NB: for now user cannot override/extent helper exprs
-    # allow expression as directives (no need for %end block)
-    # by default directives are assumed statements (e.g. %mydir  %end)
-    @props_builtin['helper']['exprs']
-  end
 
 private
 

data/lib/slideshow/filters/text_filter.rb

@@ -11,6 +11,11 @@ module Slideshow
   include TextUtils::Filter    # include comments_percent_style, skip_end_directive, etc. filters 
 
 
+  DIRECTIVES_UNPARSED = [ 'slide', 'style' ]
+  DIRECTIVES_RENAMES  = [ 'include', 'class' ]
+  DIRECTIVES_EXPRS    = [ 'class', 'clear' ]
+
+
 def directives_bang_style_to_percent_style( content )
 
   # for compatibility allow !SLIDE/!STYLE as an alternative to %slide/%style-directive
@@ -18,18 +23,19 @@ def directives_bang_style_to_percent_style( content )
   bang_count = 0
 
   # get unparsed helpers e.g. SLIDE|STYLE  
-  unparsed = config.helper_unparsed.map { |item| item.upcase }.join( '|' )                                                                   
+  unparsed = DIRECTIVES_UNPARSED.map { |item| item.upcase }.join( '|' )                                                                   
   
   content.gsub!(/^!(#{unparsed})(.*)$/) do |match|
     bang_count += 1
     "<%= #{$1.downcase} '#{$2 ? $2 : ''}' %>"
   end
 
-  puts "  Patching !-directives (#{bang_count} #{config.helper_unparsed.join('/')}-directives)..."
+  puts "  Patching !-directives (#{bang_count} #{DIRECTIVES_UNPARSED.join('/')}-directives)..."
 
   content
 end
 
+
 def directives_percent_style( content )
         
   directive_unparsed  = 0
@@ -51,11 +57,10 @@ def directives_percent_style( content )
 
       logger.debug "processing %-directive: #{directive}"
 
-      # slide, style
-      if config.helper_unparsed.include?( directive )
+      if DIRECTIVES_UNPARSED.include?( directive )   # e.g. slide, style, etc.
         directive_unparsed += 1
         content2 << "<%= #{directive} '#{params ? params : ''}' %>"
-      elsif config.helper_exprs.include?( directive )
+      elsif DIRECTIVES_EXPRS.include?( directive )   # e.g. class, clear, etc.
         directive_expr += 1
         content2 << "<%= #{directive} #{params ? erb_simple_params(directive,params) : ''} %>"        
       elsif inside_helper && directive == 'end'
@@ -83,15 +88,15 @@ def directives_percent_style( content )
   end  
     
   puts "  Preparing %-directives (" +
-      "#{directive_unparsed} #{config.helper_unparsed.join('/')} directives, " +
-      "#{directive_expr} #{config.helper_exprs.join('/')} expr-directives, " +
+      "#{directive_unparsed} #{DIRECTIVES_UNPARSED.join('/')} directives, " +
+      "#{directive_expr} #{DIRECTIVES_EXPRS.join('/')} expr-directives, " +
       "#{directive_block_beg}/#{directive_block_end} block-directives)..."
 
   content2
 end
 
   ######################
-  # todo: fix move to textutils gem (including helpers and config)
+  # todo: fix move to textutils gem (including helpers and config) - why? why not??
   # 
 
 
@@ -102,14 +107,14 @@ end
     
     # turn renames into something like:
     #   include|class   etc.
-    renames = config.helper_renames.join( '|' )
+    renames = DIRECTIVES_RENAMES.join( '|' )
     
     content.gsub!( /<%=[ \t]*(#{renames})/ ) do |match|
       rename_counter += 1
       "<%= s9_#{$1}" 
     end
 
-    puts "  Patching embedded Ruby (erb) code for aliases (#{rename_counter} #{config.helper_renames.join('/')}-aliases)..."
+    puts "  Patching embedded Ruby (erb) code for aliases (#{rename_counter} #{DIRECTIVES_RENAMES.join('/')}-aliases)..."
 
     content
   end

data/lib/slideshow/models.rb

@@ -46,8 +46,12 @@ require 'slideshow/models/deck'
 require 'slideshow/markdown'
 require 'slideshow/drops'
 
+require 'slideshow/commands/manifest_finder'
 require 'slideshow/commands/fetch'
+require 'slideshow/commands/update'
 require 'slideshow/commands/gen'
+require 'slideshow/commands/merge'
+require 'slideshow/commands/build'
 require 'slideshow/commands/list'
 require 'slideshow/commands/plugins'
 require 'slideshow/commands/quick'

data/lib/slideshow/version.rb

@@ -4,7 +4,7 @@ module Slideshow
 
   MAJOR = 3
   MINOR = 0
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/{test_gen.rb → test_build.rb}

@@ -2,15 +2,15 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_gen.rb
+#     ruby -I ./lib -I ./test test/test_build.rb
 
 
 require 'helper'
 
 
-class TestGen < MiniTest::Test
+class TestBuild < MiniTest::Test
 
-def test_gen_test
+def test_build_test
 
    opts    = Slideshow::Opts.new
    
@@ -23,14 +23,14 @@ def test_gen_test
    config.load
    config.dump
   
-   g = Slideshow::Gen.new( config )
+   g = Slideshow::Build.new( config )
    g.create_slideshow( "#{Slideshow.root}/test/samples/test.md" )
   
   assert true
-end  # method test_gen
+end  # method test_build
 
 
-def test_gen_test_content_for
+def test_build_test_content_for
 
    opts    = Slideshow::Opts.new
    
@@ -43,12 +43,12 @@ def test_gen_test_content_for
    config.load
    config.dump
   
-   g = Slideshow::Gen.new( config )
+   g = Slideshow::Build.new( config )
    g.create_slideshow( "#{Slideshow.root}/test/samples/test_content_for.md" )
   
   assert true
-end  # method test_gen
+end  # method test_build
 
 
-end # class TestGen
+end # class TestBuild
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slideshow-models
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -135,14 +135,17 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
-- config/slideshow.builtin.yml
 - config/slideshow.index.yml
 - config/slideshow.yml
+- lib/slideshow/commands/build.rb
 - lib/slideshow/commands/fetch.rb
 - lib/slideshow/commands/gen.rb
 - lib/slideshow/commands/list.rb
+- lib/slideshow/commands/manifest_finder.rb
+- lib/slideshow/commands/merge.rb
 - lib/slideshow/commands/plugins.rb
 - lib/slideshow/commands/quick.rb
+- lib/slideshow/commands/update.rb
 - lib/slideshow/config.rb
 - lib/slideshow/drops.rb
 - lib/slideshow/filters/debug_filter.rb
@@ -172,7 +175,7 @@ files:
 - test/samples/test_content_for.md
 - test/templates/test/test.html
 - test/templates/test/test.txt
-- test/test_gen.rb
+- test/test_build.rb
 - test/test_kramdown.rb
 - test/test_slide.rb
 - test/test_version.rb

data/config/slideshow.builtin.yml

@@ -1,8 +0,0 @@
-####################
-### builtin configuration (not configurable by user now)
-
-
-helper:
-  unparsed: [ slide, style ]
-  renames: [ include, class ]
-  exprs: [ class, clear ]