slideshow 2.3.0 → 2.4.0

data/lib/slideshow/cli/main.rb

@@ -1,32 +1,55 @@
 # encoding: utf-8
 
+### NOTE: wrap gli config into a class
+##  see github.com/davetron5000/gli/issues/153
 
-require 'gli'
 
-require 'slideshow/cli/main_utils'
+module Slideshow
 
+  class Tool
+     def initialize
+       LogUtils::Logger.root.level = :info   # set logging level to info 
+     end
 
-include GLI::App
+     def run( args )
+       puts SlideshowCli.banner
+       Toolii.run( args )
+     end
+  end
 
-program_desc 'Slide Show (S9) - a free web alternative to PowerPoint and Keynote in Ruby'
 
-version Slideshow::VERSION
+  class Toolii
+    extend GLI::App
 
+   def self.logger=(value) @@logger=value; end
+   def self.logger()       @@logger; end
 
-## some setup code 
+   ## todo: find a better name e.g. change to settings? config? safe_opts? why? why not?
+   def self.opts=(value)  @@opts = value; end
+   def self.opts()        @@opts; end
 
-LogUtils::Logger.root.level = :info   # set logging level to info 
+   def self.config=(value)  @@config = value; end
+   def self.config()        @@config; end
 
-logger = LogUtils::Logger.root
+   def self.headers=(value)  @@headers = value; end
+   def self.headers()        @@headers; end
 
-opts    = Slideshow::Opts.new
+## 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
 
 
+
+program_desc 'Slide Show (S9) - a free web alternative to PowerPoint and Keynote in Ruby'
+
+version SlideshowCli::VERSION
+
+
+=begin
 ## gets all merged in one paragraph - does not honor whitespace
 xxx_program_long_desc = <<EOS
          
@@ -51,6 +74,7 @@ Further information:
   http://slideshow-s9.github.io
 
 EOS
+=end
 
 
 ## "global" options (switches/flags)
@@ -169,15 +193,6 @@ command [:update,:u] do |c|
 end
 
 
-######
-# add command :g,:gen,:generate ??? why? why not?  better just git clone repos
-#  or use command copy?
-#
-#   cmd.on( '-g', '--generate',  'Generate Slide Show Templates (using built-in S6 Pack)' ) { opts.generate = true }
-#
-#  GenTemplates.new( opts, config ).run  ###  todo: remove opts
-
-
 desc 'Generate quick starter sample'
 command [:new,:n] do |c|
 
@@ -276,4 +291,7 @@ on_error do |e|
 end
 
 
-exit run(ARGV)
+#### exit run(ARGV)   ## note: use Toolii.run( ARGV ) outside of class
+
+  end  # class Toolii
+end  # module Slideshow

data/lib/slideshow/cli/main_utils.rb

@@ -79,12 +79,18 @@ Gems versions:
   - fetcher #{Fetcher::VERSION}
   - markdown #{Markdown::VERSION}
   - textutils #{TextUtils::VERSION}
+  - logutils #{LogKernel::VERSION}
   - props #{Props::VERSION}
 
-        Env home: #{Env.home}
-Slideshow config: #{config.config_dir}
- Slideshow cache: #{config.cache_dir}
-  Slideshow root: #{Slideshow.root}
+  - slideshow-models #{Slideshow::VERSION}
+  - slideshow-templates #{SlideshowTemplates::VERSION}
+  - slideshow #{SlideshowCli::VERSION}
+
+                 Env home: #{Env.home}
+         Slideshow config: #{config.config_dir}
+          Slideshow cache: #{config.cache_dir}
+           Slideshow root: #{Slideshow.root}
+  SlideshowTemplates root: #{SlideshowTemplates.root}
 
 EOS
 

data/lib/slideshow/cli/opts.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Slideshow
 
 
@@ -124,4 +126,4 @@ class Opts
 
 end # class Opts
 
-end # module Slideshow
+end # module Slideshow

data/lib/slideshow/cli/version.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+###
+# Note: Slideshow.version already used by core, that is, slideshow-models
+#
+
+module SlideshowCli
+
+  MAJOR = 2
+  MINOR = 4
+  PATCH = 0
+  VERSION = [MAJOR,MINOR,PATCH].join('.')
+
+  def self.version
+    VERSION
+  end
+
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(File.dirname(File.dirname(__FILE__)))) )}"
+  end
+
+  def self.banner
+    "slideshow/#{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
+  end
+
+end # module SlideshowCli

metadata

@@ -1,219 +1,135 @@
 --- !ruby/object:Gem::Specification
 name: slideshow
 version: !ruby/object:Gem::Version
-  version: 2.3.0
-  prerelease: 
+  version: 2.4.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: props
-  requirement: &88039630 !ruby/object:Gem::Requirement
-    none: false
+  name: slideshow-models
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *88039630
-- !ruby/object:Gem::Dependency
-  name: markdown
-  requirement: &88039410 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *88039410
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: textutils
-  requirement: &88039190 !ruby/object:Gem::Requirement
-    none: false
+  name: slideshow-templates
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *88039190
-- !ruby/object:Gem::Dependency
-  name: pakman
-  requirement: &88038970 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *88038970
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &88038760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *88038760
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
-  name: logutils
-  requirement: &88038540 !ruby/object:Gem::Requirement
-    none: false
+  name: gli
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *88038540
-- !ruby/object:Gem::Dependency
-  name: gli
-  requirement: &88038320 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.5.6
-  type: :runtime
-  prerelease: false
-  version_requirements: *88038320
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &88038100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
-  version_requirements: *88038100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &88037880 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.13'
   type: :development
   prerelease: false
-  version_requirements: *88037880
-description: ! "The Slide Show (S9) Ruby gem lets you create slide shows and author
-  slides in plain text\r\nusing a wiki-style markup language that's easy-to-write
-  and easy-to-read.\r\nThe Slide Show (S9) project also collects and welcomes themes
-  and ships\r\n\"out-of-the-gem\" with built-in support for \"loss-free\" gradient
-  vector graphics themes.\r\n\r\n~~~\r\nSYNOPSIS\r\n    slideshow [global options]
-  command [command options] [arguments...]\r\n\r\nVERSION\r\n    2.0.0\r\n\r\nGLOBAL
-  OPTIONS\r\n    -c, --config=PATH - Configuration Path (default: ~/.slideshow)\r\n
-  \   --verbose         - (Debug) Show debug messages\r\n    --version         - Show
-  version\r\n\r\nCOMMANDS\r\n    build, b           - Build slideshow\r\n    install,
-  i         - Install template pack\r\n    list, ls, l        - List installed template
-  packs\r\n    new, n             - Generate quick starter sample\r\n    about, a
-  \          - (Debug) Show more version info\r\n    help               - Shows a
-  list of commands or help for one command\r\n~~~"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.13'
+description: Slide Show (S9) - A Free Web Alternative to PowerPoint and Keynote in
+  Ruby
 email: webslideshow@googlegroups.com
 executables:
 - slideshow
 extensions: []
 extra_rdoc_files:
+- HISTORY.md
 - Manifest.txt
-- templates/s6.txt
+- README.md
 files:
-- History.markdown
+- HISTORY.md
 - Manifest.txt
-- README.markdown
+- README.md
 - Rakefile
 - bin/slideshow
-- config/slideshow.builtin.yml
-- config/slideshow.index.yml
-- config/slideshow.yml
 - lib/slideshow.rb
-- lib/slideshow/cli/commands/fetch.rb
-- lib/slideshow/cli/commands/gen.rb
-- lib/slideshow/cli/commands/gen_templates.rb
-- lib/slideshow/cli/commands/list.rb
-- lib/slideshow/cli/commands/plugins.rb
-- lib/slideshow/cli/commands/quick.rb
 - lib/slideshow/cli/main.rb
 - lib/slideshow/cli/main_utils.rb
 - lib/slideshow/cli/opts.rb
