pakman 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8627dadb6e570d024eada852f7661770864c3238
-  data.tar.gz: 2c8f9252f3bceb14c559d06d7851d23fb11dfe45
+  metadata.gz: 22a5cf70dcedaa0eb95834a086d24a7386597853
+  data.tar.gz: 63c75a8c9c8ccb237bd4c1722cb90b62fe5a0816
 SHA512:
-  metadata.gz: 1d1f9cdab69b5084546f7d52cbb1471a5159e84d591105b9b83198697eca19e415da4943de9a6b69d4804cd7e8b0973116f33c4a3f2e2b77e2d9c3c27131bfb4
-  data.tar.gz: 674ef0df51ad6fe5ffea55cd194ad12fdcaa286d5a432ec16b1d80f1c03d4c255decd15b84ef517ff80bb9db9ce35b9116e746ee6fb2ffe47f470f1818533700
+  metadata.gz: 659145fbe1d193a0259751e8e1521ebd9845fef0f358a2a9118f574bfe59b13a6d447088e79503efc83e8e9b5c225d85090d541c9aa99ca3850271aee5e88e34
+  data.tar.gz: 30238ac4aad11d19dbb1d11f339eae6c323101ab6d48f1e2435da15138907949db3b110d8184fb1902b28ade6afac7dd4cf939e78067efd07c7be5563b9a500b

data/Rakefile

@@ -2,31 +2,31 @@ require 'hoe'
 require './lib/pakman/version.rb'
 
 Hoe.spec 'pakman' do
-  
+
   self.version = Pakman::VERSION
-  
+
   self.summary = 'pakman - Template Pack Manager (incl. Embedded Ruby, Liquid, etc.)'
   self.description = summary
-  
+
   self.urls    = ['https://github.com/rubylibs/pakman']
 
   self.author  = 'Gerald Bauer'
   self.email   = 'wwwmake@googlegroups.com'
-  
+
   self.extra_deps = [
     ['fetcher',  '>= 0.4.5'],
     ['logutils', '>= 0.6.1'],
-    ['liquid',   '>= 3.0.6'],
+    ['liquid',   '>= 4.0.0'],
   ]
 
   # switch extension to .rdoc for gihub formatting
   # self.readme_file  = 'README.md'
   # self.history_file = 'History.md'
-  
+
   self.licenses = ['Public Domain']
 
   self.spec_extras = {
-   required_ruby_version: '>= 1.9.2'
+   required_ruby_version: '>= 2.3'
   }
 
 end

data/lib/pakman.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
 ###
-# NB: for local testing run like:
+# Note: for local testing run like:
 #
 # 1.9.x: ruby -Ilib lib/pakman.rb
 
@@ -66,4 +66,4 @@ module Pakman
 end  # module Pakman
 
 
-Pakman.main if __FILE__ == $0
+Pakman.main if __FILE__ == $0

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class Fetch
@@ -13,12 +15,12 @@ class Fetch
   def run
     logger.debug "fetch_uri: >#{opts.fetch_uri}<"
     src = opts.fetch_uri
-     
+
     uri = URI.parse( src )
     logger.debug "scheme: >#{uri.scheme}<, host: >#{uri.host}<, port: >#{uri.port}<, path: >#{uri.path}<"
-    
+
     pakname = Pakman.pakname_from_file( uri.path )
-    logger.debug "pakname: >#{pakname}<"  
+    logger.debug "pakname: >#{pakname}<"
 
     pakpath = File.expand_path( pakname, opts.config_path )
     logger.debug "pakpath: >#{pakpath}<"
@@ -27,4 +29,4 @@ class Fetch
   end # method run
 
 end # class Fetch
-end # module Pakman
+end # module Pakman

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class Gen
@@ -15,20 +17,20 @@ class Gen
   def run( args )
     manifest_name = opts.manifest
     manifest_name = manifest_name.downcase.gsub('.txt', '' )  # remove .txt if present
-    
+
     logger.debug "manifest=#{manifest_name}"
 
     # 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 = manifests[0][1]
     pakpath     = opts.output_path
-    
+
     if args.empty?
       Copier.new.copy_pak( manifestsrc, pakpath )
     else
@@ -40,8 +42,8 @@ class Gen
         Templater.new.merge_pak( manifestsrc, pakpath, Ctx.new(data).ctx, name )
       end
     end
-    
+
   end
 
 end # class Gen
-end # module Pakman
+end # module Pakman

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class List
@@ -14,16 +16,16 @@ class List
 
   def run
     manifests = installed_template_manifests
-    
+
     puts 'Installed template packs in search path'
-    
+
     installed_template_manifest_patterns.each_with_index do |pattern,i|
       puts "    [#{i+1}] #{pattern}"
     end
     puts '  include:'
-    
+
     if manifests.empty?
-      puts "    -- none --"    
+      puts "    -- none --"
     else
       manifests.each do |manifest|
         puts "%16s (%s)" % [manifest[0].gsub('.txt',''), manifest[1]]
@@ -32,4 +34,4 @@ class List
   end
 
 end # class List
-end # module Pakman
+end # module Pakman

data/lib/pakman/cli/ctx.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class Ctx   # Context
@@ -32,4 +34,4 @@ class Ctx   # Context
   end
 
 end # class Ctx
-end # module Pakman
+end # module Pakman

data/lib/pakman/cli/helpers.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 module ManifestHelper
@@ -18,7 +20,7 @@ module ManifestHelper
       "*.txt",
       "*/*.txt"
     ]
-    
+
     patterns = []
     patterns += current_patterns
     patterns += config_patterns
@@ -29,10 +31,10 @@ module ManifestHelper
     excludes = [
       "Manifest.txt",
       "*/Manifest.txt"
-    ]    
+    ]
 
     Finder.new.find_manifests( installed_template_manifest_patterns, excludes )
   end
 
 end # module ManifestHelper
-end # module Pakman
+end # module Pakman

data/lib/pakman/cli/opts.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class Opts
@@ -5,7 +7,7 @@ class Opts
   def list=(value)
     @list = value
   end
-  
+
   def list?
     return false if @list.nil?  # default list flag is false
     @list == true
@@ -29,7 +31,7 @@ class Opts
   def fetch_uri
     @fetch_uri || '-fetch uri required-'
   end
-  
+
   def fetch?
     @fetch_uri.nil? ? false : true
   end
@@ -38,7 +40,7 @@ class Opts
   def manifest=(value)
     @manifest = value
   end
-  
+
   ## fix:/todo: use a different default manifest
   def manifest
     @manifest || 's6.txt'
@@ -48,7 +50,7 @@ class Opts
   def config_path=(value)
     @config_path = value
   end
-  
+
   def config_path
     @config_path || '~/.pak'
   end
@@ -57,10 +59,10 @@ class Opts
   def output_path=(value)
     @output_path = value
   end
-  
+
   def output_path
     @output_path || '.'
   end
 
 end # class Opts
-end # module Pakman
+end # module Pakman

data/lib/pakman/cli/runner.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 class Runner
@@ -12,7 +14,7 @@ class Runner
 
   def run( args )
     opt=OptionParser.new do |cmd|
-    
+
       cmd.banner = "Usage: pakman [options]"
 
       cmd.on( '-f', '--fetch URI', 'Fetch Templates' ) do |uri|
@@ -23,13 +25,13 @@ class Runner
         opts.generate = true
         opts.manifest = manifest
       end
-    
+
       cmd.on( '-l', '--list', "List Installed Templates" ) { opts.list = true }
 
       cmd.on( '-c', '--config PATH', "Configuration Path (default is #{opts.config_path})" ) do |path|
         opts.config_path = path
       end
-    
+
       cmd.on( '-o', '--output PATH', "Output Path (default is #{opts.output_path})" ) { |path| opts.output_path = path }
 
       cmd.on( '-v', '--version', "Show version" ) do
@@ -65,7 +67,7 @@ Examples:
 
 Further information:
   http://geraldb.github.com/pakman
-  
+
 EOS
         exit
       end
@@ -88,4 +90,4 @@ EOS
   end   # method run
 
 end # class Runner
-end # module Pakman
+end # module Pakman

data/lib/pakman/copier.rb

@@ -1,19 +1,11 @@
+# encoding: utf-8
+
 module Pakman
 
 class Copier
 
   include LogUtils::Logging
 
-### todo/fix:
-# remove logger from c'tor
-# use logutils instead
-
-  def initialize( old_logger_do_not_use=nil )
-    if old_logger_do_not_use != nil
-         puts "*** depreciated API call [Pakman::Copier.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
-    end
-  end
-
 
   def copy_pak( manifestsrc, pakpath )
 
@@ -37,13 +29,13 @@ class Copier
 
       logger.debug "destfull=>#{destfull}<"
       logger.debug "destpath=>#{destpath}<"
-      
+
       puts "  Copying to #{dest} from #{source}..."
       FileUtils.copy( source, destfull )
     end
-    
+
     puts "Done (in #{Time.now-start} s)."
   end # method copy_pak
 
 end # class Copier
-end # module Pakman
+end # module Pakman

data/lib/pakman/erb/template.rb

@@ -6,10 +6,10 @@ class ErbTemplate
 
   def self.from_file( path )
     puts "  Loading template (from file) >#{path}<..."
-    text = File.read( path )     ## use/todo: use read utf8 - why? why not??
+    text = File.open( path, 'r:bom|utf-8' ).read     ## note: assume utf8
     self.new( text, path: path )   ## note: pass along path as an option
   end
-  
+
   def self.from_string( text )  ### use parse as alias - why?? why not??
     self.new( text )
   end

data/lib/pakman/erb/templater.rb

@@ -10,21 +10,11 @@ class Templater
 
   include LogUtils::Logging
 
-### todo/fix:
-# remove logger from c'tor
-# use logutils instead
-
-  def initialize( old_logger_do_not_use=nil )
-    if old_logger_do_not_use != nil
-         puts "*** depreciated API call [Pakman::Templater.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
-    end
-  end
-
 
   def merge_pak( manifestsrc, pakpath, binding, name )
-  
+
     start = Time.now
-    
+
     pakname = Pakman.pakname_from_file( manifestsrc )
 
     puts "Merging template pack '#{pakname}'"
@@ -35,11 +25,11 @@ class Templater
     manifest.each do |entry|
       dest   = entry[0]
       source = entry[1]
-      
+
       if dest =~ /__file__/   # replace w/ name
         dest = dest.gsub( '__file__', name )
       end
-      
+
       # get full (absolute) path and make sure path exists
       destfull = File.expand_path( dest, pakpath )
       destpath = File.dirname( destfull )
@@ -47,21 +37,21 @@ class Templater
 
       logger.debug "destfull=>#{destfull}<"
       logger.debug "destpath=>#{destpath}<"
-   
+
       if source =~ /\.erb\.|.erb$/
         puts "  Merging to #{dest}..."
 
-        out = File.new( destfull, 'w+' )
+        out = File.new( destfull, 'w+:utf-8' )   ## note: use utf8 (by default)
         out << ErbTemplate.from_file( source ).render( binding )
         out.flush
         out.close
       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 merge_pak
 

data/lib/pakman/fetcher.rb

@@ -1,27 +1,20 @@
+# encoding: utf-8
+
 module Pakman
 
 class Fetcher
 
   include LogUtils::Logging
 
-### todo/fix:
-# remove logger from c'tor
-# use logutils instead
-
-  def initialize( old_logger_do_not_use=nil )
-    if old_logger_do_not_use != nil
-         puts "*** depreciated API call [Pakman::Fetcher.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
-    end
-  end
 
   def fetch_pak( manifestsrc, pakpath )
 
     start = Time.now
 
     uri = URI.parse( manifestsrc )
-  
+
     logger.debug "scheme: #{uri.scheme}, host: #{uri.host}, port: #{uri.port}, path: #{uri.path}"
-  
+
     dirname  = File.dirname( uri.path )
     filename = File.basename( uri.path )       # e.g. fullerscreen.txt (with extension)
 
@@ -40,7 +33,7 @@ class Fetcher
     puts "Fetching template pack '#{pakname}'"
     puts "    from '#{dlbase}'"
     puts "    saving to '#{pakpath}'"
-  
+
     # step 1: download manifest
     manifestdest = "#{pakpath}/#{filename}"
 
@@ -50,7 +43,7 @@ class Fetcher
 
     ## todo: change back to load_file_core after deprecated api got removed
     manifest = Manifest.load_file_core_v2( manifestdest )
-      
+
     # step 2: download files & templates listed in manifest
     manifest.each do |entry|
       source = entry[1]
@@ -64,7 +57,7 @@ class Fetcher
       logger.debug "destpath=>#{destpath}<"
 
       sourcefull = "#{dlbase}/#{source}"
-    
+
       if source =~ /\.erb\.|.erb$/
         puts "  Downloading template '#{source}'..."
       else
@@ -72,7 +65,7 @@ class Fetcher
       end
 
       fetch_file( sourcefull, destfull )
-    end   
+    end
     puts "Done (in #{Time.now-start} s)."
   end # method fetch_pak
 
@@ -81,9 +74,9 @@ private
   def fetch_file( src, dest )
      ## note: code moved to its own gem, that is, fetcher
      ## see https://github.com/geraldb/fetcher
-    
+
     ::Fetcher::Worker.new.copy( src, dest )
   end
 
 end # class Fetcher
-end # module Pakman
+end # module Pakman

data/lib/pakman/finder.rb

@@ -1,22 +1,15 @@
+# encoding: utf-8
+
 module Pakman
 
 class Finder
 
   include LogUtils::Logging
 
-### todo/fix:
-# remove logger from c'tor
-# use logutils instead
-
-  def initialize( old_logger_do_not_use=nil )
-    if old_logger_do_not_use != nil
-         puts "*** depreciated API call [Pakman::Finder.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
-    end
-  end
 
   def find_manifests( patterns, excludes=[] )
     manifests = []
-    
+
     patterns.each do |pattern|
       pattern.gsub!( '\\', '/')  # normalize path; make sure all path use / only
       logger.debug "Checking >#{pattern}<"
@@ -27,20 +20,20 @@ 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
       end
     end
-    
+
     manifests
   end
-  
+
 private
   def exclude?( file, excludes )
     excludes.each do |pattern|
@@ -54,4 +47,4 @@ private
   end
 
 end # class Finder
-end # module Pakman
+end # module Pakman

data/lib/pakman/liquid/template.rb

@@ -7,10 +7,10 @@ class LiquidTemplate
 
   def self.from_file( path )
     puts "  Loading template (from file) >#{path}<..."
-    text = File.read( path )     ## use/todo: use read utf8 - why? why not??
+    text = File.open( path, 'r:bom|utf-8' ).read     ## note: assume utf8
     self.new( text, path: path )   ## note: pass along path as an option
   end
-  
+
   def self.from_string( text )  ### use parse as alias - why?? why not??
     self.new( text )
   end
@@ -22,13 +22,22 @@ class LiquidTemplate
   def render( hash )
     ## note: hash keys MUST be strings (not symbols) e.g. 'name' => 'Toby'
     ## pp hash
-    @template.render( hash )
+    res = @template.render( hash,  { strict_variables: true, strict_filters: true } )
+
+    ###
+    ##  issue warnings/errors if present
+    errors = @template.errors
+    if errors.size > 0
+      puts "!! WARN - #{errors.size} liquid error(s) when rendering template:"
+      pp errors
+    end
+
+    res
   end
 
 end # class LiquidTemplate
 
 
-
 #########################
 ## convenience helper for pages (with headers/front matter)
 
@@ -39,7 +48,7 @@ class LiquidPageTemplate
     page = Page.from_file( path )     ## use/todo: use read utf8 - why? why not??
     self.new( page.contents, path: path )   ## note: pass along path as an option
   end
-  
+
   def self.from_string( text )  ### use parse as alias - why?? why not??
     ## todo: (auto)-add headers as page.title etc. -- why? why not??
     page = Page.from_string( text )
@@ -49,7 +58,7 @@ class LiquidPageTemplate
   def initialize( text, opts={} )
     @template = LiquidTemplate.new( text, opts )
   end
-  
+
   def render( hash )
     @template.render( hash )
   end
@@ -58,4 +67,3 @@ end ## class LiquidPageTemplate
 
 
 end # module Pakman
-

data/lib/pakman/liquid/templater.rb

@@ -23,9 +23,6 @@ class LiquidTemplater
   REGEX_EXT = Regexp.new( "\\.(#{EXTS.join('|')})$", Regexp::IGNORECASE )
 
 
-  def initialize
-  end
-
   ## rename binding/hash to assigns or something more specific - why? why not?
   def merge_pak( manifestsrc, pakpath, binding, name )
 
@@ -77,7 +74,7 @@ class LiquidTemplater
       if source_page && source_page.headers?
         puts "  Bingo! Front matter (e.g. ---) found. Merging template to #{dest}..."
 
-        out = File.new( destfull, 'w+' )
+        out = File.new( destfull, 'w+:utf-8' )     ## note: use utf8
         ## note: only pass along contents (not headers e.g. front matter for now)
         ##  (auto-)add front matter headers as page.[xxx] - why? why not??
         out << LiquidTemplate.from_string( source_page.contents ).render( binding )

data/lib/pakman/manifest.rb

@@ -6,19 +6,11 @@ class Manifest
 
   include LogUtils::Logging
 
-### todo/fix:
-# remove logger from c'tor
-# use logutils instead
-
-  def initialize( old_logger_do_not_use=nil )
-    if old_logger_do_not_use != nil
-         puts "*** depreciated API call [Pakman::Manifest.initialize] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
-    end
 
+  def initialize()
     @manifest = []
   end
 
-
   def self.load_file_core( old_logger_do_not_use, path )
     puts "*** depreciated API call [Pakman::Manifest.load_file_core] - do NOT pass in logger; no longer required/needed; logger arg will get removed"
 
@@ -59,8 +51,8 @@ class Manifest
 
   def load_file_core_worker( path )
     @manifest = []
-  
-    File.open( path ).readlines.each_with_index do |line,i|
+
+    File.open( path, 'r:bom|utf-8' ).readlines.each_with_index do |line,i|
       case line
       when /^\s*$/
         # skip empty lines
@@ -69,10 +61,10 @@ class Manifest
       else
         logger.debug "line #{i+1}: #{line.strip}"
         values = line.strip.split( /[ <,+]+/ )
-        
+
         # add source for shortcuts (assumes relative path; if not issue warning/error)
         values << values[0] if values.size == 1
-                
+
         @manifest << values
       end
     end
@@ -80,10 +72,10 @@ class Manifest
 
   def load_file_worker( path )
     filename = path
- 
-    puts "  Loading template manifest #{filename}..."  
+
+    puts "  Loading template manifest #{filename}..."
     load_file_core_worker( filename )
-    
+
     # post-processing
     # normalize all source paths (1..-1) /make full path/add template dir
 

data/lib/pakman/page.rb

@@ -10,10 +10,10 @@ class Page
 
   def self.from_file( path )
     puts "  Loading page (from file) >#{path}<..."
-    text = File.read( path )     ## use/todo: use read utf8 - why? why not??
+    text = File.open( path, 'r:bom|utf-8' ).read     ## note: assume utf8
     self.new( text, path: path )   ## note: pass along path as an option
   end
-  
+
   def self.from_string( text )  ### use parse as alias - why?? why not??
     self.new( text )
   end
@@ -48,9 +48,8 @@ class Page
     else
       @contents = text
       @headers  = nil
-    end    
+    end
   end
 
 end # class Page
 end # module Pakman
-

data/lib/pakman/utils.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Pakman
 
 
@@ -10,4 +12,4 @@ module Pakman
     File.basename( path ).downcase.gsub( '.txt', '' )
   end
 
-end # class Pakman
+end # class Pakman

data/lib/pakman/version.rb

@@ -1,4 +1,5 @@
+# encoding: utf-8
 
 module Pakman
-  VERSION = '0.7.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pakman
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fetcher
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.6
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.16'
 description: pakman - Template Pack Manager (incl. Embedded Ruby, Liquid, etc.)
 email: wwwmake@googlegroups.com
 executables:
@@ -149,7 +149,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: pakman - Template Pack Manager (incl. Embedded Ruby, Liquid, etc.)