kafo_parsers 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebb12bf6ecf4fa190d9839ee1d706643ecca536
-  data.tar.gz: 5b436e733a9759681a24c473383649ca4acf8b88
+  metadata.gz: b0c3926a766e0ebd3f3d156451176f9d02e68a21
+  data.tar.gz: 98db6338da1c9acf47304c93dc4d56a75a07d6bb
 SHA512:
-  metadata.gz: a2250f2cb342093586f88ed2e57289ab8b205b090d130122b63e32172a65e5d147a09edeb5afb3fcdfd779bb9341300e3df938f09f32973847643205fb2a9ba8
-  data.tar.gz: 965bd310c428fac43f795ab118fb4b02ee7a2e3790a46081ba02e17359323fccc28b636822e1155d098ca393f50058f6f5544b90ac8488b7891c7a16d555c170
+  metadata.gz: d23d9e3fc141268358563fef5ccf804d9b073a37b093cefb287652aff56a792c67c6fa222a3e42a48add29c5910fb053fd3fb7a6c66b255a755c728974ffb24b
+  data.tar.gz: 4ab94d2975ca76e8e634e655cb08d41816006539de778af31550af18f12d5973dc0dfa04d9b1c93be371beb51aa82fe60ad5c103a30257ecfe050f4a4cb1c47b

data/README.md

@@ -60,7 +60,9 @@ Add `gem 'puppet', '< 4'` to your application's Gemfile to use this.
 #### PuppetStringsModuleParser
 
 If you use Puppet 4 you prefer PuppetStringsModuleParser which leverages
-puppet-strings to parse puppet manifests.
+puppet-strings to parse puppet manifests. This requires puppet-strings 0.99 or
+higher and may be installed either as a gem in the same environment, or in a
+Puppet AIO installation.
 
 ```ruby
 require 'kafo_parsers/puppet_strings_module_parser'

data/lib/kafo_parsers/puppet_strings_module_parser.rb

@@ -36,7 +36,7 @@ module KafoParsers
       @file = file
       raise KafoParsers::ModuleName, "File not found #{file}, check your answer file" unless File.exists?(file)
 
-      command = "#{self.class.puppet_bin} strings #{file} --emit-json-stdout"
+      command = "#{self.class.puppet_bin} strings generate --emit-json-stdout #{file}"
       @raw_json = `#{command}`
       unless $?.success?
         raise KafoParsers::ParseError, "'#{command}' returned error\n#{@raw_json}"
@@ -60,7 +60,7 @@ module KafoParsers
           binary = File.join(path, 'puppet')
           binary if File.executable?(binary)
         end
-        File.join(found_puppet_path, 'puppet') || 'puppet'
+        found_puppet_path.nil? ? 'puppet' : File.join(found_puppet_path, 'puppet')
       end
     end
 
@@ -77,7 +77,11 @@ module KafoParsers
     end
 
     def values
-      Hash[@parsed_hash['parameters'].map { |name, value| [ name, value.nil? ? nil : sanitize(value) ] }]
+      Hash[
+        # combine known parameters (from tags) with any defaults provided
+        tag_params.select { |param| !param['types'].nil? }.map { |param| [ param['name'], nil ] } +
+          @parsed_hash.fetch('defaults', {}).map { |name, value| [ name, value.nil? ? nil : sanitize(value) ] }
+      ]
     end
 
     # unsupported in puppet strings parser
@@ -96,8 +100,8 @@ module KafoParsers
       data = { :docs => {}, :types => {}, :groups => {}, :conditions => {} }
       if @parsed_hash.nil?
         raise KafoParsers::DocParseError, "no documentation found for manifest #{@file}, parsing error?"
-      elsif !@parsed_hash['docstring'].nil?
-        parser             = DocParser.new(@parsed_hash['docstring']).parse
+      elsif !@parsed_hash['docstring'].nil? && !@parsed_hash['docstring']['text'].nil?
+        parser             = DocParser.new(@parsed_hash['docstring']['text']).parse
         data[:docs]        = parser.docs
         data[:groups]      = parser.groups
         data[:types]       = merge_doc_types(parser.types)
@@ -125,7 +129,15 @@ module KafoParsers
     end
 
     def merge_doc_types(types)
-      Hash[@parsed_hash['signatures'].flatten.map { |param| [ param['name'], param['type'] ] }].merge(types)
+      Hash[tag_params.select { |param| !param['types'].nil? }.map { |param| [ param['name'], param['types'].first ] }].merge(types)
+    end
+
+    def tag_params
+      if @parsed_hash['docstring']['tags']
+        @parsed_hash['docstring']['tags'].select { |tag| tag['tag_name'] == 'param' }
+      else
+        []
+      end
     end
 
   end

data/lib/kafo_parsers/version.rb

@@ -1,3 +1,3 @@
 module KafoParsers
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo_parsers
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler