slideshow 2.0.1 → 2.1.0

data/Manifest.txt

@@ -21,7 +21,6 @@ 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/analytics_helper.rb
 lib/slideshow/helpers/background_helper.rb
 lib/slideshow/helpers/capture_helper.rb
 lib/slideshow/helpers/directive_helper.rb

data/config/slideshow.yml

@@ -74,21 +74,20 @@ rest:
 
 
 #############################
-# shortcuts for fetching template packs
+# shortcuts for fetching template packs & plugins
 #   map shortcut to URI
 fetch:
   s6syntax: https://raw.github.com/slideshow-s9/slideshow-s6-syntax-highlighter/master/s6syntax.txt
   s6blank: https://raw.github.com/slideshow-s9/slideshow-s6-blank/master/s6blank.txt
   s5blank: https://raw.github.com/slideshow-s9/slideshow-s5-blank/master/s5blank.txt
   s5themes: https://raw.github.com/slideshow-s9/slideshow-s5-themes/master/s5themes.txt
-  fullerscreen: https://raw.github.com/slideshow-s9/slideshow-fullerscreen/master/fullerscreen.txt
   slidy: https://raw.github.com/slideshow-s9/slideshow-slidy/master/slidy.txt
   g5: https://raw.github.com/slideshow-s9/slideshow-google-html5-slides/master/g5.txt
-  slippy: https://raw.github.com/slideshow-s9/slideshow-slippy/master/slippy.txt
   csss: https://raw.github.com/slideshow-s9/slideshow-csss/master/csss.txt
   deck.js: https://raw.github.com/slideshow-s9/slideshow-deck.js/master/deck.js.txt
   impress.js: https://raw.github.com/slideshow-s9/slideshow-impress.js/master/impress.js.txt
   shower: https://raw.github.com/slideshow-s9/slideshow-shower/master/shower.txt
+  analytics: https://raw.github.com/slideshow-s9/analytics/master/analytics.txt.plugin
 
 ###########################
 # shortcuts for quick starter templates

data/lib/slideshow.rb

@@ -64,7 +64,6 @@ require 'slideshow/markup/markdown'
 # load built-in (required) helpers/plugins
 require 'slideshow/helpers/text_helper'
 require 'slideshow/helpers/capture_helper'
-require 'slideshow/helpers/analytics_helper'
 require 'slideshow/helpers/table_helper'
 require 'slideshow/helpers/step_helper'
 require 'slideshow/helpers/background_helper'

data/lib/slideshow/cli/commands/fetch.rb

@@ -26,9 +26,9 @@ class Fetch
     
     ## check for builtin shortcut (assume no / or \) 
     if src.index( '/' ).nil? && src.index( '\\' ).nil?
-      shortcut = src.clone
+      shortcut = src.dup
       src = config.map_fetch_shortcut( src )
-      
+
       if src.nil?
         puts "** Error: No mapping found for fetch shortcut '#{shortcut}'."
         return
@@ -37,7 +37,31 @@ class Fetch
     else
       shortcut = nil
     end
- 
+
+    ## if manifest includes .plugin assume it's a plugin
+    if src.include?( '.plugin' )
+      fetch_plugin( src )
+    else # otherwise assume it's a template pack
+      fetch_template( src )
+    
+      ###################################
+      ## step 2) if shortcut exists (auto include quickstarter manifest w/ same name/key)
+    
+      if shortcut.present?
+      
+        src = config.map_quick_shortcut( shortcut )
+        return if src.nil?   # no shortcut found; sorry; returning (nothing more to do)
+      
+        puts "  Mapping quick shortcut '#{shortcut}' to: #{src}"
+
+        fetch_quick( src )
+      end
+    end
+
+  end # method run
+
+
+  def fetch_template( src )
     # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
     # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
     uri = URI.parse( src )
@@ -50,31 +74,35 @@ class Fetch
     logger.debug "pakpath >#{pakpath}<"
   
     Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+  end
+
+  def fetch_quick( src )
+    uri = URI.parse( src )
+    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
     
