puppet_agent_mgr 0.0.3 → 0.0.4

data/lib/puppet_agent_mgr/common.rb

@@ -80,7 +80,8 @@ module PuppetAgentMgr
       opts << "--splay" if splay == true
       opts << "--no-splay" if splay == false
       opts << "--splaylimit %s" % splaylimit if splaylimit
-      opts << "--noop" if noop
+      opts << "--noop" if noop == true
+      opts << "--no-noop" if noop == false
       opts << "--environment %s" % environment if environment
       opts << "--server %s" % host if host
       opts << "--masterport %s" % port if port
@@ -92,7 +93,7 @@ module PuppetAgentMgr
     #
     # :foreground_run - runs in the foreground a --test run
     # :signal_daemon  - if the daemon is running, sends it USR1 to wake it up
-    # :noop           - does a noop run if possible
+    # :noop           - enables or disabled noop mode based on true/false
     # :tags           - an array of tags to limit the run to
     # :environment    - the environment to run
     # :server         - the puppet master to use, can be some.host or some.host:port
@@ -113,7 +114,7 @@ module PuppetAgentMgr
 
       splay = options.fetch(:splay, nil)
       splaylimit = options.fetch(:splaylimit, nil)
-      noop = options.fetch(:noop, false)
+      noop = options.fetch(:noop, nil)
       signal_daemon = options.fetch(:signal_daemon, true)
       foreground_run = options.fetch(:foreground_run, false)
       environment = options[:environment]

data/lib/puppet_agent_mgr/v3/manager.rb

@@ -10,12 +10,13 @@ module PuppetAgentMgr::V3
 
     include PuppetAgentMgr::Common
 
-    def initialize
-      # there has to be a better way...
-      require 'puppet/util/run_mode'
-      Puppet.settings.preferred_run_mode = :agent
-      run_mode = Puppet::Util::RunMode[ Puppet.settings.preferred_run_mode ]
-      Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
+    def initialize(testing=false)
+      unless Puppet.settings.app_defaults_initialized?
+        require 'puppet/util/run_mode'
+        Puppet.settings.preferred_run_mode = :agent
+        run_mode = Puppet::Util::RunMode[ Puppet.settings.preferred_run_mode ]
+        Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(run_mode))
+      end
     end
 
     # enables the puppet agent, it can now start applying catalogs again

data/lib/puppet_agent_mgr/version.rb

@@ -1,3 +1,3 @@
 module PuppetAgentMgr
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet_agent_mgr
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 +01:00
+date: 2012-09-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency