slideshow 1.1.0.beta7 → 1.1.0.beta8

data/lib/slideshow/commands/gen_templates.rb

@@ -0,0 +1,66 @@
+module Slideshow
+
+class GenTemplates
+
+  include Manifest   # gets us methods like installed_template_manifests, etc.
+
+### fix: remove opts, use config (wrapped!!)
+
+  def initialize( logger, opts, config )
+    @logger  = logger
+    @opts    = opts
+    @config  = config
+  end
+
+  attr_reader :logger, :opts, :config
+
+
+
+  def with_output_path( dest, output_path )
+    dest_full = File.expand_path( dest, output_path )
+    logger.debug "dest_full=#{dest_full}"
+      
+    # make sure dest path exists
+    dest_path = File.dirname( dest_full )
+    logger.debug "dest_path=#{dest_path}"
+    FileUtils.makedirs( dest_path ) unless File.directory? dest_path
+    dest_full
+  end
+
+
+  def run
+    manifest_name = opts.manifest
+    logger.debug "manifest=#{manifest_name}"
+    
+    manifests = installed_generator_manifests
+    
+    # check for builtin generator manifests
+    matches = manifests.select { |m| m[0] == manifest_name+".gen" }
+    
+    if matches.empty?
+      puts "*** error: unknown template manifest '#{manifest_name}'"
+      # todo: list installed manifests
+      exit 2
+    end
+        
+    manifest = load_manifest( matches[0][1] )
+
+    # expand output path in current dir and make sure output path exists
+    outpath = File.expand_path( opts.output_path ) 
+    logger.debug "outpath=#{outpath}"
+    FileUtils.makedirs( outpath ) unless File.directory? outpath
+
+    manifest.each do |entry|
+      dest   = entry[0]
+      source = entry[1]
+                  
+      puts "Copying to #{dest} from #{source}..."
+      FileUtils.copy( source, with_output_path( dest, outpath ) )
+    end
+    
+    puts "Done."
+  end
+
+end # class GenTemplates
+
+end # class Slideshow

data/lib/slideshow/commands/list.rb

@@ -0,0 +1,32 @@
+module Slideshow
+
+class List
+
+  include Manifest   # gets us methods like installed_template_manifests, etc.
+
+### fix: remove opts, use config (wrapped!!)
+  
+  def initialize( logger, opts, config )
+    @logger  = logger
+    @opts    = opts
+    @config  = config
+  end
+
+  attr_reader :logger, :opts, :config
+
+
+  def run
+    manifests = installed_template_manifests
+    
+    puts ''
+    puts 'Installed templates include:'
+    
+    manifests.each do |manifest|
+      puts "  #{manifest[0]} (#{manifest[1]})"
+    end
+  end
+
+
+end # class List
+
+end # class Slideshow

data/lib/slideshow/config.rb

@@ -2,10 +2,39 @@ module Slideshow
 
 class Config
   
-  def initialize
-    # do nothing for now
+  def initialize( logger, opts )
+    @logger = logger
+    @opts   = opts
   end
 
+  attr_reader :logger, :opts
+
+
+  # todo/fix: fix references after this move to here, that is, Config class
+  # - used in syntax/uv_helper (use config.cache_dir to access?)
+  
+  def cache_dir
+    File.join( Env.home, '.slideshow' )
+  end
+
+  def config_dir
+    unless @config_dir  # first time? calculate config_dir value to "cache"
+      
+      if opts.config_path
+        @config_dir = opts.config_path
+      else
+        @config_dir = cache_dir
+      end
+    
+      # make sure path exists
+      FileUtils.makedirs( @config_dir ) unless File.directory? @config_dir
+    end
+    
+    @config_dir
+  end
+
+
+
   def load
     
     # load builtin config file @  <gem>/config/slideshow.yml

data/lib/slideshow/helpers/syntax/uv_helper.rb

@@ -24,10 +24,10 @@ def uv_worker( code, opts )
   uv_first_time = session.fetch( :uv_first_time, true )
   if uv_first_time
     session[ :uv_first_time ] = false
-    logger.debug "cache_dir=#{cache_dir}"
+    logger.debug "cache_dir=#{config.cache_dir}"
 
-    FileUtils.mkdir(cache_dir) unless File.exists?(cache_dir) if cache_dir
-    Uv.copy_files "xhtml", cache_dir  
+    FileUtils.mkdir(config.cache_dir) unless File.exists?(config.cache_dir) if config.cache_dir
+    Uv.copy_files "xhtml", config.cache_dir
   end
     
   # first time this theme gets used add it to content_for hash for templates to include   
@@ -35,7 +35,7 @@ def uv_worker( code, opts )
   if uv_themes[ theme ].nil?
     uv_themes[ theme ] = true
     
-    theme_content = File.read( "#{cache_dir}/css/#{theme}.css" )
+    theme_content = File.read( "#{config.cache_dir}/css/#{theme}.css" )
 
     theme_out =  %{/* styles for ultraviolet code syntax highlighting theme '#{theme}' */\n\n}
     theme_out << theme_content

data/lib/slideshow/manifest.rb

@@ -81,8 +81,8 @@ module Slideshow
       "#{Slideshow.root}/templates/*.txt"
     ]
     config_patterns  = [
-      "#{config_dir}/templates/*.txt",
-      "#{config_dir}/templates/*/*.txt"
+      "#{config.config_dir}/templates/*.txt",
+      "#{config.config_dir}/templates/*/*.txt"
     ]
     current_patterns = [
       "templates/*.txt",
@@ -98,8 +98,4 @@ module Slideshow
   end
     
   end # module  Manifest
-end # module Slideshow
-
-class Slideshow::Gen
-  include Slideshow::Manifest
-end
+end # module Slideshow

data/lib/slideshow/runner.rb

@@ -0,0 +1,130 @@
+module Slideshow
+
+class Runner
+
+  def initialize
+    @logger = Logger.new(STDOUT)
+    @logger.level = Logger::INFO
+
+    @opts    = Opts.new
+    @config  = Config.new( @logger, @opts )
+    @headers = Headers.new( @config )
+  end
+
+  attr_reader :logger, :opts, :config, :headers
+
+
+
+def load_plugins
+    
+  patterns = []
+  patterns << "#{config.config_dir}/lib/**/*.rb"
+  patterns << 'lib/**/*.rb' unless Slideshow.root == File.expand_path( '.' )  # don't include lib if we are in repo (don't include slideshow/lib)
+  
+  patterns.each do |pattern|
+    pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
+    Dir.glob( pattern ) do |plugin|
+      begin
+        puts "Loading plugins in '#{plugin}'..."
+        require( plugin )
+      rescue Exception => e
+        puts "** error: failed loading plugins in '#{plugin}': #{e}"
+      end
+    end
+  end
+end
+
+
+def run( args )
+
+  opt=OptionParser.new do |cmd|
+    
+    cmd.banner = "Usage: slideshow [options] name"
+    
+    cmd.on( '-o', '--output PATH', 'Output Path' ) { |path| opts.output_path = path }
+
+    cmd.on( '-g', '--generate',  'Generate Slide Show Templates (Using Built-In S6 Pack)' ) { opts.generate = true }
+    
+    cmd.on( "-t", "--template MANIFEST", "Template Manifest" ) do |t|
+      # todo: do some checks on passed in template argument
+      opts.manifest = t
+    end
+
+    # ?? opts.on( "-s", "--style STYLE", "Select Stylesheet" ) { |s| $options[:style]=s }
+    # ?? opts.on( "--version", "Show version" )  {}
+        
+    # ?? cmd.on( '-i', '--include PATH', 'Load Path' ) { |s| opts.put( 'include', s ) }
+
+    cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
+      opts.fetch_uri = uri
+    end
+    
+    cmd.on( '-c', '--config PATH', 'Configuration Path (default is ~/.slideshow)' ) do |path|
+      opts.config_path = path
+    end
+    
+    cmd.on( '-l', '--list', 'List Installed Templates' ) { opts.list = true }
+
+    # todo: find different letter for debug trace switch (use v for version?)
+    cmd.on( "-v", "--verbose", "Show debug trace" )  do
+       logger.datetime_format = "%H:%H:%S"
+       logger.level = Logger::DEBUG      
+    end
+ 
+    usage =<<EOS
+
+Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
+
+#{cmd.help}
+
+Examples:
+  slideshow microformats
+  slideshow microformats.textile         # Process slides using Textile
+  slideshow microformats.text            # Process slides using Markdown
+  slideshow microformats.rst             # Process slides using reStructuredText
+  slideshow -o slides microformats       # Output slideshow to slides folder
+
+More examles:
+  slideshow -g                           # Generate slide show templates using built-in S6 pack
+
+  slideshow -l                           # List installed slide show templates
+  slideshow -f s5blank                   # Fetch (install) S5 blank starter template from internet
+  slideshow -t s5blank microformats      # Use your own slide show templates (e.g. s5blank)
+
+Further information:
+  http://slideshow.rubyforge.org
+  
+EOS
+ 
+ 
+    cmd.on_tail( "-h", "--help", "Show this message" ) do
+         puts usage
+         exit
+    end
+  end
+
+  opt.parse!( args )
+  
+  config.load
+
+  puts Slideshow.generator
+
+  if opts.list?
+    List.new( logger, opts, config ).run   ### todo: remove opts (merge access into config)
+  elsif opts.generate?
+    GenTemplates.new( logger, opts, config ).run  ###  todo: remove opts
+  elsif opts.fetch?
+    Fetch.new( logger, opts, config ).run  ### todo: remove opts
+  else
+    load_plugins  # check for optional plugins/extension in ./lib folder
+
+    args.each do |fn|
+      Gen.new( logger, opts, config, headers ).create_slideshow( fn )
+    end
+  end
+end
+
+
+end # class Runner
+
+end # module Slideshow

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.1.0.beta7'
+  VERSION = '1.1.0.beta8'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 682290833
+  hash: 62724110
   prerelease: 6
   segments: 
   - 1
   - 1
   - 0
   - beta
-  - 7
-  version: 1.1.0.beta7
+  - 8
+  version: 1.1.0.beta8
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-12 00:00:00 Z
+date: 2012-06-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -153,13 +153,15 @@ files:
 - config/slideshow.builtin.yml
 - config/slideshow.yml
 - lib/slideshow.rb
+- lib/slideshow/commands/fetch.rb
+- lib/slideshow/commands/gen.rb
+- lib/slideshow/commands/gen_templates.rb
+- lib/slideshow/commands/list.rb
 - lib/slideshow/config.rb
-- lib/slideshow/fetch.rb
 - lib/slideshow/filters/debug_filter.rb
 - lib/slideshow/filters/headers_filter.rb
 - lib/slideshow/filters/slide_filter.rb
 - lib/slideshow/filters/text_filter.rb
-- lib/slideshow/gen.rb
 - lib/slideshow/headers.rb
 - lib/slideshow/helpers/analytics_helper.rb
 - lib/slideshow/helpers/background_helper.rb
@@ -178,6 +180,7 @@ files:
 - lib/slideshow/markup/rest.rb
 - lib/slideshow/markup/textile.rb
 - lib/slideshow/opts.rb
+- lib/slideshow/runner.rb
 - lib/slideshow/slide.rb
 - lib/slideshow/version.rb
 - templates/s6.txt