Merge pull request #23 from borisyukd/master

Fix deprecated Puppet.parse_config
petems · Nov 6, 2013 · 0534ad7 · 0534ad7
2 parents 02691d7 + dd66ac1
commit 0534ad7
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/cucumber-puppet/puppet.rb b/lib/cucumber-puppet/puppet.rb
@@ -48,7 +48,11 @@ def klass=(klass)
   # Compile catalog for configured testnode.
   def compile_catalog( node = nil )
     Puppet.settings.handlearg("--confdir", @puppetcfg['confdir'])
-    Puppet.parse_config
+    begin
+      Puppet.initialize_settings unless Puppet.settings.send(:global_defaults_initialized?)
+    rescue NameError
+      Puppet.parse_config
+    end
     # reset confdir in case it got overwritten
     @puppetcfg.each do |option,value|
       Puppet.settings.handlearg("--#{option}", value)