puppet-function-updater 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5913312054d42bd2b3bfdcb744600991f0b23aa09a4763153f48f0cddb2f355
-  data.tar.gz: 8734defb6ff4b41c8e99dcd2baad098aa58a3534d2ed4bb61ba244535d405a63
+  metadata.gz: '094bf95a8bf88b5e9448ae673d41dc8f00302a82c8aab047f6910786c51b28e0'
+  data.tar.gz: f4b3e071ff53aa311f44b5918e2820fa52290f8c1f49126aed68ad4d1dcb64d2
 SHA512:
-  metadata.gz: a4ddd547257eca3091c81ca70f85a8ce81d371f2f409f335079cb26fc3fe263b2698cf0fe1c71d2a688662f031127b1212a27d169e9d1c6fe9054d9a3b02d83c
-  data.tar.gz: 3b987e1bce14d1b7d4f74c459911975cadd43816b38da43e6ce70d64da5f976f98acb580f91e8276ebcb549f29c81ca807631618ce6f8558322c5f067dbaf764
+  metadata.gz: ee2c6b1f06b074eabfdc11c659673e37c71013e5c7a0557d9991ac124ada0031847df5bb239db2a6773d0da51a2cd05d697c968bfe7bb9097c45e2e8e61bf874
+  data.tar.gz: 415fc16222ad2f3796b71a99e97a471868af5e5605c2e7eea81ab5e936acdc15df15bb2cc846d34c4f9b5d4f003637ba3423795ac2dfee046447030dc41985a4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+v0.0.5
+  * Catch a lot of weird little edge cases
+
 v0.0.4
   * Generate a simple spec test for the new function
   * Properly report the `require` warning as a warning

data/bin/puppet_function_updater

@@ -65,8 +65,8 @@ options[:filenames].flatten!
 
 if options[:namespace].nil?
   if File.exist? 'metadata.json'
-    metadata = JSON.parse(File.read('metadata.json'))
-    options[:namespace] = metadata['name'].split('-')[1]
+    metadata = JSON.parse(File.read('metadata.json')) rescue {'name' => ''}
+    options[:namespace] = metadata['name'].split('-')[1] rescue nil
   else
     $logger.warn "*********** Namespace is highly suggested! *********** "
     $logger.warn "      Either run this command from within a module"

data/lib/pfu/parser.rb

@@ -1,3 +1,6 @@
+# We don't actually use this, but a surprising number of functions assume it
+require 'yaml'
+
 module Puppet
   module Parser
     module Functions
@@ -13,6 +16,7 @@ end
 # shudder
 module Kernel
   alias original_require require
+  alias original_require_relative require_relative
 
   def require(*a, &b)
     original_require(*a, &b)
@@ -20,16 +24,26 @@ module Kernel
     $logger.warn "The function attempted to load libraries outside the function block."
     $logger.warn "#{e.message} (ignored)"
   end
+
+  def require_relative(*a, &b)
+    original_require_relative(*a, &b)
+  rescue LoadError => e
+    $logger.warn "The function attempted to relatively load libraries outside the function block."
+    $logger.warn "#{e.message} (ignored)"
+  end
 end
 
 
 class Pfu::Parser
   def self.parse(path)
+    return unless File.extname(path) == '.rb'
     source = File.read(path)
     lines  = source.split("\n")
 
     begin
       funcname, opts, lineno = eval(source)
+      
+      raise 'Invalid function definition' unless (funcname and opts and lineno)
     rescue => e
       $logger.error "The function in #{path} doesn't load properly!"
       $logger.error e.message
@@ -39,12 +53,12 @@ class Pfu::Parser
     stripcount = case source
     when /module\s+Puppet::Parser::Functions/
       2
-    when /Puppet::Parser::Functions.newfunction/
+    when /Puppet::Parser::Functions(.|::)newfunction/
       1
     end
 
     block = lines[(lineno-1)..-1].join("\n")
-    block.gsub!(/\A.*\|\w+\|/, '')                               # remove block arg string ("|args|")
+    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+)['"]?/)
@@ -53,10 +67,9 @@ class Pfu::Parser
     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#")
+    args   = lines[lineno-1].match(/\|\s*\*?(\w+)\s*\|/)[1]
 
+    opts[:doc]            = opts[:doc].gsub("\n", "\n#") unless opts[:doc].nil?
     opts[:name]           = funcname.to_sym
     opts[:header]         = header
     opts[:args]           = args

data/lib/pfu/version.rb

@@ -1,3 +1,3 @@
 class Pfu
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/templates/function.erb

@@ -10,7 +10,7 @@
 # ---- original file header ----
 #
 # @summary
-#   <%= opts[:doc] %>
+#   <%= opts[:doc] || 'Summarise what the function does here' %>
 #
 Puppet::Functions.create_function(:'<%= opts[:fullname] %>') do
   # @param <%= opts[:args] %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-function-updater
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ben Ford
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-29 00:00:00.000000000 Z
+date: 2020-01-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   Run this command with a space separated list of either function file paths, or
@@ -34,7 +34,7 @@ files:
 - lib/puppet/functions/testing/noopts.rb
 - templates/function.erb
 - templates/function_spec.erb
-homepage: 
+homepage: https://binford2k.com/2019/11/27/automagic-function-port/
 licenses:
 - Apache-2.0
 metadata: {}
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Automagically ports legacy Puppet functions to the modern API.