lib/slideshow/manifest_helpers.rb in slideshow-1.2.0.beta3 vs lib/slideshow/manifest_helpers.rb in slideshow-1.2.0.beta4
- old
+ new
@@ -16,23 +16,56 @@
"#{config.config_dir}/templates/*.txt",
"#{config.config_dir}/templates/*/*.txt"
]
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
\ No newline at end of file