-- lib/slideshow/config.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/headers.rb
-- lib/slideshow/helpers/background_helper.rb
-- lib/slideshow/helpers/capture_helper.rb
-- lib/slideshow/helpers/directive_helper.rb
-- lib/slideshow/helpers/markdown_helper.rb
-- lib/slideshow/helpers/source_helper.rb
-- lib/slideshow/helpers/step_helper.rb
-- lib/slideshow/helpers/syntax/coderay_helper.rb
-- lib/slideshow/helpers/syntax/sh_helper.rb
-- lib/slideshow/helpers/syntax/uv_helper.rb
-- lib/slideshow/helpers/text_helper.rb
-- lib/slideshow/manifest_helpers.rb
-- lib/slideshow/markup/markdown.rb
-- lib/slideshow/markup/mediawiki.rb
-- lib/slideshow/markup/rest.rb
-- lib/slideshow/markup/textile.rb
-- lib/slideshow/plugin_helpers.rb
-- lib/slideshow/slide.rb
-- lib/slideshow/version.rb
-- templates/s6.txt
-- templates/s6.txt.gen
-- templates/s6/jquery.js
-- templates/s6/jquery.microsoft.js
-- templates/s6/jquery.slideshow.js
-- templates/s6/print.css
-- templates/s6/projection.css
-- templates/s6/screen.css
-- templates/slides.html.erb
-- templates/slides.pdf.html.erb
-- templates/style.css.erb
-- templates/welcome.text
-- templates/welcome.txt.quick
-homepage: http://slideshow-s9.github.io
-licenses: []
-post_install_message: ! "******************************************************************************\n\nTip:
-  Try some new template packs. Example:\n\n  $ slideshow install impress.js\n  \n
-  \ or\n  \n  $ slideshow install deck.js\n  \n  and use like\n  \n  $ slideshow build
-  welcome.text -t impress.js\n  \n  or\n  \n  $ slideshow build welcome.text -t deck.js\n\n\nQuestions?
-  Comments? Send them along to the mailing list.\nhttps://groups.google.com/group/webslideshow\n\n******************************************************************************\n"
+- lib/slideshow/cli/version.rb
+homepage: https://github.com/slideshow-s9/slideshow
+licenses:
+- Public Domain
+metadata: {}
+post_install_message: "******************************************************************************\n\nTip:
+  Try some new template packs. Example:\n\n  $ slideshow install impress.js\n  \nor\n
+  \ \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"
 rdoc_options:
-- --main
-- README.markdown
+- "--main"
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: slideshow
-rubygems_version: 1.8.17
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and Keynote in Ruby
 test_files: []

data/History.markdown

