kafo_parsers 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7317ced24d434141968dbe2d6a7587562c1315ee
-  data.tar.gz: fad877075b7f49f78959329081cb69649b20f1d3
+  metadata.gz: ad4ca00907177c84240bc1832eb04c82d69a142c
+  data.tar.gz: 8e6451116fa04f7187efb91912bd5ca08bdbe62c
 SHA512:
-  metadata.gz: 7eef567e4e770c4d00a2f12ef2cc3a7bc71554d647695f9d286fc07f463798836d61572fb434c781bcff3a729f7244d10ee7ffd68389b25de1f7524aa3b27e50
-  data.tar.gz: 7df4289db02589fc951d7f421be6995fc97e788420d2de4878ef547d3f9816b398b8f3142fc99439c80d6ac3291b43c71e7653ea0ce02bd028805577e1ea1643
+  metadata.gz: b06502487c36d81eb9115bbad6abd8dc8da1fe382389f93c268ff00c057d01ea74383338ba7be06608018f87ad5c2d99df2fdc996b0655b4655e026d7adb9623
+  data.tar.gz: edbdcd0c69878f1d540a4a62386c302196799f491e0885f12b220ffc3b5889190edb7d241250fa71d6d492c7f332603ad5604f6a143c0ef88280a4fad9bdcc6c

data/lib/kafo_parsers/puppet_module_parser.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
 require 'kafo_parsers/doc_parser'
+require 'kafo_parsers/validation'
 
 module KafoParsers
   # Based on ideas from puppet-parse by Johan van den Dorpe
@@ -44,7 +45,7 @@ module KafoParsers
         else
           Puppet.parse_config
         end
-        Encoding.default_external = Encoding::UTF_8 if defined?(Encoding) && Encoding.respond_to?(:default_external=)
+        Encoding.default_external = Encoding::UTF_8 if defined?(Encoding)
         @@puppet_initialized = true
       end
 
@@ -75,7 +76,9 @@ module KafoParsers
 
     def validations(param = nil)
       return [] if @object.code.nil?
-      @object.code.select { |stmt| stmt.is_a?(Puppet::Parser::AST::Function) && stmt.name =~ /^validate_/ }
+      @object.code.select { |stmt| stmt.is_a?(Puppet::Parser::AST::Function) && stmt.name =~ /^validate_/ }.map do |v|
+        Validation.new(v.name, interpret_validation_args(v.arguments))
+      end
     end
 
     # returns data in following form
@@ -100,5 +103,23 @@ module KafoParsers
       end
       data
     end
+
+    private
+
+    def interpret_validation_args(args)
+      args.map do |arg|
+        if arg.is_a?(Puppet::Parser::AST::Variable)
+          arg.to_s
+        elsif arg.is_a?(Puppet::Parser::AST::ASTArray)
+          interpret_validation_args(arg.to_a)
+        elsif arg.is_a?(Puppet::Parser::AST::Concat)
+          interpret_validation_args(arg.value).join
+        elsif arg.respond_to? :value
+          arg.value
+        else
+          arg
+        end
+      end
+    end
   end
 end

data/lib/kafo_parsers/puppet_strings_module_parser.rb

@@ -24,7 +24,7 @@ module KafoParsers
     end
 
     def self.available?
-      `#{puppet_bin} help strings`
+      `#{puppet_bin} help strings 2>&1`
       if $?.success?
         return true
       else
@@ -42,6 +42,7 @@ module KafoParsers
         raise KafoParsers::ParseError, "'#{command}' returned error\n#{@raw_json}"
       end
 
+      Encoding.default_external = Encoding::UTF_8 if defined?(Encoding)
       begin
         @complete_hash = ::JSON.parse(@raw_json)
       rescue ::JSON::ParserError => e

data/lib/kafo_parsers/validation.rb

@@ -0,0 +1,10 @@
+module KafoParsers
+  class Validation
+    attr_reader :name, :arguments
+
+    def initialize(name, arguments)
+      @name = name
+      @arguments = arguments
+    end
+  end
+end

data/lib/kafo_parsers/version.rb

@@ -1,3 +1,3 @@
 module KafoParsers
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kafo_parsers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marek Hulan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.9.0
-- !ruby/object:Gem::Dependency
-  name: puppet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -139,6 +125,7 @@ files:
 - lib/kafo_parsers/parsers.rb
 - lib/kafo_parsers/puppet_module_parser.rb
 - lib/kafo_parsers/puppet_strings_module_parser.rb
+- lib/kafo_parsers/validation.rb
 - lib/kafo_parsers/version.rb
 homepage: https://github.com/theforeman/kafo_parsers
 licenses: