slideshow 1.0.5 → 1.1.0.beta1

data/Rakefile

@@ -14,7 +14,8 @@ Hoe.spec 'slideshow' do
   self.extra_deps = [
     ['RedCloth','>= 4.2.9'],
     ['markdown','>= 0.1.0'],
-    ['fetcher','>= 0.1.0']
+    ['fetcher','>= 0.1.0'],
+    ['props','>= 0.1.0']
   ]
   
   self.remote_rdoc_dir = 'doc'

data/bin/slideshow

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
+
 require 'slideshow'
 
 Slideshow.main

data/lib/slideshow.rb

@@ -1,7 +1,11 @@
 $KCODE = 'utf'
 
-LIB_PATH = File.expand_path( File.dirname(__FILE__) )
-$LOAD_PATH.unshift(LIB_PATH) 
+###
+# NB: for local testing run like:
+#
+# 1.8.x: ruby -Ilib -rrubygems lib/slideshow.rb
+# 1.9.x: ruby -Ilib lib/slideshow.rb
+
 
 # core and stlibs
 require 'optparse'
@@ -22,6 +26,15 @@ require 'redcloth'          # default textile library
 require 'markdown'          # default markdown library
 require 'fetcher'           # fetch docs and blogs via http, https, etc.
 
+require 'props'             # manage settings/env
+
+class Env
+  def self.slideshowopt
+    ENV[ 'SLIDESHOWOPT' ]
+  end
+end # class Env
+
+
 # our own code
 require 'slideshow/opts'
 require 'slideshow/config'
@@ -55,19 +68,23 @@ require 'slideshow/filters/slide_filter'
 
 module Slideshow
 
-  VERSION = '1.0.5'
-
+  VERSION = '1.1.0.beta1'
+  
+  def self.root
+    "#{File.expand_path( File.dirname(File.dirname(__FILE__)) )}"
+  end
+  
   # version string for generator meta tag (includes ruby version)
-  def Slideshow.generator
+  def self.generator
     "Slide Show (S9) #{VERSION} on Ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
   end
 
 
-  def Slideshow.main
+  def self.main
     
     # allow env variable to set RUBYOPT-style default command line options
     #   e.g. -o slides -t <your_template_manifest_here>
-    slideshowopt = ENV[ 'SLIDESHOWOPT' ]
+    slideshowopt = Env.slideshowopt
     
     args = []
     args += slideshowopt.split if slideshowopt

data/lib/slideshow/config.rb

@@ -17,8 +17,8 @@ class Config
 
   def load   
     # load builtin config file @  <gem>/config/slideshow.yml
-    config_file         = "#{File.dirname( LIB_PATH )}/config/slideshow.yml"
-    config_builtin_file = "#{File.dirname( LIB_PATH )}/config/slideshow.builtin.yml"
+    config_file         = "#{Slideshow.root}/config/slideshow.yml"
+    config_builtin_file = "#{Slideshow.root}/config/slideshow.builtin.yml"
 
     # run through erb        
     config_txt = File.read( config_file )

data/lib/slideshow/gen.rb

@@ -413,7 +413,7 @@ def load_plugins
     
   patterns = []
   patterns << "#{config_dir}/lib/**/*.rb"
-  patterns << 'lib/**/*.rb' unless LIB_PATH == File.expand_path( 'lib' )  # don't include lib if we are in repo (don't include slideshow/lib)
+  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
@@ -486,6 +486,7 @@ More examles:
 
 Further information:
   http://slideshow.rubyforge.org
+  
 EOS
  
  

data/lib/slideshow/manifest.rb

@@ -66,7 +66,7 @@ module Slideshow
     # 1) search gem/templates 
 
     builtin_patterns = [
-      "#{File.dirname( LIB_PATH )}/templates/*.txt.gen"
+      "#{Slideshow.root}/templates/*.txt.gen"
     ]
 
     find_manifests( builtin_patterns )
@@ -78,7 +78,7 @@ module Slideshow
     # 3) search gem/templates
 
     builtin_patterns = [
-      "#{File.dirname( LIB_PATH )}/templates/*.txt"
+      "#{Slideshow.root}/templates/*.txt"
     ]
     config_patterns  = [
       "#{config_dir}/templates/*.txt",
@@ -90,7 +90,7 @@ module Slideshow
     ]
     
     patterns = []
-    patterns += current_patterns  unless LIB_PATH == File.expand_path( 'lib' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
+    patterns += current_patterns  unless Slideshow.root == File.expand_path( '.' )  # don't include working dir if we test code from repo (don't include slideshow/templates)
     patterns += config_patterns
     patterns += builtin_patterns
  

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: -37085639
+  prerelease: 6
   segments: 
   - 1
+  - 1
   - 0
-  - 5
-  version: 1.0.5
+  - beta
+  - 1
+  version: 1.1.0.beta1
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -66,9 +68,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  name: props
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +97,11 @@ dependencies:
         - 10
         version: "3.10"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,7 +112,7 @@ dependencies:
         - 0
         version: "3.0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 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.
@@ -183,12 +201,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: slideshow