slideshow 0.8 → 0.8.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 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

data/Rakefile

@@ -1,18 +1,20 @@
 require 'hoe'
 require './lib/slideshow.rb'
 
-Hoe.new('slideshow', Slideshow::VERSION) do |p|
-
-  p.summary = 'Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby'
-  p.url     = 'http://slideshow.rubyforge.org'
+Hoe.spec 'slideshow' do
+  
+  self.version = Slideshow::VERSION
+  
+  self.summary = 'Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby'
+  self.url     = 'http://slideshow.rubyforge.org'
   
-  p.author  = 'Gerald Bauer'
-  p.email   = 'webslideshow@googlegroups.com'
+  self.author  = 'Gerald Bauer'
+  self.email   = 'webslideshow@googlegroups.com'
   
-  p.extra_deps = [
+  self.extra_deps = [
     ['RedCloth','>= 4.0.0'],
-    ['BlueCloth','>= 1.0.0']
+    ['kramdown','>= 0.8.0']
   ]
   
-  p.remote_rdoc_dir = 'doc' 
+  self.remote_rdoc_dir = 'doc' 
 end

data/lib/slideshow.rb

@@ -8,13 +8,14 @@ require 'optparse'
 require 'erb'
 require 'logger'
 require 'fileutils'
-require 'ftools'
 require 'pp'
 require 'uri'
 require 'net/http'
 
 # required gems
-require 'redcloth'
+require 'redcloth'  # default textile library
+require 'kramdown'  # default markdown library
+
 
 # own code
 require 'slideshow/opts'
@@ -22,7 +23,7 @@ require 'slideshow/gen'
 
 module Slideshow
 
-  VERSION = '0.8'
+  VERSION = '0.8.1'
 
   def Slideshow.main
     

data/lib/slideshow/gen.rb

@@ -9,17 +9,18 @@ class Gen
   KNOWN_MARKDOWN_EXTNAMES = [ '.markdown', '.m', '.mark', '.mkdn', '.md', '.txt', '.text' ]
   KNOWN_EXTNAMES = KNOWN_TEXTILE_EXTNAMES + KNOWN_MARKDOWN_EXTNAMES
 
-  # note: only bluecloth is listed as a dependency in gem specs (because it's Ruby only and, thus, easy to install)
+  # note: only kramdown is listed as a dependency in gem specs (because it's Ruby only and, thus, easy to install)
   #  if you want to use other markdown libs install the required/desired lib e.g.
   #  use  gem install rdiscount for rdiscount and so on
   #
   # also note for now the first present markdown library gets used
-  #  the search order is first come, first serve, that is: rdiscount, rpeg-markdown, maruku, bluecloth (fallback, always present)
+  #  the search order is first come, first serve, that is: rdiscount, rpeg-markdown, maruku, bluecloth, kramdown (fallback, always present)
   KNOWN_MARKDOWN_LIBS = [
     [ 'rdiscount',      lambda { |content| RDiscount.new( content ).to_html } ],
     [ 'rpeg-markdown',  lambda { |content| PEGMarkdown.new( content ).to_html } ],
     [ 'maruku',         lambda { |content| Maruku.new( content, {:on_error => :raise} ).to_html }  ],
-    [ 'bluecloth',      lambda { |content| BlueCloth.new( content ).to_html } ]
+    [ 'bluecloth',      lambda { |content| BlueCloth.new( content ).to_html } ],
+    [ 'kramdown',       lambda { |content| Kramdown::Document.new( content ).to_html } ]
   ] 
   
   def initialize
@@ -80,7 +81,7 @@ class Gen
   end
     
   def cache_dir
-    PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".slideshow")
+    RUBY_PLATFORM =~ /win32/ ? win32_cache_dir : File.join(File.expand_path("~"), ".slideshow")
   end
 
   def win32_cache_dir
@@ -103,7 +104,7 @@ class Gen
       end
     
       # make sure path exists
-      File.makedirs( @config_dir ) unless File.directory? @config_dir
+      FileUtils.makedirs( @config_dir ) unless File.directory? @config_dir
     end
     
     @config_dir
