slideshow 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96e56005ffdb5a5e4b283c78b4364db18c1ee44c
-  data.tar.gz: f05f0d0a1505e753d63cec2fba596b6a7320b113
+  metadata.gz: c663d54cb5dd9931ee0e71fc1cd7bc622a9b48b5
+  data.tar.gz: fe26d19d250103c5895963d0be66810192a2eb7a
 SHA512:
-  metadata.gz: 026bb6dea474ff7e1982a7bf2b37ee922d361f8ce53d7dc057233aed203a203a8297d48b3470368d0a95c3912fb861cb918bc38e9b93bb4343bb4affb983452a
-  data.tar.gz: 5e1e7f44073bb3e40d65aeb1a5ec9c27d1ae0380bd7de7bf17852bdbd7050f187a10b1f99da8d800dfafe27846d8817c213b48ac3cd9b7be5e3403d829f0519e
+  metadata.gz: 348471ace5d0f27ca6d74c80056804794cb8ccaee1e45554566d837286e74f3b92461a95b3b98f7a0935150ea5d3ac62f9e3d8f9470c62727a6dbea07ca7dcca
+  data.tar.gz: 4e5f19a3bcc9c8e2c4e44d6c5de78672b867a4f1ce41f23d251bdc7cfca0ab50b7c0745e7ab8dead79a4bd5dca83bbab2db722676e97e5baf91498bcf476f0e7

data/README.md

@@ -6,7 +6,7 @@
 * gem       :: [rubygems.org/gems/slideshow](https://rubygems.org/gems/slideshow)
 * rdoc      :: [rubydoc.info/gems/slideshow](http://rubydoc.info/gems/slideshow)
 * templates :: [github.com/slideshow-templates](https://github.com/slideshow-templates)
-* forum     :: [groups.google.com/group/webslideshow](http://groups.google.com/group/webslideshow)
+* forum     :: [groups.google.com/group/wwwmake](http://groups.google.com/group/wwwmake)
 
 
 ## DESCRIPTION
@@ -16,7 +16,7 @@ using a wiki-style markup language that's easy-to-write and easy-to-read.
 The Slide Show (S9) project also collects and welcomes themes and ships
 "out-of-the-gem" with built-in support for "loss-free" gradient vector graphics themes.
 
-~~~
+```
 SYNOPSIS
     slideshow [global options] command [command options] [arguments...]
 
@@ -35,12 +35,12 @@ COMMANDS
     new, n             - Generate quick starter sample
     about, a           - (Debug) Show more version info
     help               - Shows a list of commands or help for one command
-~~~
+```
 
 
 ### `build` Command
 
-~~~
+```
 NAME
     build - Build slideshow
 
@@ -57,17 +57,15 @@ COMMAND OPTIONS
 
 EXAMPLES
     slideshow build microformats
-    slideshow build microformats.text            # Process slides using Markdown
-    slideshow build microformats.textile         # Process slides using Textile
-    slideshow build microformats.rst             # Process slides using reStructuredText
+    slideshow build microformats.text            
     slideshow build microformats -o slides       # Output slideshow to slides folder
     slideshow build microformats -t s5blank      # Use your own slide show templates (e.g. s5blank)
-~~~
+```
 
 
 ### `list` Command
 
-~~~
+```
 NAME
     list - List installed template packs
 
@@ -77,12 +75,12 @@ SYNOPSIS
 EXAMPLES
     slideshow list
     slideshow ls
-~~~
+```
 
 
 ### `install` Command
 
-~~~
+```
 NAME
     install - Install template pack
 
@@ -95,12 +93,12 @@ COMMAND OPTIONS
 EXAMPLES
     slideshow install impress.js
     slideshow install https://raw.github.com/.../impress.js.txt
-~~~
+```
 
 
 ### `new` Command
 
-~~~
+```
 NAME
     new - Generate quick starter sample
 
@@ -114,7 +112,7 @@ COMMAND OPTIONS
 EXAMPLES
     slideshow new
     slideshow new -t impress.js
-~~~
+```
 
 
 ## INSTALL
@@ -130,5 +128,7 @@ Use it as you please with no restrictions whatsoever.
 
 ## QUESTION? COMMENTS?
 
-Send them along to the [Free Web Slide Show Alternatives (S5, S6, S9, Slidy And Friends) Forum/Mailing List](http://groups.google.com/group/webslideshow).
+Send them along to the [wwwmake forum/mailing list](http://groups.google.com/group/wwwmake).
 Thanks!
+
+

data/Rakefile

@@ -11,19 +11,17 @@ Hoe.spec 'slideshow' do
   self.urls     = ['https://github.com/slideshow-s9/slideshow']
 
   self.author  = 'Gerald Bauer'
-  self.email   = 'webslideshow@googlegroups.com'
+  self.email   = 'wwwmake@googlegroups.com'
 
   self.extra_deps = [
-    ['slideshow-models',   '>= 2.4.0'],   ## Note: pull in all deps via slideshow-models (e.g. props, textutils, etc.)
-    ['slideshow-templates','>= 2.4.0'],
-    ['gli', '>= 2.5.6']
-    ## ['wikicloth', '>= 0.8.0']  make it a soft dependency   # mediawiki markup engine
-    ## ['RedCloth','>= 4.2.9']    make it a soft dependency   # textile markup engine
+    ['slideshow-models',   '>= 3.0.0'],   ## Note: pull in all deps via slideshow-models (e.g. props, textutils, etc.)
+    ['slideshow-templates','>= 3.0.0'],
+    ['gli', '>= 2.13.4']
   ]
 
   # switch extension to .markdown for gihub formatting
-  self.readme_file  = 'README.md'
-  self.history_file = 'HISTORY.md'
+  # self.readme_file  = 'README.md'
+  # self.history_file = 'HISTORY.md'
 
   self.licenses = ['Public Domain']
 
@@ -56,9 +54,10 @@ or add some extra (plugins) helpers (left, right, etc). Example:
   $ slideshow install plugins
 
 Questions? Comments? Send them along to the mailing list.
-https://groups.google.com/group/webslideshow
+https://groups.google.com/group/wwwmake
 
 ******************************************************************************
 EOS
 
 end
+

data/lib/slideshow/cli/main.rb

@@ -31,14 +31,11 @@ module Slideshow
    def self.config=(value)  @@config = value; end
    def self.config()        @@config; end
 
-   def self.headers=(value)  @@headers = value; end
-   def self.headers()        @@headers; end
 
 ## some setup code 
 logger  = LogUtils::Logger.root
 opts    = Slideshow::Opts.new 
 config  = Slideshow::Config.new( opts )
-headers = Slideshow::Headers.new( config )  ##  NB: needed for build - move into build - why? why not?
 
 config.load
 
@@ -56,10 +53,7 @@ xxx_program_long_desc = <<EOS
 Slide Show (S9) is a free web alternative to PowerPoint or Keynote in Ruby
 
 Examples:
-  slideshow microformats
-  slideshow microformats.text            # Process slides using Markdown (#{config.known_markdown_extnames.join(', ')})
-  slideshow microformats.textile         # Process slides using Textile (#{config.known_textile_extnames.join(', ')})
-  slideshow microformats.rst             # Process slides using reStructuredText (#{config.known_rest_extnames.join(', ')})
+  slideshow microformats.text
   slideshow -o slides microformats       # Output slideshow to slides folder
 
 More examles:
@@ -135,14 +129,8 @@ command [:build, :b] do |c|
     
     PluginLoader.new( config ).load_plugins  # check for optional plugins/extension in ./lib folder
 
-    finder = FileFinder.new( config )
-
     args.each do |arg|
-      files = finder.find_files( arg )
-      files.each do |file| 
-       ### fix/todo: reset/clean headers
-        Slideshow::Gen.new( opts, config, headers ).create_slideshow( file )
-      end
+      Slideshow::Gen.new( config ).create_slideshow( arg )
     end
  
   end
@@ -155,7 +143,7 @@ command [:list,:ls,:l] do |c|
   c.action do |g,o,args|
     logger.debug 'hello from list command'
     
-    Slideshow::List.new( opts, config ).run   ### todo: remove opts (merge access into config)
+    Slideshow::List.new( config ).run   ### todo: remove opts (merge access into config)
   end
 end
 
@@ -171,11 +159,11 @@ command [:install,:i] do |c|
     logger.debug 'hello from install command'
     
     if opts.fetch_all?
-      Slideshow::Fetch.new( opts, config ).fetch_all  ## todo: remove opts merge into config
+      Slideshow::Fetch.new( config ).fetch_all  ## todo: remove opts merge into config
     end
     
     args.each do |arg|
-      Slideshow::Fetch.new( opts, config ).fetch( arg )  ## todo: remove opts merge into config
+      Slideshow::Fetch.new( config ).fetch( arg )  ## todo: remove opts merge into config
     end
   end
 end
@@ -187,8 +175,10 @@ command [:update,:u] do |c|
   c.action do |g,o,args|
     logger.debug 'hello from update command'
 
-    # todo: move update to its own command
-    Slideshow::Fetch.new( opts, config ).update()
+    ##########
+    # todo: move update to its own command !!!!!!!!!!!!!!!!!!!
+    
+    Slideshow::Fetch.new( config ).update()
   end
 end
 
@@ -211,7 +201,7 @@ command [:new,:n] do |c|
     logger.debug 'hello from new command'
 
     ##  use quick_manifest (default) otherwise pass along/use args
-    Slideshow::Quick.new( opts, config ).run  ### todo: remove opts
+    Slideshow::Quick.new( config ).run
 
   end
 end
@@ -231,7 +221,7 @@ command [:plugins,:plugin,:p] do |c|
   c.action do
     logger.debug 'hello from plugin command'
 
-    Slideshow::Plugins.new( opts, config ).run  ### todo: remove opts (merge access into config)
+    Slideshow::Plugins.new( config ).run
   end
 end
 
@@ -262,10 +252,6 @@ pre do |g,c,o,args|
     # dump Slideshow settings
     config.dump
     puts
-      
-    # dump Markdown settings
-    Markdown.dump
-    puts
   end
 
   logger.debug "   executing command #{c.name}"

data/lib/slideshow/cli/main_utils.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+
 class PluginLoader
   include LogUtils::Logging
   include Slideshow::PluginHelper  # e.g. gets us load_plugins machinery
@@ -12,56 +13,6 @@ class PluginLoader
 end
 
 
-class FileFinder
-  include LogUtils::Logging
-
-  def initialize( config )
-    @config = config
-  end
-  
-  attr_reader :config
-
-  def find_file_with_known_extension( fn )
-    dirname  = File.dirname( fn )
-    basename = File.basename( fn, '.*' )
-    extname  = File.extname( fn )
-    logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
-
-    config.known_extnames.each do |e|
-      newname = File.join( dirname, "#{basename}#{e}" )
-      logger.debug "File.exists? #{newname}"
-      return newname if File.exists?( newname )
-    end  # each extension (e)
-      
-    nil   # not found; return nil
-  end
-
-
-  def find_files( file_or_dir_or_pattern )
-    filtered_files = []
- 
-    ## for now process/assume only single file
-    
-    ## (check for missing extension)
-    if File.exists?( file_or_dir_or_pattern )
-      file = file_or_dir_or_pattern
-      logger.debug "  adding file '#{file}'..."
-      filtered_files << file
-    else  # check for existing file w/ missing extension
-      file = find_file_with_known_extension( file_or_dir_or_pattern )
-      if file.nil?
-        puts "  skipping missing file '#{file_or_dir_or_pattern}{#{config.known_extnames.join(',')}}'..."
-      else
-        logger.debug "  adding file '#{file}'..."
-        filtered_files << file
-      end
-    end
-    
-    filtered_files 
-  end # method find_files
-end # class FileFinder
-
-
 class SysInfo
   def initialize( config )
     @config = config
@@ -77,7 +28,7 @@ class SysInfo
 Gems versions:
   - pakman #{Pakman::VERSION}
   - fetcher #{Fetcher::VERSION}
-  - markdown #{Markdown::VERSION}
+  - kramdown #{Kramdown::VERSION}
   - textutils #{TextUtils::VERSION}
   - logutils #{LogKernel::VERSION}
   - props #{Props::VERSION}
@@ -98,16 +49,8 @@ EOS
   config.dump
   puts
       
-  # dump Markdown settings
-  Markdown.dump
-  puts
-
   # todo:
-  # add verison for rubygems
-
-  ## todo: add more gem version info
-  #- redcloth
-  #- kramdown
+  # add version for rubygems
 
       
     dump_load_path   # helps debugging pluggin loading (e.g. Ruby 1.9.2> no longer includes ./ in load path)

data/lib/slideshow/cli/opts.rb

@@ -3,6 +3,9 @@
 module Slideshow
 
 
+## note: just extents version in slideshow-models
+
+
 class Opts
 
   def merge_gli_options!( options={} )
@@ -25,105 +28,7 @@ class Opts
     @quick_manifest =   options[:template]  if options[:template].present?
   end
 
-
-  def header_level=(value)
-    @header_level = value.to_i
-  end
-  
-  def header_level
-    ## todo: check   0 is not nil?
-    @header_level || 1
-  end
-
-  def slide=(boolean)
-    @slide = boolean
-  end
-
-  def slide?
-    return false if @slide.nil?   # default slide flag is false
-    @slide == true
-  end
-
-  def takahashi=(boolean)
-    @takahashi = boolean
-  end
-
-  def takahashi?
-    return false if @takahashi.nil?   # default takahashi flag is false
-    @takahashi == true
-  end
-
-  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
-  end
-
-
-
-  def quick_manifest=(value)
-    @quick_manifest = value
-  end
-  
-  def quick_manifest
-    @quick_manifest || 'welcome'
-  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 includes=(value)
-    @includes = value
-  end
-
-  def includes
-    # fix: use os-agnostic delimiter (use : for Mac/Unix?)
-    @includes.nil? ? [] : @includes.split( ';' )
-  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
 
 end # module Slideshow
+

data/lib/slideshow/cli/version.rb

@@ -6,9 +6,9 @@
 
 module SlideshowCli
 
-  MAJOR = 2
-  MINOR = 4
-  PATCH = 1
+  MAJOR = 3
+  MINOR = 0
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slideshow
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-10 00:00:00.000000000 Z
+date: 2016-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slideshow-models
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: slideshow-templates
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.6
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,17 +72,17 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: Slide Show (S9) - A Free Web Alternative to PowerPoint and Keynote in
   Ruby
-email: webslideshow@googlegroups.com
+email: wwwmake@googlegroups.com
 executables:
 - slideshow
 extensions: []
@@ -110,7 +110,7 @@ post_install_message: "*********************************************************
   \ \n  $ slideshow install deck.js\n  \nand use like\n  \n  $ slideshow build welcome.text
   -t impress.js\n  \nor\n  \n  $ slideshow build welcome.text -t deck.js\n \nor add
   some extra (plugins) helpers (left, right, etc). Example:\n  \n  $ slideshow install
-  plugins\n\nQuestions? Comments? Send them along to the mailing list.\nhttps://groups.google.com/group/webslideshow\n\n******************************************************************************\n"
+  plugins\n\nQuestions? Comments? Send them along to the mailing list.\nhttps://groups.google.com/group/wwwmake\n\n******************************************************************************\n"
 rdoc_options:
 - "--main"
 - README.md
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and Keynote in Ruby