kafo 0.3.13 → 0.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: dd5b4f2364153ba6690849b0cd08ebcd09b4eb89
4
- data.tar.gz: 9ac5cbef686845a19bd1060f8b7df8c18bab47b6
3
+ metadata.gz: 0496a19873a30d06682f5f4bddae25d90c838c27
4
+ data.tar.gz: f0bc2200a00015baa213310d5eca3debee109bdc
5
5
  SHA512:
6
- metadata.gz: b2c23fd7953c7d3efda843dede39af12180d529ad317e065ce297d7c1f9b9a21595cc4b95f1ce485e1d4e172e736372db2d02b5f2f9970da814299e600ff9108
7
- data.tar.gz: 82e5bbf8b98c25017f5c1d075f2f7c5ebd3cc69387ddd2f5e20c52357c23cab20a992f57b9b23d7d2a5fa6021e1fffb9f446c609a3268743f99c27d038c1a5e8
6
+ metadata.gz: acd423eb8378d5037fb17f7a9303f3ee286e23d1663b2d058853c12b99643e8b256e4fac02cbb1382b201ee81184636448ea30312f5c265b81617943cf71c1b6
7
+ data.tar.gz: ad77e18c4f672d344c410eafe4c87ba950e6ddc4d998be4d3662d44b5cbaa9ca2f5effcc96c7f38237c05565216f8a08e0c78e1877c52d689e728a78a29fef11
@@ -2,7 +2,14 @@
2
2
  module Kafo
3
3
  class Validator
4
4
 
5
+ def self.prepare_functions
6
+ return true if @reset || !Puppet::Parser::Functions.respond_to?(:reset)
7
+ Puppet::Parser::Functions.reset
8
+ @reset = true
9
+ end
10
+
5
11
  def initialize(params)
12
+ self.class.prepare_functions
6
13
  validate_files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/validate_*.rb'
7
14
  is_function_files = KafoConfigure.modules_dir + '/*/lib/puppet/parser/functions/is_*.rb'
8
15
  definitions = Dir.glob(validate_files) + Dir.glob(is_function_files)
@@ -57,7 +64,8 @@ module Kafo
57
64
  def engine
58
65
  @engine ||= begin
59
66
  klass = Class.new
60
- klass.send :include, Puppet::Parser::Functions.environment_module
67
+ env = Puppet::PUPPETVERSION.start_with?('2.') ? env.name : Puppet.lookup(:current_environment)
68
+ klass.send :include, Puppet::Parser::Functions.environment_module(env)
61
69
  klass.new
62
70
  end
63
71
  end
data/lib/kafo/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # encoding: UTF-8
2
2
  module Kafo
3
- VERSION = "0.3.13"
3
+ VERSION = "0.3.14"
4
4
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kafo
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.13
4
+ version: 0.3.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marek Hulan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-14 00:00:00.000000000 Z
11
+ date: 2014-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler