pakman 0.3.0 → 0.4.0

data/Manifest.txt

@@ -17,4 +17,5 @@ lib/pakman/finder.rb
 lib/pakman/manifest.rb
 lib/pakman/template.rb
 lib/pakman/templater.rb
+lib/pakman/utils.rb
 lib/pakman/version.rb

data/README.markdown

@@ -16,6 +16,13 @@ Copy a template pack from your cache:
 Pakman::Copier.new( logger ).copy_pak( src, pakpath )
 ```
 
+Merge a template pack from your cache:
+
+```ruby
+Pakman::Templater.new( logger ).merge_pak( src, pakpath, binding, name )
+```
+
+
 List all template packs in your cache (using passed in search path):
 
 ```ruby
@@ -61,6 +68,11 @@ The [`slideshow`](http://slideshow.rubyforge.org) (also known as Slide Show (S9)
 that 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.
 
+## Real World Template Packs
+
+* [S6 Template Pack](https://github.com/geraldb/slideshow-s6-blank)
+* [impress.js Template Pack](https://github.com/geraldb/slideshow-impress.js)
+* [deck.js Template Pack](https://github.com/geraldb/slideshow-deck.js)
 
 ## License
 

data/lib/pakman.rb

@@ -25,6 +25,7 @@ require 'pakman/finder'
 require 'pakman/manifest'
 require 'pakman/template'
 require 'pakman/templater'
+require 'pakman/utils'
 require 'pakman/version'
 
 require 'pakman/cli/ctx'

data/lib/pakman/cli/commands/fetch.rb

@@ -16,10 +16,10 @@ class Fetch
     uri = URI.parse( src )
     logger.debug "scheme: >#{uri.scheme}<, host: >#{uri.host}<, port: >#{uri.port}<, path: >#{uri.path}<"
     
-    pakname = File.basename( uri.path ).downcase.gsub( '.txt', '' )
+    pakname = Pakman.pakname_from_file( uri.path )
     logger.debug "pakname: >#{pakname}<"  
 
-    pakpath = File.expand_path( "#{opts.config_path}/#{pakname}" )
+    pakpath = File.expand_path( pakname, opts.config_path )
     logger.debug "pakpath: >#{pakpath}<"
 
     Fetcher.new( logger ).fetch_pak( src, pakpath )

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

@@ -36,7 +36,7 @@ class Gen
         name = File.basename( arg, '.*' )
         puts "#{name}:"
         pp data
-        Templater.new( logger ).copy_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name, '--content-todo-remove--' )
+        Templater.new( logger ).merge_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name )
       end
     end
     

data/lib/pakman/cli/ctx.rb

@@ -17,13 +17,16 @@ class Ctx   # Context
       return super # super( mn, *args, &blk )
     end
 
-    key = mn.to_sym
+    key = mn.to_s
 
     if @hash.has_key?( key )
-      puts "ctx.#{key}"
-      @hash[ key ]
+      puts "calling ctx.#{key}"
+      value = @hash[ key ]
+      puts "  returning #{value.class.name}:"
+      pp value
+      value
     else
-      puts "***  ctx.#{key} missing"
+      puts "*** warning: ctx.#{key} missing"
       super
     end
   end

data/lib/pakman/copier.rb

@@ -12,47 +12,30 @@ class Copier
 
     start = Time.now
 
-    # downcase and remove .txt (if anywhere in name)
-    # e.g. welcome.quick.txt becomes welcome.quick
-    #      welcome.txt.quick becomse welcome.quick
-    pakname = File.basename( manifestsrc ).downcase.gsub( '.txt', '' )
+    pakname = Pakman.pakname_from_file( manifestsrc )
 
     puts "Copying template pack '#{pakname}'"
 
     manifest = Manifest.load_file( logger, manifestsrc )
 
-    # expand output path in current dir (if relative) and make sure output path exists
-    outpath = File.expand_path( pakpath )
-    logger.debug "outpath=#{outpath}"
-    FileUtils.makedirs( outpath ) unless File.directory?( outpath )
-
     manifest.each do |entry|
       dest   = entry[0]
       source = entry[1]
-                  
+
+      # get full (absolute) path and make sure path exists
+      destfull = File.expand_path( dest, pakpath )
+      destpath = File.dirname( destfull )
+      FileUtils.makedirs( destpath ) unless File.directory?( destpath )
+
+      logger.debug "destfull=>#{destfull}<"
+      logger.debug "destpath=>#{destpath}<"
+      
       puts "  Copying to #{dest} from #{source}..."
-      FileUtils.copy( source, with_output_path( dest, outpath ) )
+      FileUtils.copy( source, destfull )
     end
     
     puts "Done (in #{Time.now-start} s)."
   end # method copy_pak
 
-private
-
-   ############################
-   ## fix/todo: cleanup needed
-   ## fix: remove with_output_path helper (code it directly w/o helper)
-
-   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
-
 end # class Copier
-end # module Pakman
+end # module Pakman

data/lib/pakman/fetcher.rb

@@ -13,8 +13,6 @@ class Fetcher
 
     start = Time.now
 
-    # src = 'http://github.com/geraldb/slideshow/raw/d98e5b02b87ee66485431b1bee8fb6378297bfe4/code/templates/fullerscreen.txt'
-    # src = 'http://github.com/geraldb/sandbox/raw/13d4fec0908fbfcc456b74dfe2f88621614b5244/s5blank/s5blank.txt'
     uri = URI.parse( manifestsrc )
   
     logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
@@ -22,16 +20,14 @@ class Fetcher
     dirname  = File.dirname( uri.path )
     filename = File.basename( uri.path )       # e.g. fullerscreen.txt (with extension)
 
-    # downcase and remove .txt (if anywhere in name)
-    # e.g. welcome.quick.txt becomes welcome.quick
-    #      welcome.txt.quick becomse welcome.quick
-    pakname = File.basename( uri.path ).downcase.gsub( '.txt', '' )
+    pakname = Pakman.pakname_from_file( uri.path )
 
     logger.debug "dirname >#{dirname}<"
-    logger.debug "pakname >#{pakname}<, filename >#{filename}<"
+    logger.debug "filename >#{filename}<"
+    logger.debug "pakname >#{pakname}<"
 
     dlbase = "#{uri.scheme}://#{uri.host}:#{uri.port}#{dirname}"
-    logger.debug "dlpath: #{dlbase}"
+    logger.debug "dlbase: #{dlbase}"
     logger.debug "pakpath: #{pakpath}"
 
     FileUtils.makedirs( pakpath ) unless File.directory?( pakpath )
@@ -40,30 +36,36 @@ class Fetcher
     puts "    from '#{dlbase}'"
     puts "    saving to '#{pakpath}'"
   
-    # download manifest
-    dest = "#{pakpath}/#{filename}"
+    # step 1: download manifest
+    manifestdest = "#{pakpath}/#{filename}"
 
     puts "  Downloading manifest '#{filename}'..."
 
-    fetch_file( manifestsrc, dest )
+    fetch_file( manifestsrc, manifestdest )
 
-    manifest = Manifest.load_file_core( logger, dest )
+    manifest = Manifest.load_file_core( logger, manifestdest )
       
-    # download templates listed in manifest
-    manifest.each do |values|
-      values[1..-1].each do |file|
-      
-        dest = "#{pakpath}/#{file}"
+    # step 2: download files & templates listed in manifest
+    manifest.each do |entry|
+      source = entry[1]
 
-        # make sure path exists
-        destpath = File.dirname( dest )
-        FileUtils.makedirs( destpath ) unless File.directory?( destpath )
-    
-        src = "#{dlbase}/#{file}"
+      # get full (absolute) path and make sure path exists
+      destfull = File.expand_path( source, pakpath )  # NB: turning source into dest
+      destpath = File.dirname( destfull )
+      FileUtils.makedirs( destpath ) unless File.directory?( destpath )
+
+      logger.debug "destfull=>#{destfull}<"
+      logger.debug "destpath=>#{destpath}<"
+
+      sourcefull = "#{dlbase}/#{source}"
     
-        puts "  Downloading template '#{file}'..."
-        fetch_file( src, dest )
+      if source =~ /\.erb\.|.erb$/
+        puts "  Downloading template '#{source}'..."
+      else
+        puts "  Downloading file '#{source}'..."
       end
+
+      fetch_file( sourcefull, destfull )
     end   
     puts "Done (in #{Time.now-start} s)."
   end # method fetch_pak

data/lib/pakman/finder.rb

@@ -21,6 +21,11 @@ class Finder
         else
           unless exclude?( file, excludes )  # check for excludes; skip if excluded
             logger.debug "  Adding match >#{file}<"
+            
+            ## todo/fix:
+            # array first entry - downcase and gsub('.txt','') ??
+            # use Pakman.pakname_from_file()
+            
             manifests << [ File.basename( file ), file ]
           end
         end
@@ -35,7 +40,7 @@ private
     excludes.each do |pattern|
       ## todo: FNM_DOTMATCH helps or not?? (make up some tests??)
       if File.fnmatch?( pattern, file, File::FNM_CASEFOLD | File::FNM_DOTMATCH )
-        logger.debug "  Skipping match; it's excluded by pattern >#{pattern}<"         
+        logger.debug "  Skipping match; it's excluded by pattern >#{pattern}<"
         return true
       end
     end

data/lib/pakman/templater.rb

@@ -7,84 +7,50 @@ class Templater
   def initialize( logger )
     @logger   = logger
   end
-  
 
-  ## fix/todo:
-  ##  - get @name or @content from binding - possible with lookup???
-    
-  def copy_pak( manifestsrc, pakpath, binding, name, content )
+
+  def merge_pak( manifestsrc, pakpath, binding, name )
   
     start = Time.now
     
-    #### fix/todo:
-    ## - check for .erb file extension for trigger for erb processing
+    pakname = Pakman.pakname_from_file( manifestsrc )
 
-    # downcase and remove .txt (if anywhere in name)
-    # e.g. welcome.quick.txt becomes welcome.quick
-    #      welcome.txt.quick becomse welcome.quick
-    pakname = File.basename( manifestsrc ).downcase.gsub( '.txt', '' )
-
-    puts "Copying template pack '#{pakname}'"
+    puts "Merging template pack '#{pakname}'"
 
     manifest = Manifest.load_file( logger, manifestsrc )
-    
-    # expand output path in current dir (if relative) and make sure output path exists
-    outpath = File.expand_path( pakpath )
-    logger.debug "outpath=#{outpath}"
-    FileUtils.makedirs( outpath ) unless File.directory?( outpath )
-    
-    manifest.each do |entry|
-      outname = entry[0]
-      if outname.include?( '__file__' ) # process
-        outname = outname.gsub( '__file__', name )
-        puts "Preparing #{outname}..."
-
-        out = File.new( with_output_path( outname, outpath ), 'w+' )
 
-        out << Template.new( entry[1] ).render( binding )
+    manifest.each do |entry|
+      dest   = entry[0]
+      source = entry[1]
       
-        ## fix: remove entry.size > 2
-        ## check template pack and convert to new simple erb classic version
+      if dest =~ /__file__/   # replace w/ name
+        dest = dest.gsub( '__file__', name )
+      end
       
-        if entry.size > 2 # more than one source file? assume header and footer with content added inbetween
-          out << content 
-          out << Template.new( entry[2] ).render( binding )
-        end
-
+      # get full (absolute) path and make sure path exists
+      destfull = File.expand_path( dest, pakpath )
+      destpath = File.dirname( destfull )
+      FileUtils.makedirs( destpath ) unless File.directory?( destpath )
+
+      logger.debug "destfull=>#{destfull}<"
+      logger.debug "destpath=>#{destpath}<"
+   
+      if source =~ /\.erb\.|.erb$/
+        puts "  Merging to #{dest}..."
+
+        out = File.new( destfull, 'w+' )
+        out << Template.new( source ).render( binding )
         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 ) )
+      else
+        puts "  Copying to #{dest} from #{source}..."
+        
+        FileUtils.copy( source, destfull )
       end
     end # each entry in manifest
     
-    puts "Done (in #{Time.now-start} s)."    
-  end # method copy_pak
-
-private
-
-
-   ############################
-   ## fix/todo: cleanup needed
-   ## fix: remove with_output_path helper (code it directly w/o helper)
-
-   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
+    puts "Done (in #{Time.now-start} s)."
+  end # method merge_pak
 
 end # class Templater
 end # module Pakman

data/lib/pakman/utils.rb

@@ -0,0 +1,13 @@
+module Pakman
+
+
+  # downcase and remove .txt (if anywhere in name)
+  # e.g. welcome.quick.txt becomes welcome.quick
+  #      welcome.txt.quick becomse welcome.quick
+  #      s6blank.txt becomes s6blank
+
+  def self.pakname_from_file( path )
+    File.basename( path ).downcase.gsub( '.txt', '' )
+  end
+
+end # class Pakman

data/lib/pakman/version.rb

@@ -1,3 +1,3 @@
 module Pakman
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pakman
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,7 @@ 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: fetcher
@@ -91,6 +91,7 @@ files:
 - lib/pakman/manifest.rb
 - lib/pakman/template.rb
 - lib/pakman/templater.rb
+- lib/pakman/utils.rb
 - lib/pakman/version.rb
 homepage: http://geraldb.github.com/pakman
 licenses: []