-    ###################################
-    ## step 2) if shortcut exists (auto include quickstarter manifest w/ same name/key)
-    
-    if shortcut.present?
-      
-      src = config.map_quick_shortcut( shortcut )
-      return if src.nil?   # no shortcut found; sorry; returning (nothing more to do)
-      
-      puts "  Mapping quick shortcut '#{shortcut}' to: #{src}"
+    # downcase basename w/ extension (remove .txt)
+    pakname = File.basename( uri.path ).downcase.gsub('.txt','')
+    pakpath = File.expand_path( "#{config.config_dir}/templates/#{pakname}" )
+
+    logger.debug "pakname >#{pakname}<"
+    logger.debug "pakpath >#{pakpath}<"
  
-      uri = URI.parse( src )
-      logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+  end
+
+  def fetch_plugin( src )
+    uri = URI.parse( src )
+    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
     
-      # downcase basename w/ extension (remove .txt)
-      pakname = File.basename( uri.path ).downcase.gsub('.txt','')
-      pakpath = File.expand_path( "#{config.config_dir}/templates/#{pakname}" )
+    # downcase basename w/ extension (remove .txt)
+    pakname = File.basename( uri.path ).downcase.gsub('.txt','').gsub('.plugin','')
+    pakpath = File.expand_path( "#{config.config_dir}/plugins/#{pakname}" )
 
-      logger.debug "pakname >#{pakname}<"
-      logger.debug "pakpath >#{pakpath}<"
+    logger.debug "pakname >#{pakname}<"
+    logger.debug "pakpath >#{pakpath}<"
  
-      Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
-    end
-    
-  end # method run
+    Pakman::Fetcher.new( logger ).fetch_pak( src, pakpath )
+  end
 
 end # class Fetch
 

data/lib/slideshow/cli/commands/list.rb

@@ -19,7 +19,21 @@ class List
     home = Env.home
     ## replace home w/ ~ (to make out more readable (shorter))
     ## e.g. use gsub( home, '~' )
-    
+
+    puts ''
+    puts 'Installed plugins in search path'
+
+    installed_plugin_manifest_patterns.each_with_index do |pattern,i|
+      puts "    [#{i+1}] #{pattern.gsub(home,'~')}"
+    end
+    puts '  include:'
+
+    installed_plugin_manifests.each do |manifest|
+      pakname      = manifest[0].gsub('.txt','').gsub('.plugin','')
+      manifestpath = manifest[1].gsub(home,'~')
+      puts "%16s (%s)" % [pakname,manifestpath]
+    end
+
     puts ''
     puts 'Installed quickstarter packs in search path'
 

data/lib/slideshow/cli/commands/plugins.rb

@@ -16,14 +16,18 @@ class Plugins
   attr_reader :opts, :config
 
   def run
+    home = Env.home
+    ## replace home w/ ~ (to make out more readable (shorter))
+    ## e.g. use gsub( home, '~' )
+
     puts ''
     puts 'Plugin scripts on the load path'
     
     find_plugin_patterns.each_with_index do |pattern,i|
-      puts "    [#{i+1}] #{pattern}"
+      puts "    [#{i+1}] #{pattern.gsub(home,'~')}"
     end
     puts '  include:'
-    
+
     plugins = find_plugins
     if plugins.empty?
       puts "    -- none --"
@@ -31,7 +35,7 @@ class Plugins
       plugins.each do |plugin|
         ## NB: use full_path - since Ruby 1.9.2 - ./ no longer included in load path for security
         plugin_fullpath = File.expand_path( plugin )
-        puts "    #{plugin} (#{plugin_fullpath})"
+        puts "    #{plugin.gsub(home,'~')} (#{plugin_fullpath})"
       end
     end
   end

data/lib/slideshow/manifest_helpers.rb

@@ -3,7 +3,30 @@ module Slideshow
 module ManifestHelper
 
   ## shared methods for handling manifest lookups
-  
+
+  def installed_plugin_manifest_patterns
+    # 1) search ./plugins
+    # 2) search config_dir/plugins
+
+    config_patterns  = [
+      "#{config.config_dir}/plugins/*.{txt.plugin,plugin.txt}",
+      "#{config.config_dir}/plugins/*/*.{txt.plugin,plugin.txt}"
+    ]
+    current_patterns = [
+      "plugins/*.{txt.plugin,plugin.txt}",
+      "plugins/*/*.{txt.plugin,plugin.txt}"
+    ]
+    
+    patterns = []
+    patterns += current_patterns
+    patterns += config_patterns
+  end
+
+  def installed_plugin_manifests  # quickstarter templates
+    Pakman::Finder.new( logger ).find_manifests( installed_plugin_manifest_patterns )
+  end
+
+
   def installed_template_manifest_patterns
     # 1) search ./templates
     # 2) search config_dir/templates

data/lib/slideshow/plugin_helpers.rb

@@ -4,7 +4,24 @@ module PluginHelper
 
   def find_plugin_patterns
     patterns = []
+
+    ###
+    #  todo/fix: only include rb files listed in plugin manifests!
+    #  - for now load all ruby files in plugins folder
+
+    patterns << "#{config.config_dir}/plugins/**/*.rb"
+
+    ######
+    # also allow "ad-hoc" plugins e.g. no manifest required (not installed)
+    #   just ruby scripts in lib in config folder or working folder
+
     patterns << "#{config.config_dir}/lib/**/*.rb"
+
+    #########
+    #  todo/fix: only include rb files listed in plugin manifest (see above!)
+
+    patterns << 'plugins/**/*.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
   end

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '2.0.1'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slideshow
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
-  requirement: &83862160 !ruby/object:Gem::Requirement
+  requirement: &84739570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *83862160
+  version_requirements: *84739570
 - !ruby/object:Gem::Dependency
   name: markdown
-  requirement: &83861940 !ruby/object:Gem::Requirement
+  requirement: &84739350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *83861940
+  version_requirements: *84739350
 - !ruby/object:Gem::Dependency
   name: textutils
-  requirement: &83861720 !ruby/object:Gem::Requirement
+  requirement: &84739130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *83861720
+  version_requirements: *84739130
 - !ruby/object:Gem::Dependency
   name: pakman
-  requirement: &83861500 !ruby/object:Gem::Requirement
+  requirement: &84738910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *83861500
+  version_requirements: *84738910
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &83861290 !ruby/object:Gem::Requirement
+  requirement: &84738700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 3.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *83861290
+  version_requirements: *84738700
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &83861070 !ruby/object:Gem::Requirement
+  requirement: &84738480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *83861070
+  version_requirements: *84738480
 - !ruby/object:Gem::Dependency
   name: logutils
-  requirement: &83860850 !ruby/object:Gem::Requirement
+  requirement: &84731960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *83860850
+  version_requirements: *84731960
 - !ruby/object:Gem::Dependency
   name: gli
-  requirement: &83860630 !ruby/object:Gem::Requirement
+  requirement: &84731560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 2.5.6
   type: :runtime
   prerelease: false
-  version_requirements: *83860630
+  version_requirements: *84731560
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83860410 !ruby/object:Gem::Requirement
+  requirement: &84731160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83860410
+  version_requirements: *84731160
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83860190 !ruby/object:Gem::Requirement
+  requirement: &84730420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,7 +120,7 @@ dependencies:
         version: '3.3'
   type: :development
   prerelease: false
-  version_requirements: *83860190
+  version_requirements: *84730420
 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
@@ -165,7 +165,6 @@ files:
 - lib/slideshow/filters/slide_filter.rb
 - lib/slideshow/filters/text_filter.rb
 - lib/slideshow/headers.rb
-- lib/slideshow/helpers/analytics_helper.rb
 - lib/slideshow/helpers/background_helper.rb
 - lib/slideshow/helpers/capture_helper.rb
 - lib/slideshow/helpers/directive_helper.rb

data/lib/slideshow/helpers/analytics_helper.rb

@@ -1,42 +0,0 @@
-module Slideshow
-  module AnalyticsHelper
-  
-  
-def google_analytics( opts = {} )
-
-  # if no user account code (e.g. UA-397343-10) passed along use
-  #   code from *.yml settings
-  code = opts.fetch( :code, config.google_analytics_code ) 
-
-  puts "  Adding JavaScript for Google Analytics tracker (#{code})..."
-
-  text = <<EOS
-<!-- begin google-analytics #{opts.inspect} -->
-<script type="text/javascript">
-
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '#{code}']);
-  _gaq.push(['_trackPageview']);
-
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
-
-</script>
-<!-- end google-analytics -->
-EOS
-
-  guard_block( text )             
-end
-  
-  
-end #   module AnalyticsHelper
-end # module Slideshow
-
-
-class Slideshow::Gen
-  include Slideshow::AnalyticsHelper
-end
-