slideshow 1.2.0.beta3 → 1.2.0.beta4

data/Rakefile

@@ -17,7 +17,8 @@ Hoe.spec 'slideshow' do
     ['markdown','>= 0.4.0'],
     ['textutils','>= 0.2.0'],
     ['props','>= 0.2.0'],
-    ['pakman','>= 0.1.0']
+    ['pakman','>= 0.2.0'],
+    ['activesupport', '>= 3.2.6']
   ]
     
   # switch extension to .markdown for gihub formatting

data/config/slideshow.yml

@@ -77,22 +77,22 @@ rest:
 # shortcuts for fetching template packs
 #   map shortcut to URI
 fetch:
-  s6syntax: https://github.com/geraldb/slideshow-s6-syntax-highlighter/raw/master/s6syntax.txt
-  s6blank: https://github.com/geraldb/slideshow-s6-blank/raw/master/s6blank.txt
-  s5blank: https://github.com/geraldb/slideshow-s5-blank/raw/master/s5blank.txt
-  s5themes: https://github.com/geraldb/slideshow-s5-themes/raw/master/s5themes.txt
-  fullerscreen: https://github.com/geraldb/slideshow-fullerscreen/raw/master/fullerscreen.txt
-  slidy: https://github.com/geraldb/slideshow-slidy/raw/master/slidy.txt
-  g5: https://github.com/geraldb/slideshow-google-html5-slides/raw/master/g5.txt
-  slippy: https://github.com/geraldb/slideshow-slippy/raw/master/slippy.txt
-  csss: https://github.com/geraldb/slideshow-csss/raw/master/csss.txt
-  deck.js: https://github.com/geraldb/slideshow-deck.js/raw/master/deck.js.txt
-  impress.js: https://github.com/geraldb/slideshow-impress.js/raw/master/impress.js.txt
-  shower: https://github.com/geraldb/slideshow-shower/raw/master/shower.txt
+  s6syntax: https://raw.github.com/geraldb/slideshow-s6-syntax-highlighter/master/s6syntax.txt
+  s6blank: https://raw.github.com/geraldb/slideshow-s6-blank/master/s6blank.txt
+  s5blank: https://raw.github.com/geraldb/slideshow-s5-blank/master/s5blank.txt
+  s5themes: https://raw.github.com/geraldb/slideshow-s5-themes/master/s5themes.txt
+  fullerscreen: https://raw.github.com/geraldb/slideshow-fullerscreen/master/fullerscreen.txt
+  slidy: https://raw.github.com/geraldb/slideshow-slidy/master/slidy.txt
+  g5: https://raw.github.com/geraldb/slideshow-google-html5-slides/master/g5.txt
+  slippy: https://raw.github.com/geraldb/slideshow-slippy/master/slippy.txt
+  csss: https://raw.github.com/geraldb/slideshow-csss/master/csss.txt
+  deck.js: https://raw.github.com/geraldb/slideshow-deck.js/master/deck.js.txt
+  impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt
+  shower: https://raw.github.com/geraldb/slideshow-shower/master/shower.txt
 
 ###########################
 # shortcuts for quick starter templates
 quick:
-  slidy: https://github.com/geraldb/slideshow-slidy/raw/master/slidy.txt.quick
-  deck.js: https://github.com/geraldb/slideshow-deck.js/raw/master/deck.js.txt.quick
-  impress.js: https://github.com/geraldb/slideshow-impress.js/raw/master/impress.js.txt.quick
+  slidy: https://raw.github.com/geraldb/slideshow-slidy/master/slidy.txt.quick
+  deck.js: https://raw.github.com/geraldb/slideshow-deck.js/master/deck.js.txt.quick
+  impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt.quick

data/lib/slideshow.rb

@@ -22,6 +22,8 @@ require 'yaml'
 require 'cgi'
 
 # required gems
+require 'active_support/all'
+
 require 'redcloth'          # default textile library
 require 'markdown'          # default markdown library
 require 'fetcher'           # fetch docs and blogs via http, https, etc.

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

@@ -28,6 +28,8 @@ class Fetch
         return
       end
       puts "  Mapping fetch shortcut '#{shortcut}' to: #{src}"
+    else
+      shortcut = nil
     end
  
     # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
@@ -35,19 +37,39 @@ class Fetch
     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}"
+    pakname = File.basename( uri.path ).downcase.gsub('.txt','')
+    pakpath = File.expand_path( "#{config.config_dir}/templates/#{pakname}" )
+    
+    logger.debug "packname >#{pakname}<"
+    logger.debug "pakpath >#{pakpath}<"
+  
+    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+    
+    ###################################
+    ## step 2) if shortcut exists (auto include quickstarter manifest w/ same name/key)
+    
+    if shortcut.present?
+      
+      src = config.map_quick_shortcut( shortcut )
+      return if src.nil?   # no shortcut found; sorry; returning (nothing more to do)
+      
+      puts "  Mapping quick shortcut '#{shortcut}' to: #{src}"
  
-    ## note: code moved to its own gem, that is, pakman
-    ## see https://github.com/geraldb/pakman
+      uri = URI.parse( src )
+      logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+    
+      # downcase basename w/ extension (remove .txt)
+      pakname = File.basename( uri.path ).downcase.gsub('.txt','')
+      pakpath = File.expand_path( "#{config.config_dir}/templates/#{pakname}" )
+
+      logger.debug "pakname >#{pakname}<"
+      logger.debug "pakpath >#{pakpath}<"
  
-    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+      Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+    end
+    
   end # method run
 
-
 end # class Fetch
 
 end # module Slideshow

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

@@ -159,8 +159,9 @@ class Gen
     manifest_path_or_name = opts.manifest
     
     # add .txt file extension if missing (for convenience)
-    manifest_path_or_name << ".txt"   if File.extname( manifest_path_or_name ).empty?
-
+    if manifest_path_or_name.downcase.ends_with?( '.txt' ) == false
+      manifest_path_or_name << '.txt'
+    end
   
     logger.debug "manifest=#{manifest_path_or_name}"
     

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

@@ -14,13 +14,13 @@ class GenTemplates
   attr_reader :logger, :opts, :config
 
   def run
-    manifest_name = opts.manifest
+    manifest_name = opts.manifest.gsub( '.txt', '' )  # remove (optional) .txt ending
     logger.debug "manifest=#{manifest_name}"
     
     manifests = installed_generator_manifests
     
     # check for builtin generator manifests
-    matches = manifests.select { |m| m[0] == manifest_name+".gen" }
+    matches = manifests.select { |m| m[0] == manifest_name+'.txt.gen' }
     
     if matches.empty?
       puts "*** error: unknown template manifest '#{manifest_name}'"

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

@@ -15,19 +15,39 @@ class List
   attr_reader :logger, :opts, :config
 
   def run
-    manifests = installed_template_manifests
+    home = Env.home
+    ## replace home w/ ~ (to make out more readable (shorter))
+    ## e.g. use gsub( home, '~' )
     
+    puts ''
+    puts 'Installed quickstarter packs in search path'
+
+    installed_quick_manifest_patterns.each_with_index do |pattern,i|      
+      puts "    [#{i+1}] #{pattern.gsub(home,'~')}"
+    end
+    puts '  include:'
+    
+    installed_quick_manifests.each do |manifest|
+      pakname      = manifest[0].gsub('.txt','').gsub('.quick','')
+      manifestpath = manifest[1].gsub(home,'~')
+      puts "%16s (%s)" % [pakname,manifestpath]
+    end
+
+
     puts ''
     puts 'Installed template packs in search path'
     
     installed_template_manifest_patterns.each_with_index do |pattern,i|
-      puts "    [#{i+1}] #{pattern}"
+      puts "    [#{i+1}] #{pattern.gsub(home,'~')}"
     end
     puts '  include:'
     
-    manifests.each do |manifest|
-      puts "%16s (%s)" % [manifest[0], manifest[1]]
+    installed_template_manifests.each do |manifest|
+      pakname      = manifest[0].gsub('.txt','')
+      manifestpath = manifest[1].gsub(home,'~')
+      puts "%16s (%s)" % [pakname,manifestpath]
     end
+    
   end
 
 end # class List

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

@@ -2,6 +2,8 @@ module Slideshow
 
 class Quick
 
+  include ManifestHelper
+
 ### fix: remove opts, use config (wrapped!!)
 
   def initialize( logger, opts, config )
@@ -13,20 +15,20 @@ class Quick
   attr_reader :logger, :opts, :config
 
   def run
-    manifest_name = opts.quick_manifest
+    manifest_name = opts.quick_manifest.gsub('.txt','').gsub('.quick','')  # make sure we get name w/o .quick and .txt extension
     
     ### todo:fix: always download quickstart templates (except welcome?)
     # how to make sure the won't go stale in the cache after the download?
     
     manifests = installed_quick_manifests
-    matches = manifests.select { |m| m[0] == manifest_name+'.txt.quick' }
+    matches = manifests.select { |m| (m[0] == manifest_name+'.txt.quick') || (m[0] == manifest_name+'.quick.txt') }
 
     if matches.empty?
-      fetch_pak( manifest_name ) 
+      fetch_pak( manifest_name )
       
       # retry
       manifests = installed_quick_manifests
-      matches = manifests.select { |m| m[0] == manifest_name+'.txt.quick' }
+      matches = manifests.select { |m| (m[0] == manifest_name+'.txt.quick') || (m[0] == manifest_name+'.quick.txt') }
       if matches.empty?
         puts "*** error: quickstart template #{manifest_name} not found"
         exit 2
@@ -41,6 +43,8 @@ class Quick
     Pakman::Copier.new( logger ).copy_pak( manifestsrc, pakpath )
   end
   
+  ## todo rename to fetch_quick_pak??
+  ##  share/use same code in fetch too??
   
   def fetch_pak( shortcut )
 
@@ -59,43 +63,14 @@ class Quick
     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}"  
-
-     #### fix: in find manifests
-     ## check for directories!!!
-     ## exclude directories in match
-
-     
-     ## remove (.txt) in basename
-    pakpath = File.expand_path( "#{config.config_dir}/quick/#{basename.gsub('.txt','')}.quick" )
-    logger.debug "pakpath: #{pakpath}"
-
+    pakname = File.basename( uri.path ).downcase.gsub('.txt','')
+    pakpath = File.expand_path( "#{config.config_dir}/templates/#{pakname}" )
+    
+    logger.debug "pakname >#{pakname}<"
+    logger.debug "pakpath >#{pakpath}<"
  
     Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
   end # method fetch_pak
 
-private
-
-
-  def installed_quick_manifests
-   # 1) search config_dir/templates
-   # 2) search gem/templates 
- 
-    builtin_patterns = [
-      "#{Slideshow.root}/templates/*.txt.quick"
-    ]
-    config_patterns  = [
-      "#{config.config_dir}/quick/*.txt.quick",
-      "#{config.config_dir}/quick/*/*.txt.quick"
-    ]
-    
-    patterns = []
-    patterns += config_patterns
-    patterns += builtin_patterns
-
-    Pakman::Finder.new( logger ).find_manifests( patterns )
-  end
-
 end # class GenTemplates
 end # module Slideshow

data/lib/slideshow/cli/opts.rb

@@ -90,7 +90,7 @@ class Opts
   end
     
   def manifest
-    @manifest || 's6.txt'
+    @manifest || 's6'
   end
   
   def config_path=(value)

data/lib/slideshow/manifest_helpers.rb

@@ -18,21 +18,54 @@ module ManifestHelper
     ]
     current_patterns = [
       "templates/*.txt",
-      "templates/*/*.txt"
+      "templates/*/*.txt"     # todo: use all in one line? {*.txt,*/*.txt} does it work?
     ]
     
     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    
+    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 )
+    ## exclude manifest.txt/i  (avoid confusion w/ ruby gem manifest; not a specific name anyway)
+    ##  also exclude patterns for quickstarter templates
+    
+    excludes = [
+      'manifest.txt',
+      '*/manifest.txt',
+      '*.{txt.quick,quick.txt}',
+      '*/*.{txt.quick,quick.txt}'
+    ]
+  
+    Pakman::Finder.new( logger ).find_manifests( installed_template_manifest_patterns, excludes )
   end
+  
+
+  def installed_quick_manifest_patterns
+    # 1) search config_dir/templates
+    # 2) search gem/templates 
+ 
+    builtin_patterns = [
+      "#{Slideshow.root}/templates/*.{txt.quick,quick.txt}"
+    ]
+    config_patterns  = [
+      "#{config.config_dir}/templates/*.{txt.quick,quick.txt}",
+      "#{config.config_dir}/templates/*/*.{txt.quick,quick.txt}"
+    ]
     
+    patterns = []
+    patterns += config_patterns
+    patterns += builtin_patterns
+  end
+
+  def installed_quick_manifests  # quickstarter templates
+    Pakman::Finder.new( logger ).find_manifests( installed_quick_manifest_patterns )
+  end
+  
+
 end # module Manifest
 end # module Slideshow

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.2.0.beta3'
+  VERSION = '1.2.0.beta4'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: -971607871
+  hash: 811109185
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - beta
-  - 3
-  version: 1.2.0.beta3
+  - 4
+  version: 1.2.0.beta4
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -91,18 +91,34 @@ dependencies:
     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: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: activesupport
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 2
+        - 6
+        version: 3.2.6
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -113,11 +129,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,7 +144,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: |-
   The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
   using a wiki-style markup language that's easy-to-write and easy-to-read.