slideshow 1.2.3 → 1.2.4

data/config/slideshow.yml

@@ -77,23 +77,23 @@ rest:
 # shortcuts for fetching template packs
 #   map shortcut to URI
 fetch:
-  s6syntax: https://raw.github.com/geraldb/slideshow-s6-syntax-highlighter/master/s6syntax.txt
-  s6blank: https://raw.github.com/geraldb/slideshow-s6-blank/master/s6blank.txt
-  s5blank: https://raw.github.com/geraldb/slideshow-s5-blank/master/s5blank.txt
-  s5themes: https://raw.github.com/geraldb/slideshow-s5-themes/master/s5themes.txt
-  fullerscreen: https://raw.github.com/geraldb/slideshow-fullerscreen/master/fullerscreen.txt
-  slidy: https://raw.github.com/geraldb/slideshow-slidy/master/slidy.txt
-  g5: https://raw.github.com/geraldb/slideshow-google-html5-slides/master/g5.txt
-  slippy: https://raw.github.com/geraldb/slideshow-slippy/master/slippy.txt
-  csss: https://raw.github.com/geraldb/slideshow-csss/master/csss.txt
-  deck.js: https://raw.github.com/geraldb/slideshow-deck.js/master/deck.js.txt
-  impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt
-  shower: https://raw.github.com/geraldb/slideshow-shower/master/shower.txt
+  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
 
 ###########################
 # shortcuts for quick starter templates
 quick:
-  slidy: https://raw.github.com/geraldb/slideshow-slidy/master/slidy.txt.quick
-  deck.js: https://raw.github.com/geraldb/slideshow-deck.js/master/deck.js.txt.quick
-  impress.js: https://raw.github.com/geraldb/slideshow-impress.js/master/impress.js.txt.quick
-  csss: https://raw.github.com/geraldb/slideshow-csss/master/csss.txt.quick
+  slidy: https://raw.github.com/slideshow-s9/slideshow-slidy/master/slidy.txt.quick
+  deck.js: https://raw.github.com/slideshow-s9/slideshow-deck.js/master/deck.js.txt.quick
+  impress.js: https://raw.github.com/slideshow-s9/slideshow-impress.js/master/impress.js.txt.quick
+  csss: https://raw.github.com/slideshow-s9/slideshow-csss/master/csss.txt.quick

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

@@ -206,14 +206,19 @@ class Gen
         
       manifestsrc = matches[0][1]
     end
-  
+
+    ### todo: use File.expand_path( xx, relative_to ) always with second arg
+    ##   do NOT default to cwd (because cwd will change!)
+    
+    # Reference src with absolute path, because this can be used with different pwd
+    manifestsrc = File.expand_path(manifestsrc)
 
     # expand output path in current dir and make sure output path exists
     outpath = File.expand_path( opts.output_path ) 
     logger.debug "outpath=#{outpath}"
     FileUtils.makedirs( outpath ) unless File.directory? outpath 
 
-    dirname  = File.dirname( fn )    
+    dirname  = File.dirname( fn )
     basename = File.basename( fn, '.*' )
     extname  = File.extname( fn )
     logger.debug "dirname=#{dirname}, basename=#{basename}, extname=#{extname}"
@@ -223,7 +228,13 @@ class Gen
     
     newcwd  = File.expand_path( dirname )
     oldcwd  = File.expand_path( Dir.pwd )
-    
+
+    # check: assume pwd is always absolute?? check for home dir e.g. will use ~/ ?? or not?
+    # todo: use for File.expand_path
+    # fix: use ordir n srcdir etec instead of newcwd and oldcwd - 
+    srcdir_restore = File.expand_path( dirname )
+    orgdir_restore = File.expand_path( Dir.pwd )
+
     unless newcwd == oldcwd then
       logger.debug "oldcwd=#{oldcwd}"
       logger.debug "newcwd=#{newcwd}"
@@ -285,21 +296,42 @@ class Gen
   end
 
 
+  #### pak merge
+  #  nb: change cwd to template pak root
+
+  @pakdir = File.dirname( manifestsrc )  # template pak root - make availabe too in erb via binding
+  logger.debug "  pakdir=>#{@pakdir}<"
+
+  #  todo/fix: change current work dir (cwd) in pakman gem itself
+  #   for now lets do it here
+
+  logger.debug "changing cwd to pak dir - oldcwd=>#{Dir.pwd}<, newcwd=>#{@pakdir}<"
+  Dir.chdir( @pakdir )
+
 
   pakpath     = opts.output_path
 
+  # expand output path in current dir and make sure output path exists
+  pakpath = File.expand_path( pakpath, orgdir_restore )
+  logger.debug "pakpath=#{pakpath}"
+  FileUtils.makedirs( pakpath ) unless File.directory? pakpath
+
   logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )
     
   Pakman::Templater.new( logger ).merge_pak( manifestsrc, pakpath, binding, basename )
-  
-  ## pop/restore working folder/dir
+
+  logger.debug "restoring cwd to src dir - oldcwd=>#{Dir.pwd}<, newcwd=>#{srcdir_restore}<"
+  Dir.chdir( srcdir_restore )
+
+  ## pop/restore org (original) working folder/dir
   unless newcwd == oldcwd
-    logger.debug "oldcwd=>#{oldcwd}<, newcwd=>#{newcwd}<"
+    logger.debug "restoring cwd to org dir - oldcwd=>#{oldcwd}<, newcwd=>#{newcwd}<"
     Dir.chdir( oldcwd )
   end
 
   puts "Done."
-end
+end # method create_slideshow
+
 
 end # class Gen
 

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 end

metadata

@@ -1,162 +1,117 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: slideshow
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 1.2.4
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 3
-  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-06-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: props
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &77883910 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: markdown
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *77883910
+- !ruby/object:Gem::Dependency
+  name: markdown
+  requirement: &77883690 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: textutils
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *77883690
+- !ruby/object:Gem::Dependency
+  name: textutils
+  requirement: &77883470 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: pakman
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *77883470
+- !ruby/object:Gem::Dependency
+  name: pakman
+  requirement: &77883250 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *77883250
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &77883040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        - 6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.2.6
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *77883040
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &77882820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 4
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.2.9
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *77882820
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &77882600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *77882600
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: &77882380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :development
-  version_requirements: *id008
-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.
+  prerelease: false
+  version_requirements: *77882380
+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."
 email: webslideshow@googlegroups.com
-executables: 
+executables:
 - slideshow
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - Manifest.txt
 - templates/s6.txt
-files: 
+files:
 - History.markdown
 - Manifest.txt
 - README.markdown
@@ -213,44 +168,38 @@ files:
 - templates/welcome.txt.quick
 homepage: http://slideshow.rubyforge.org
 licenses: []
+post_install_message: ! '******************************************************************************
+
 
-post_install_message: |
-  ******************************************************************************
-  
   Questions? Comments? Send them along to the mailing list.
+
   https://groups.google.com/group/webslideshow
-  
+
+
   ******************************************************************************
 
-rdoc_options: 
+'
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: slideshow
-rubygems_version: 1.8.24
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Slide Show (S9) - A Free Web Alternative to PowerPoint and KeyNote in Ruby
 test_files: []
-