lib/slideshow/cli/opts.rb in slideshow-1.2.5 vs lib/slideshow/cli/opts.rb in slideshow-2.0.0

@@ -1,10 +1,31 @@
 module Slideshow
 
 
 class Opts
 
+  def merge_gli_options!( options={} )
+    @header_level = 1   if options[:h1] == true
+    @header_level = 2   if options[:h2] == true
+    
+    @slide     = true   if options[:slide] == true
+    @takahashi = true   if options[:slide] == true
+    
+    @verbose = true     if options[:verbose] == true
+    
+    @fetch_all = true   if options[:all] == true
+    
+    @config_path = options[:config]    if options[:config].present?
+    @output_path = options[:output]    if options[:output].present?
+    
+    @manifest       =   options[:template]  if options[:template].present?
+    
+    ## NB: will use :template option too
+    @quick_manifest =   options[:template]  if options[:template].present?
+  end
+
+
   def header_level=(value)
     @header_level = value.to_i
   end
   
   def header_level
@@ -38,78 +59,32 @@
     return false if @verbose.nil?   # default verbose/debug flag is false
     @verbose == true
   end
 
 
-  def quick=(boolean)
-    @quick = boolean
-  end
 
-  def quick?
-    return false if @quick.nil?   # default generate flag is false
-    @quick == true
-  end
-
   def quick_manifest=(value)
     @quick_manifest = value
   end
   
   def quick_manifest
     @quick_manifest || 'welcome'
   end
 
 
-  def plugins=(boolean)
-    @plugins = boolean
-  end
 
-  def plugins?
-    return false if @plugins.nil?   # default generate flag is false
-    @plugins == true
-  end
-
-
-  def generate=(boolean)
-    @generate = boolean
-  end
-
-  def generate?
-    return false if @generate.nil?   # default generate flag is false
-    @generate == true
-  end
-  
-  def list=(boolean)
-    @list = boolean
-  end
-  
-  def list?
-    return false if @list.nil?  # default list flag is false
-    @list == true
-  end
-
   def fetch_all=(boolean)
     @fetch_all = boolean
   end
 
   def fetch_all?
     return false if @fetch_all.nil?  # default fetch all flag is false
     @fetch_all == true
   end
 
-  def fetch_uri=(value)
-    @fetch_uri = value
-  end
 
-  def fetch_uri
-    @fetch_uri || '-fetch uri required-'
-  end
-  
-  def fetch?
-    @fetch_uri.nil? ? false : true
-  end
 
-
   def includes=(value)
     @includes = value
   end
 
   def includes
@@ -118,30 +93,32 @@
   end
   
   def has_includes?
     @includes.nil? ? false : true
   end
-  
+
+
   def manifest=(value)
     @manifest = value
   end
     
   def manifest
     @manifest || 's6'
   end
-  
+
+
   def config_path=(value)
     @config_path = value
   end
     
   def config_path
     @config_path || File.join( Env.home, '.slideshow' )
   end
-    
+
   def output_path=(value)
     @output_path = value
   end
-  
+
   def output_path
     @output_path || '.'
   end
 
 end # class Opts
\ No newline at end of file