@@ -1,171 +0,0 @@
-=== 0.9.8 / 2011-02-06
-
-* Added support for HTTPS and HTTP redirect for downloads
-* Update builtin S6 blank template
-
-=== 0.9.7 / 2010-07-22
-
-* Added support for reStructedText (using pandoc-ruby gem)
-* Update builtin S6 blank templates (toggle slide counter, debug, etc.)
-* Update SyntaxHighlighter helper
-
-=== 0.9.6 / 2010-07-18
-
-* Update builtin S6 blank templates (adding autoplay, custom transitions, custom title selector, and more)
-
-=== 0.9.5 / 2010-07-14
-
-* Minor fix (for custom converter methods)
-
-=== 0.9.4 / 2010-07-14
-
-* Added support for custom converter methods (for Markdown processing)
-
-=== 0.9.3 / 2010-07-13
-
-* Added support for pandoc-ruby (for Markdown processing); skip %-filters; break slides using div/h1 rule [Thanks David Sanson]
-
-=== 0.9.2 / 2010-07-11
-
-* Change default template pack from s6gradients to s6blank
-* Added syntax highlighting helper (sh) for SyntaxHighlighter JavaScript Library
-* Added gradient and background helper
-* Added simplified parameters for Django-style expressions and statements
-* Added support for %-directives (e.g. %helper, %css, %yourown, etc)
-* Minor fixes 
-
-=== 0.9  / 2010-07-04
-
-* Added support for !SLIDE (and alternative syntax %slide)
-* Added support for comments using %, %begin/%end and %end
-* Added more helpers (step, google_analytics, left/right for two-column layouts)
-* Added support for Django-style expressions and statements as an alternative to <% %>
-* Added support for configuring text filters in slideshow.yml
-* Added support for configuring Markdown engines in slideshow.yml
-* Added fetch shortcuts (configure in slideshow.yml)
-* Added support for template manifests w/o .txt extensions 
-* Removed old options -s5,--fullerscreen (use -t s5blank or -t fullerscreen instead) 
-
-=== 0.8.5  / 2010-06-25
-
-* Added workaround for RedCloth 4 (Java-only) multi-byte character bug 
-
-=== 0.8.4  / 2010-06-24
-
-* Added support for proxy via HTTP_PROXY env for fetching templates from the internet
-
-=== 0.8.3  / 2010-06-23
-
-* Added support for @slides and @content variables in templates
-
-=== 0.8.2  / 2010-06-19
-
-* Add pdf templates to built-in S6 template package
-* Started to add hash support to S6 script  
-
-=== 0.8.1 / 2010-06-13
-
-* Add patches for Ruby 1.9 compatibility [Thanks Lorenzo Riccucci]
-* Replaced BlueCloth 1.x with Kramdown 0.8 as default markdown engine
-* Minor fixes
-
-=== 0.8 / 2009-03-14
-
-* Added -f/--fetch URI option; lets you fetch templates from the internet
-* Added -l/--list option; list all installed templates
-* Added -c/--config PATH option; lets you set config folder (default is ~/.slideshow)
-* Moved S5 v11 blank package out of core/gem
-
-=== 0.7.8 / 2009-03-09
-
-* Added SLIDESHOWOPT env variable; lets you set default command line options (e.g. -o slides)
-* Using Hoe Rake tasks to manage gem; adding required files and build script
-* Move templates folder to top-level (out of lib/)
-* Minor code clean-up
-
-=== 0.7.7	/ 2009-03-02
-
-* Added new helpers for syntax highlighting (using ultraviolet and coderay gems)
-
-=== 0.7.6	/ 2009-02-24
-
-* Added plugin/helpers support
-* Added include and content_for helpers
-* Added __SKIP__/__END__ pragmas
-
-=== 0.7.5	/ 2009-02-19
-
-* Updated s6 templates (added support for steps/incrementals)
-
-=== 0.7.4	/ 2009-02-06
-
-* Added sample template package generation for S5 v11 blank package
-
-=== 0.7.3	/ 2009-02-04
-
-* Added check for installed markdown libs/gems
-* Added support for rdiscount, rpeg-markdown libs/gems
-
-=== 0.7.2	/ 2009-01-27
-
-* Added support for output directory switch -o/--output and relative or absolute source file [Thanks Jorge L. Cangas]
-
-=== 0.7.1	/ 2009-01-26
-
-* Fixed newline in manifests for file paths on unix bug
-
-=== 0.7	/ 2009-01-26
-
-* Adding support for custom template packages using manifests
-
-=== 0.6.1	/ 2008-08-31
-
-* Fixed gradient header bug [Thanks Suraj N. Kurapati]
-
-=== 0.6	/ 2008-08-26
-
-* Added support for custom templates
-
-=== 0.5.2	/ 2008-07-23
-
-* Pumped RedCloth gem dependency to use new 4.0 release
-
-=== 0.5.1	/ 2008-07-08
-
-* Added support for S6 JavaScript slide shows as new default
-
-=== 0.5	/ 2008-07-03
-
-* Added support for S5
-
-=== 0.4.2	/ 2008-05-20
-
-* Added escaping of code blocks and unescaping of html entities in highlighted code
-
-=== 0.4.1	/ 2008-05-19
-
-* {{{ and }}} shortcuts now supported standing in for <pre class='code'> and </pre>
-* Added patch for h1 pattern
-
-=== 0.4	/ 2008-05-17
-
-* Added support for code syntax highlighting using Ultraviolet gem [Thanks zimbatm]
-
-=== 0.3.1	/ 2008-05-17
-
-* Switched markdown processor to maruku gem [Thanks zimbatm]
-* Fix gem executable install for unix systems [Thanks zimbatm]
-
-=== 0.3	/ 2008-03-09
-
-* Added support for Markdown using BlueCloth
-* Moved all templates into templates folder processed using erb (embedded ruby)
-
-=== 0.2 /	2008-02-26
-
-* Added theming support using svg gradients
-* Added compatibility support for Opera Show (no browser plugin/addon required)
-
-=== 0.1	/ 2008-02-17
-
-* Everything is new. First release