pakman 0.2.0 → 0.3.0

data/Manifest.txt

@@ -7,6 +7,7 @@ lib/pakman.rb
 lib/pakman/cli/commands/fetch.rb
 lib/pakman/cli/commands/gen.rb
 lib/pakman/cli/commands/list.rb
+lib/pakman/cli/ctx.rb
 lib/pakman/cli/helpers.rb
 lib/pakman/cli/opts.rb
 lib/pakman/cli/runner.rb
@@ -14,4 +15,6 @@ lib/pakman/copier.rb
 lib/pakman/fetcher.rb
 lib/pakman/finder.rb
 lib/pakman/manifest.rb
+lib/pakman/template.rb
+lib/pakman/templater.rb
 lib/pakman/version.rb

data/lib/pakman.rb

@@ -8,6 +8,7 @@
 
 require 'yaml'
 require 'pp'
+require 'erb'
 require 'logger'
 require 'optparse'
 require 'fileutils'
@@ -22,8 +23,11 @@ require 'pakman/copier'
 require 'pakman/fetcher'
 require 'pakman/finder'
 require 'pakman/manifest'
+require 'pakman/template'
+require 'pakman/templater'
 require 'pakman/version'
 
+require 'pakman/cli/ctx'
 require 'pakman/cli/helpers'
 require 'pakman/cli/opts'
 require 'pakman/cli/runner'

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

@@ -2,29 +2,25 @@ module Pakman
 
 class Fetch
 
+  attr_reader :logger, :opts
+
   def initialize( logger, opts )
     @logger  = logger
     @opts    = opts
   end
 
-  attr_reader :logger, :opts
-
-
   def run
-    logger.debug "fetch_uri=#{opts.fetch_uri}"
-    
+    logger.debug "fetch_uri: >#{opts.fetch_uri}<"
     src = opts.fetch_uri
      
-    # 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( src )
-    logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
+    logger.debug "scheme: >#{uri.scheme}<, host: >#{uri.host}<, port: >#{uri.port}<, path: >#{uri.path}<"
     
-    basename = File.basename( uri.path, '.*' ) # e.g. fullerscreen     (without extension)
-    logger.debug "basename: #{basename}"  
+    pakname = File.basename( uri.path ).downcase.gsub( '.txt', '' )
+    logger.debug "pakname: >#{pakname}<"  
 
-    pakpath = File.expand_path( "#{opts.config_path}/#{basename}" )
-    logger.debug "pakpath: #{pakpath}"
+    pakpath = File.expand_path( "#{opts.config_path}/#{pakname}" )
+    logger.debug "pakpath: >#{pakpath}<"
 
     Fetcher.new( logger ).fetch_pak( src, pakpath )
   end # method run

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

@@ -11,31 +11,35 @@ class Gen
 
   attr_reader :logger, :opts
 
-  def run
+  def run( args )
     manifest_name = opts.manifest
-    
-    # add .txt file extension if missing (for convenience)
-    ## fix: might not work with impress.js or deck.js
-    ##  check if extname is txt and add it to become deck.js.txt etc.
-    manifest_name << ".txt"   if File.extname( manifest_name ).empty?
+    manifest_name = manifest_name.downcase.gsub('.txt', '' )  # remove .txt if present
     
     logger.debug "manifest=#{manifest_name}"
-    
-    manifests = installed_template_manifests
-    
-    # check for builtin generator manifests
-    matches = manifests.select { |m| m[0] == manifest_name }
-    
-    if matches.empty?
-      puts "*** error: unknown template manifest '#{manifest_name}'"
-      # todo: list installed manifests
+
+    # check for matching manifests
+    manifests = installed_template_manifests.select { |m| m[0] == manifest_name+'.txt' }
+        
+    if manifests.empty?
+      puts "*** error: unknown template pack '#{manifest_name}'; use pakman -l to list installed template packs"
       exit 2
     end
         
-    manifestsrc = matches[0][1]
+    manifestsrc = manifests[0][1]
     pakpath     = opts.output_path
     
-    Copier.new( logger ).copy_pak( manifestsrc, pakpath )
+    if args.empty?
+      Copier.new( logger ).copy_pak( manifestsrc, pakpath )
+    else
+      args.each do |arg|
+        data = YAML.load_file( arg )
+        name = File.basename( arg, '.*' )
+        puts "#{name}:"
+        pp data
+        Templater.new( logger ).copy_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name, '--content-todo-remove--' )
+      end
+    end
+    
   end
 
 end # class Gen

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

@@ -25,7 +25,7 @@ class List
       puts "    -- none --"    
     else
       manifests.each do |manifest|
-        puts "%16s (%s)" % [manifest[0], manifest[1]]
+        puts "%16s (%s)" % [manifest[0].gsub('.txt',''), manifest[1]]
       end
     end
   end

data/lib/pakman/cli/ctx.rb

@@ -0,0 +1,32 @@
+module Pakman
+
+class Ctx   # Context
+
+  def initialize( hash )
+    @hash = hash
+  end
+
+  def ctx
+    ### todo: check if method_missing works with binding in erb???
+    binding
+  end
+
+  def method_missing( mn, *args, &blk )
+    ## only allow read-only access (no arguments)
+    if args.length > 0    # || mn[-1].chr == "="
+      return super # super( mn, *args, &blk )
+    end
+
+    key = mn.to_sym
+
+    if @hash.has_key?( key )
+      puts "ctx.#{key}"
+      @hash[ key ]
+    else
+      puts "***  ctx.#{key} missing"
+      super
+    end
+  end
+
+end # class Ctx
+end # module Pakman

data/lib/pakman/cli/runner.rb

@@ -58,6 +58,8 @@ Examples:
     pakman -l -c ~/.slideshow/templates
 
     pakman -t s6
+    pakman -t s6 ruby19.yml
+    pakman -t s6 ruby19.yml tagging.yml
     pakman -t s6 -o o
     pakman -t s6 -c ~/.slideshow/templates
 
@@ -76,7 +78,7 @@ EOS
     if opts.list?
       List.new( logger, opts ).run
     elsif opts.generate?
-      Gen.new( logger, opts ).run
+      Gen.new( logger, opts ).run( args )
     elsif opts.fetch?
       Fetch.new( logger, opts ).run
     else

data/lib/pakman/template.rb

@@ -0,0 +1,20 @@
+module Pakman
+
+class Template
+
+  def initialize( path )
+    @path = path
+  end
+
+  def render( binding )
+    ERB.new( load_template() ).result( binding )
+  end
+
+private
+  def load_template
+    puts "  Loading template >#{@path}<..."
+    File.read( @path )
+  end
+
+end # class Template
+end # module Pakman

data/lib/pakman/templater.rb

@@ -0,0 +1,90 @@
+module Pakman
+
+class Templater
+
+  attr_reader :logger
+    
+  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 )
+  
+    start = Time.now
+    
+    #### fix/todo:
+    ## - check for .erb file extension for trigger for erb processing
+
+    # 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}'"
+
+    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 )
+      
+        ## fix: remove entry.size > 2
+        ## check template pack and convert to new simple erb classic version
+      
+        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
+
+        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 # 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
+
+end # class Templater
+end # module Pakman

data/lib/pakman/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pakman
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gerald Bauer
@@ -15,7 +15,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: fetcher
@@ -81,6 +81,7 @@ files:
 - lib/pakman/cli/commands/fetch.rb
 - lib/pakman/cli/commands/gen.rb
 - lib/pakman/cli/commands/list.rb
+- lib/pakman/cli/ctx.rb
 - lib/pakman/cli/helpers.rb
 - lib/pakman/cli/opts.rb
 - lib/pakman/cli/runner.rb
@@ -88,6 +89,8 @@ files:
 - lib/pakman/fetcher.rb
 - lib/pakman/finder.rb
 - lib/pakman/manifest.rb
+- lib/pakman/template.rb
+- lib/pakman/templater.rb
 - lib/pakman/version.rb
 homepage: http://geraldb.github.com/pakman
 licenses: []