puppet_agent_mgr 0.0.7 → 0.0.8

data/lib/puppet_agent_mgr.rb

@@ -2,6 +2,9 @@ require 'puppet_agent_mgr/common'
 
 module PuppetAgentMgr
   def self.manager
+    # puppet 2 requires this, 3 probably just ignores it
+    $puppet_application_name = :agent
+
     require 'puppet'
     require 'json'
 

data/lib/puppet_agent_mgr/v2/manager.rb

@@ -10,6 +10,14 @@ module PuppetAgentMgr::V2
       include Unix
     end
 
+    def initialize(testing=false)
+      unless testing
+        $puppet_application_mode = Puppet::Util::RunMode[:agent]
+        Puppet.settings.use :main, :agent
+        Puppet.parse_config
+      end
+    end
+
     # enables the puppet agent, it can now start applying catalogs again
     def enable!
       raise "Already enabled" if enabled?

data/lib/puppet_agent_mgr/v3/manager.rb

@@ -11,11 +11,11 @@ module PuppetAgentMgr::V3
     include PuppetAgentMgr::Common
 
     def initialize(testing=false)
-      unless Puppet.settings.app_defaults_initialized?
+      unless testing || 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))
+        Puppet.settings.initialize_global_settings
+        Puppet.settings.initialize_app_defaults(Puppet::Settings.app_defaults_for_run_mode(Puppet.run_mode))
       end
     end
 

data/lib/puppet_agent_mgr/v3/unix.rb

@@ -3,8 +3,8 @@ module PuppetAgentMgr::V3
     extend Unix
     # is the agent daemon currently in the unix process list?
     def daemon_present?
-      if File.exist?(Puppet[:agent_catalog_run_lockfile])
-        return has_process_for_pid?(File.read(Puppet[:agent_catalog_run_lockfile]))
+      if File.exist?(Puppet[:pidfile])
+        return has_process_for_pid?(File.read(Puppet[:pidfile]))
       end
 
       return false
@@ -14,8 +14,8 @@ module PuppetAgentMgr::V3
     def applying?
       return false if disabled?
 
-      if File::Stat.new(Puppet[:pidfile]).size > 0
-        return has_process_for_pid(File.read(Puppet[:pidfile]))
+      if File::Stat.new(Puppet[:agent_catalog_run_lockfile]).size > 0
+        return has_process_for_pid(File.read(Puppet[:agent_catalog_run_lockfile]))
       end
 
       return false
@@ -24,7 +24,7 @@ module PuppetAgentMgr::V3
     end
 
     def signal_running_daemon
-      pid = File.read(Puppet[:agent_catalog_run_lockfile])
+      pid = File.read(Puppet[:pidfile])
 
       if has_process_for_pid?(pid)
         begin

data/lib/puppet_agent_mgr/version.rb

@@ -1,3 +1,3 @@
 module PuppetAgentMgr
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet_agent_mgr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-29 00:00:00 +01:00
+date: 2012-10-25 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency