slideshow 1.2.0.beta2 → 1.2.0.beta3

data/config/slideshow.yml

@@ -88,4 +88,11 @@ fetch:
   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
+  shower: https://github.com/geraldb/slideshow-shower/raw/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

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

@@ -13,17 +13,26 @@ class Quick
   attr_reader :logger, :opts, :config
 
   def run
-    manifest_name = 'welcome.txt.quick'
+    manifest_name = opts.quick_manifest
+    
+    ### 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 }
+    matches = manifests.select { |m| m[0] == manifest_name+'.txt.quick' }
 
     if matches.empty?
-      puts "*** error: unknown quick template manifest '#{manifest_name}'"
-      # todo: list installed manifests
-      exit 2
+      fetch_pak( manifest_name ) 
+      
+      # retry
+      manifests = installed_quick_manifests
+      matches = manifests.select { |m| m[0] == manifest_name+'.txt.quick' }
+      if matches.empty?
+        puts "*** error: quickstart template #{manifest_name} not found"
+        exit 2
+      end
     end
-
+    
     manifestsrc = matches[0][1]
     pakpath     = opts.output_path
  
@@ -31,16 +40,60 @@ class Quick
     
     Pakman::Copier.new( logger ).copy_pak( manifestsrc, pakpath )
   end
+  
+  
+  def fetch_pak( shortcut )
+
+    src = config.map_quick_shortcut( shortcut )
+      
+    if src.nil?
+      puts "*** error: no mapping found for quick shortcut '#{shortcut}'."
+      exit 2
+    end
+    
+    puts "  Mapping quick shortcut '#{shortcut}' to: #{src}"
+  
+ 
+    # 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}"  
+
+     #### 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}"
+
+ 
+    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+  end # method fetch_pak
 
 private
 
-  def installed_quick_manifests
-    # 1) search gem/templates 
 
-    patterns = [
+  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
 

data/lib/slideshow/cli/opts.rb

@@ -21,6 +21,14 @@ class Opts
     @quick == true
   end
 
+  def quick_manifest=(value)
+    @quick_manifest = value
+  end
+  
+  def quick_manifest
+    @quick_manifest || 'welcome'
+  end
+
 
   def plugins=(boolean)
     @plugins = boolean

data/lib/slideshow/cli/runner.rb

@@ -98,7 +98,10 @@ def run( args )
     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') { opts.quick = true }
+    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( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
 

data/lib/slideshow/config.rb

@@ -114,6 +114,11 @@ class Config
     @props.fetch_from_section( 'fetch', key, nil )
   end
 
+  def map_quick_shortcut( key )
+    ## todo: normalize key???
+    @props.fetch_from_section( 'quick', key, nil )
+  end
+
   def helper_renames
     ## NB: for now user cannot override/extent renames
     @props_builtin['helper']['renames']

data/lib/slideshow/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 604803290
+  hash: -971607871
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - beta
-  - 2
-  version: 1.2.0.beta2
+  - 3
+  version: 1.2.0.beta3
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 Z
+date: 2012-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth