slideshow-models 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '085e7996449acbb26f2b41fd3d59d110212211a2'
-  data.tar.gz: 32c1f223cb024723e81f2a24044d6a9b0bc195cd
+  metadata.gz: 497b834255f34416ffb537e7281ed34767d30a6c
+  data.tar.gz: e68d5e214b22c7e37af03b123e0ca71b21a0333f
 SHA512:
-  metadata.gz: 74032b700ea4421130d3e646091701e2ac80f7fb301924320824c3123c29593b135fe49e04c0f70e0cca110ab0c9d2d5602864218f1dae639d04afd8fc860019
-  data.tar.gz: a8349bb17ed46e11fbf9ba0318a70298b16404db81d44bea96152f67c81beb48085c3bd9b7dd3a2f68be98892a56407796d78b9e2a21400f8496c516162f73a4
+  metadata.gz: 73ba1e67d666e9c0ad5767474c41192bac0ccd7e0db7c63cfb0ff418e021155cb5b9d24dd3a03fca57dce00fd6316ba7464987ddfa82e19521f2086a9b03a221
+  data.tar.gz: a1d4353f9118dba6bf4f7c4acb381fae9dcc9e287ce90a2f319f8b5a264820bfcdf2810f04e42b19e0d6804a1839e31d7a3de436105b2063e3ae0c3796e84161

data/lib/slideshow/commands/manifest_finder.rb

@@ -3,7 +3,7 @@
 module Slideshow
 
 class ManifestFinder
-  
+
   include LogUtils::Logging
 
   include ManifestHelper
@@ -11,49 +11,64 @@ class ManifestFinder
 
   def initialize( config )
     @config = config
-    @usrdir = File.expand_path( Dir.pwd )  # save original (current) working directory     
+    @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 
+
+    # 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 } 
+      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
+        puts
+        puts "Use"
+        puts "  slideshow list      # or"
+        puts "  slideshow ls"
+        puts "to see what template packs you have installed."
+        puts
+        puts "Use"
+        puts "  slideshow install #{manifest_path_or_name.sub('.txt','')}      # or"
+        puts "  slideshow i #{manifest_path_or_name.sub('.txt','')}"
+        puts "to (try to) install the missing template pack."
+        puts
+        puts "See github.com/slideshow-templates for some ready-to-use/download template packs"
+        puts "or use your very own."
+        puts
+
+        # todo: list installed manifests - why? why not?
         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
 

data/lib/slideshow/opts.rb

@@ -8,10 +8,10 @@ class Opts
   def header_level=(value)
     @header_level = value.to_i
   end
-  
+
   def header_level
     ## todo: check   0 is not nil?
-    @header_level || 2        ## note: (new) default is 2  -- note: 2 also breaks on 1 
+    @header_level || 2        ## note: (new) default is 2  -- note: 2 also breaks on 1
   end
 
   def slide=(boolean)
@@ -35,7 +35,7 @@ class Opts
   def verbose=(boolean)   # add: alias for debug ??
     @verbose = boolean
   end
-  
+
   def verbose?
     return false if @verbose.nil?   # default verbose/debug flag is false
     @verbose == true
@@ -55,7 +55,7 @@ class Opts
   def quick_manifest=(value)
     @quick_manifest = value
   end
-  
+
   def quick_manifest
     @quick_manifest || 'welcome'
   end
@@ -81,7 +81,7 @@ class Opts
     # fix: use os-agnostic delimiter (use : for Mac/Unix?)
     @includes.nil? ? [] : @includes.split( ';' )
   end
-  
+
   def has_includes?
     @includes.nil? ? false : true
   end
@@ -90,16 +90,16 @@ class Opts
   def manifest=(value)
     @manifest = value
   end
-    
+
   def manifest
-    @manifest || 's6'
+    @manifest || 's6blank'
   end
 
 
   def config_path=(value)
     @config_path = value
   end
-    
+
   def config_path
     @config_path || File.join( Env.home, '.slideshow' )
   end

data/lib/slideshow/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slideshow-models
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-27 00:00:00.000000000 Z
+date: 2017-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props