puppet-function-updater 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43740352c17551ddd5440e4ece70ad04248b2ee9a3c64ad7a8cd13e2f6a2c8f1
-  data.tar.gz: c515002e42faadc8fee35f37a6a76805d2cc0d44ace7d9609e494cc4590c9360
+  metadata.gz: c4e20e5f6989948ee8a47c6be69b5c381a0817ae8b26ccf7daac5d3e437de74b
+  data.tar.gz: cd83a4c1687b449691de92a67de33a9a80fd11f31411232ff41472b4735cd3b5
 SHA512:
-  metadata.gz: a8fa785031af5cd3d22adaee5db4363bb8849ee541ef0c939cdb67d34e9715b266f83ddf708721ac4f3c23ccbdd84d999eba5c8daef97b0a326097fb26cdad2b
-  data.tar.gz: 642f1dedcb74988a68f6c872598ac9d18f55db968a328b4a8f4a7b58f00b9d0f9e69584605f767fcaf0f94fcfb2c107e2b6001a6e7c000fd65787fc4ab603bfe
+  metadata.gz: d308a64a254c50864dd8b0840f42cb2feee2da57c452696b0e3069ddb602bbb35119ee3708a71801e057c51c5b3aebaaff52ebf113e0a8380f714b1e5f1f1d66
+  data.tar.gz: c08d5bef117c504be32a60e19b42e860d63f9e390c0708d64ef0a345985499d7caf43b2e10c8b2d2494de4b0459d908807578d961d9fc65925814f7923939e9a

data/bin/puppet_function_updater

@@ -3,6 +3,7 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'logger'
 require 'optparse'
+require 'json'
 require 'pfu'
 
 loglevel = Logger::WARN

data/lib/pfu.rb

@@ -10,7 +10,7 @@ class Pfu
 
   def refactor!
     @filenames.each do |path|
-      data = Pfu::Parser.parse(path)
+      next unless data = Pfu::Parser.parse(path)
       data[:namespace] = @namespace
       Pfu::Generator.write(data)
     end

data/lib/pfu/generator.rb

@@ -19,12 +19,14 @@ class Pfu::Generator
     template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'function.erb')
     contents = ERB.new(File.read(template), nil, '-').result(binding)
 
+    $logger.info "Creating #{newpath}"
+    $logger.debug "Function contents:\n#{contents}"
+
     begin
       # syntax check the code before writing it
       RubyVM::InstructionSequence.compile(contents)
       FileUtils.mkdir_p("lib/puppet/functions/#{opts[:namespace]}")
       File.write(newpath, contents)
-      $logger.info "Created #{newpath}."
     rescue Exception => e
       $logger.error "Oh crap; the generated function isn't valid Ruby code!"
       $logger.error e.message

data/lib/pfu/parser.rb

@@ -10,14 +10,31 @@ module Puppet
   end
 end
 
+# shudder
+module Kernel
+  alias original_require require
+
+  def require(*a, &b)
+    original_require(*a, &b)
+  rescue LoadError => e
+    $logger.error "The function attempted to load libraries outside the function block."
+    $logger.warn "#{e.message} (ignored)"
+  end
+end
+
 
 class Pfu::Parser
   def self.parse(path)
     source = File.read(path)
     lines  = source.split("\n")
 
-    funcname, opts, lineno = eval(source)
-
+    begin
+      funcname, opts, lineno = eval(source)
+    rescue => e
+      $logger.error "The function in #{path} doesn't load properly!"
+      $logger.error e.message
+      return nil
+    end
 
     stripcount = case source
     when /module\s+Puppet::Parser::Functions/
@@ -30,9 +47,15 @@ class Pfu::Parser
     block.gsub!(/\A.*\|\w+\|/, '')                               # remove block arg string ("|args|")
     block.gsub!(/((end|})\s*){#{stripcount}}(^#.*|\s*)*\z/, '')  # remove closing block keywords and trailing comments
 
+    heredoc = source.match(/<<-['"]?(\w+)['"]?/)
+    if heredoc
+      block.gsub!(/\A.*#{heredoc[1]}/m, '')
+    end
+
     header = lines[0...(lines.index { |l| l =~ /Puppet::Parser::Functions/ })].join("\n")
     args   = lines[lineno-1].match(/\|\s*(\w+)\s*\|/)[1]
 
+    opts[:doc].gsub!("\n", "\n#")
 
     opts[:name]           = funcname.to_sym
     opts[:header]         = header

data/lib/pfu/version.rb

@@ -1,3 +1,3 @@
 class Pfu
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-function-updater
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ben Ford