@@ -238,7 +239,7 @@ class Gen
     # make sure dest path exists
     dest_path = File.dirname( dest_full )
     logger.debug "dest_path=#{dest_path}"
-    File.makedirs( dest_path ) unless File.directory? dest_path
+    FileUtils.makedirs( dest_path ) unless File.directory? dest_path
     dest_full
   end
   
@@ -296,7 +297,7 @@ class Gen
     logger.debug "dlpath: #{dlbase}"
     logger.debug "pkgpath: #{pkgpath}"
   
-    File.makedirs( pkgpath ) unless File.directory? pkgpath 
+    FileUtils.makedirs( pkgpath ) unless File.directory? pkgpath 
    
     puts "Fetching template package '#{basename}'"
     puts "  : from '#{dlbase}'"
@@ -319,7 +320,7 @@ class Gen
 
         # make sure path exists
         destpath = File.dirname( dest )
-        File.makedirs( destpath ) unless File.directory? destpath
+        FileUtils.makedirs( destpath ) unless File.directory? destpath
     
         src = "#{dlbase}/#{file}"
     
@@ -351,14 +352,14 @@ class Gen
     # expand output path in current dir and make sure output path exists
     outpath = File.expand_path( opts.output_path ) 
     logger.debug "outpath=#{outpath}"
-    File.makedirs( outpath ) unless File.directory? outpath 
+    FileUtils.makedirs( outpath ) unless File.directory? outpath 
 
     manifest.each do |entry|
       dest   = entry[0]      
       source = entry[1]
                   
       puts "Copying to #{dest} from #{source}..."     
-      File.copy( source, with_output_path( dest, outpath ) )
+      FileUtils.copy( source, with_output_path( dest, outpath ) )
     end
     
     puts "Done."   
@@ -400,7 +401,7 @@ class Gen
     # expand output path in current dir and make sure output path exists
     outpath = File.expand_path( opts.output_path ) 
     logger.debug "outpath=#{outpath}"
-    File.makedirs( outpath ) unless File.directory? outpath 
+    FileUtils.makedirs( outpath ) unless File.directory? outpath 
 
     dirname  = File.dirname( fn )    
     basename = File.basename( fn, '.*' )
@@ -463,7 +464,7 @@ class Gen
   
    # fix: allow comments in header too (#)
 
-  content_with_headers.each do |line|
+  content_with_headers.each_line do |line|
     if read_headers && line =~ /^\s*(\w[\w-]*)[ \t]*:[ \t]*(.*)/
       key = $1.downcase
       value = $2.strip
@@ -552,7 +553,7 @@ class Gen
       source = entry[1]
             
       puts "Copying to #{dest} from #{source}..."     
-      File.copy( source, with_output_path( dest, outpath ) )
+      FileUtils.copy( source, with_output_path( dest, outpath ) )
     end
   end
 

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  version: "0.8"
+  hash: 61
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -9,40 +15,78 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-14 00:00:00 -04:00
+date: 2010-06-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 4
+        - 0
+        - 0
         version: 4.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: BlueCloth
+  name: kramdown
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 8
+        - 0
+        version: 0.8.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
+        hash: 7
+        segments: 
+        - 2
+        - 0
+        - 4
+        version: 2.0.4
+  type: :development
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.9.0
-    version: 
-description: The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
 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.
+        hash: 21
+        segments: 
+        - 2
+        - 6
+        - 1
+        version: 2.6.1
+  type: :development
+  version_requirements: *id004
+description: |-
+  The Slide Show (S9) Ruby gem lets you create slide shows and author slides in plain text
+  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.
 email: webslideshow@googlegroups.com
 executables: 
 - slideshow
@@ -100,6 +144,8 @@ files:
 - templates/s6/style.css.erb
 has_rdoc: true
 homepage: http://slideshow.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -107,23 +153,29 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: slideshow
-rubygems_version: 1.3.1
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby
 test_files: []