slideshow 1.2.0.beta5 → 1.2.0

data/Rakefile

@@ -13,12 +13,12 @@ Hoe.spec 'slideshow' do
   self.email   = 'webslideshow@googlegroups.com'
   
   self.extra_deps = [
-    ['RedCloth','>= 4.2.9'],
     ['markdown','>= 0.4.0'],
     ['textutils','>= 0.2.0'],
     ['props','>= 0.2.0'],
-    ['pakman','>= 0.3.0'],
-    ['activesupport', '>= 3.2.6']
+    ['pakman','>= 0.4.0'],
+    ['activesupport', '>= 3.2.6'],
+    ['RedCloth','>= 4.2.9']
   ]
     
   # switch extension to .markdown for gihub formatting

data/lib/slideshow.rb

@@ -1,4 +1,4 @@
-$KCODE = 'utf'
+# encoding: utf-8
 
 ###
 # NB: for local testing run like:

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

@@ -251,7 +251,7 @@ class Gen
 
   logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )
     
-  Pakman::Templater.new( logger ).copy_pak( manifestsrc, pakpath, binding, basename, content )
+  Pakman::Templater.new( logger ).merge_pak( manifestsrc, pakpath, binding, basename )
   
   ## pop/restore working folder/dir
   unless newcwd == oldcwd

data/lib/slideshow/cli/runner.rb

@@ -103,20 +103,13 @@ def run( args )
        opts.quick_manifest = q   if q.nil? == false
     end
 
-    cmd.on( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
-
     cmd.on( '-v', '--version', "Show version" ) do
       puts Slideshow.generator
       exit
     end
-
-    cmd.on( "--verbose", "Show debug trace" )  do
-       logger.datetime_format = "%H:%H:%S"
-       logger.level = Logger::DEBUG
-    end
     
  
-    cmd.on_tail( "-h", "--help", "Show this message" ) do
+    cmd.on( "-h", "--help", "Show this message" ) do
          puts <<EOS
          
 Slide Show (S9) is a free web alternative to PowerPoint or KeyNote in Ruby
@@ -144,6 +137,41 @@ Further information:
 EOS
          exit
     end
+    
+    cmd.on( '-p', '--plugins', '(Debug) List Plugin Scripts in Load Path' ) { opts.plugins = true }
+
+    cmd.on( '--about', "(Debug) Show more version info" ) do
+      puts <<EOS
+
+#{Slideshow.generator}
+
+Gems Versions:
+  - pakman #{Pakman::VERSION}
+  - fetcher #{Fetcher::VERSION}
+  - markdown #{Markdown::VERSION}
+  - textutils #{TextUtils::VERSION}
+  - props #{Props::VERSION}
+
+Slide Show Root: #{Slideshow.root}
+
+EOS
+
+# todo:
+# add verison for rubygems
+
+## todo: add more gem version info
+#- redcloth
+#- kramdown
+
+      exit
+    end
+
+
+    cmd.on( "--verbose", "(Debug) Show debug trace" )  do
+       logger.datetime_format = "%H:%H:%S"
+       logger.level = Logger::DEBUG
+    end
+        
   end
 
   opt.parse!( args )

data/lib/slideshow/version.rb

@@ -1,3 +1,3 @@
 module Slideshow
-  VERSION = '1.2.0.beta5'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: -507730549
-  prerelease: 6
+  hash: 31
+  prerelease: 
   segments: 
   - 1
   - 2
   - 0
-  - beta
-  - 5
-  version: 1.2.0.beta5
+  version: 1.2.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,42 +15,42 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-20 00:00:00 Z
+date: 2012-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: markdown
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 37
+        hash: 15
         segments: 
+        - 0
         - 4
-        - 2
-        - 9
-        version: 4.2.9
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: markdown
+  name: textutils
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 0
-        - 4
+        - 2
         - 0
-        version: 0.4.0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: textutils
+  name: props
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -68,51 +66,51 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: props
+  name: pakman
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 15
         segments: 
         - 0
-        - 2
+        - 4
         - 0
-        version: 0.2.0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: pakman
+  name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 3
         segments: 
-        - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 2
+        - 6
+        version: 3.2.6
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: RedCloth
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 37
         segments: 
-        - 3
+        - 4
         - 2
-        - 6
-        version: 3.2.6
+        - 9
+        version: 4.2.9
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -241,14 +239,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: slideshow