slideshow 1.2.0.beta4 → 1.2.0.beta5

data/Rakefile

@@ -17,7 +17,7 @@ Hoe.spec 'slideshow' do
     ['markdown','>= 0.4.0'],
     ['textutils','>= 0.2.0'],
     ['props','>= 0.2.0'],
-    ['pakman','>= 0.2.0'],
+    ['pakman','>= 0.3.0'],
     ['activesupport', '>= 3.2.6']
   ]
     

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

@@ -68,6 +68,10 @@ class Gen
   end
 
 
+  ## fix:/todo: check if these get called
+  ##   from helpers
+  ##  fix: cleanup and remove
+
   def load_template( path ) 
     puts "  Loading template #{path}..."
     return File.read( path )
@@ -78,18 +82,6 @@ class Gen
   end
 
   
-  def with_output_path( dest, output_path )
-    dest_full = File.expand_path( dest, output_path )
-    logger.debug "dest_full=#{dest_full}"
-      
-    # make sure dest path exists
-    dest_path = File.dirname( dest_full )
-    logger.debug "dest_path=#{dest_path}"
-    FileUtils.makedirs( dest_path ) unless File.directory? dest_path
-    dest_full
-  end
-  
-  
 
   # move into a filter??
   def post_processing_slides( content )
@@ -167,7 +159,7 @@ class Gen
     
     # check if file exists (if yes use custom template package!) - allows you to override builtin package with same name 
     if File.exists?( manifest_path_or_name )
-      manifest = Pakman::Manifest.load_file( logger, manifest_path_or_name )
+      manifestsrc = manifest_path_or_name
     else
       # check for builtin manifests
       manifests = installed_template_manifests
@@ -179,7 +171,7 @@ class Gen
         exit 2
       end
         
-      manifest = Pakman::Manifest.load_file( logger, matches[0][1] )
+      manifestsrc = matches[0][1]
     end
   
 
@@ -254,44 +246,12 @@ class Gen
   end
 
 
-  ###
-  ## fix: move code into Pakman::Gen/Generator or Templater
 
-  #### fix/todo:
-  ##
-  ## check for .erb file extension for trigger for erb processing
-
-  manifest.each do |entry|
-    outname = entry[0]
-    if outname.include? '__file__' # process
-      outname = outname.gsub( '__file__', basename )
-      puts "Preparing #{outname}..."
-
-      out = File.new( with_output_path( outname, outpath ), "w+" )
-
-      out << render_template( load_template( entry[1] ), binding )
-      
-      if entry.size > 2 # more than one source file? assume header and footer with content added inbetween
-        out << content2 
-        out << render_template( load_template( entry[2] ), binding )
-      end
+  pakpath     = opts.output_path
 
-      out.flush
-      out.close
-
-    else # just copy verbatim if target/dest has no __file__ in name
-      dest   = entry[0]
-      source = entry[1]
-
-  #### fix/todo:
-  ##
-  ## check for .erb file extension for trigger for erb processing
-
-      puts "Copying to #{dest} from #{source}..."
-      FileUtils.copy( source, with_output_path( dest, outpath ) )
-    end
-  end
-  
+  logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )
+    
+  Pakman::Templater.new( logger ).copy_pak( manifestsrc, pakpath, binding, basename, content )
   
   ## pop/restore working folder/dir
   unless newcwd == oldcwd

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

@@ -14,21 +14,20 @@ class GenTemplates
   attr_reader :logger, :opts, :config
 
   def run
-    manifest_name = opts.manifest.gsub( '.txt', '' )  # remove (optional) .txt ending
+    manifest_name = opts.manifest
+    manifest_name = manifest_name.downcase.gsub( '.txt', '' )  # remove (optional) .txt ending
     logger.debug "manifest=#{manifest_name}"
     
-    manifests = installed_generator_manifests
-    
     # check for builtin generator manifests
-    matches = manifests.select { |m| m[0] == manifest_name+'.txt.gen' }
+    manifests = installed_generator_manifests.select { |m| m[0] == manifest_name+'.txt.gen' }
     
-    if matches.empty?
-      puts "*** error: unknown template manifest '#{manifest_name}'"
+    if manifests.empty?
+      puts "*** error: unknown generator template pack '#{manifest_name}'"
       # todo: list installed manifests
       exit 2
     end
         
-    manifestsrc = matches[0][1]
+    manifestsrc = manifests[0][1]
     pakpath     = opts.output_path
 
     logger.debug( "manifestsrc=>#{manifestsrc}<, pakpath=>#{pakpath}<" )

data/lib/slideshow/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: slideshow
 version: !ruby/object:Gem::Version 
-  hash: 811109185
+  hash: -507730549
   prerelease: 6
   segments: 
   - 1
   - 2
   - 0
   - beta
-  - 4
-  version: 1.2.0.beta4
+  - 5
+  version: 1.2.0.beta5
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-19 00:00:00 Z
+date: 2012-06-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -91,12 +91,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 0
-        - 2
+        - 3
         - 0
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency