From 1603f7363728dc41f67cd189ca0dcbf074ec44b4 Mon Sep 17 00:00:00 2001
From: Jesse Wolfe <jes5199@gmail.com>
Date: Thu, 18 Mar 2010 19:01:29 -0700
Subject: Feature #3394 REST Runner, preparation

Rename Puppet::Agent::Runner to Puppet::Run, for consistency
---
 lib/puppet/agent.rb                  |  2 --
 lib/puppet/agent/runner.rb           | 65 ------------------------------------
 lib/puppet/indirector/run/rest.rb    |  6 ++++
 lib/puppet/indirector/runner/rest.rb |  7 ----
 lib/puppet/network/handler/runner.rb |  4 +--
 lib/puppet/run.rb                    | 65 ++++++++++++++++++++++++++++++++++++
 6 files changed, 73 insertions(+), 76 deletions(-)
 delete mode 100644 lib/puppet/agent/runner.rb
 create mode 100644 lib/puppet/indirector/run/rest.rb
 delete mode 100644 lib/puppet/indirector/runner/rest.rb
 create mode 100644 lib/puppet/run.rb

(limited to 'lib')

diff --git a/lib/puppet/agent.rb b/lib/puppet/agent.rb
index f07305559..84bda6756 100644
--- a/lib/puppet/agent.rb
+++ b/lib/puppet/agent.rb
@@ -8,8 +8,6 @@ class Puppet::Agent
     require 'puppet/agent/locker'
     include Puppet::Agent::Locker
 
-    require 'puppet/agent/runner'
-
     attr_reader :client_class, :client, :splayed
 
     # Just so we can specify that we are "the" instance.
diff --git a/lib/puppet/agent/runner.rb b/lib/puppet/agent/runner.rb
deleted file mode 100644
index 705b6c269..000000000
--- a/lib/puppet/agent/runner.rb
+++ /dev/null
@@ -1,65 +0,0 @@
-require 'puppet/agent'
-require 'puppet/configurer'
-require 'puppet/indirector'
-
-# A basic class for running the agent.  Used by
-# puppetrun to kick off agents remotely.
-class Puppet::Agent::Runner
-    extend Puppet::Indirector
-    indirects :runner, :terminus_class => :rest
-
-    attr_reader :status, :background, :options
-
-    def agent
-        Puppet::Agent.new(Puppet::Configurer)
-    end
-
-    def background?
-        background
-    end
-
-    def initialize(options = {})
-        if options.include?(:background)
-            @background = options[:background]
-            options.delete(:background)
-        end
-
-        valid_options = [:tags, :ignoreschedules]
-        options.each do |key, value|
-            raise ArgumentError, "Runner does not accept %s" % key unless valid_options.include?(key)
-        end
-
-        @options = options
-    end
-
-    def log_run
-        msg = ""
-        msg += "triggered run" %
-        if options[:tags]
-            msg += " with tags %s" % options[:tags]
-        end
-
-        if options[:ignoreschedules]
-            msg += " ignoring schedules"
-        end
-
-        Puppet.notice msg
-    end
-
-    def run
-        if agent.running?
-            @status = "running"
-            return
-        end
-
-        log_run()
-
-        if background?
-            Thread.new { agent.run(options) }
-        else
-            agent.run(options)
-        end
-
-        @status = "success"
-    end
-end
diff --git a/lib/puppet/indirector/run/rest.rb b/lib/puppet/indirector/run/rest.rb
new file mode 100644
index 000000000..7cf6411f1
--- /dev/null
+++ b/lib/puppet/indirector/run/rest.rb
@@ -0,0 +1,6 @@
+require 'puppet/run'
+require 'puppet/indirector/rest'
+
+class Puppet::Run::Rest < Puppet::Indirector::REST
+    desc "Trigger Agent runs via REST."
+end
diff --git a/lib/puppet/indirector/runner/rest.rb b/lib/puppet/indirector/runner/rest.rb
deleted file mode 100644
index 25d3def3f..000000000
--- a/lib/puppet/indirector/runner/rest.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'puppet/agent'
-require 'puppet/agent/runner'
-require 'puppet/indirector/rest'
-
-class Puppet::Agent::Runner::Rest < Puppet::Indirector::REST
-    desc "Trigger Agent runs via REST."
-end
diff --git a/lib/puppet/network/handler/runner.rb b/lib/puppet/network/handler/runner.rb
index 070cae114..4f8247214 100755
--- a/lib/puppet/network/handler/runner.rb
+++ b/lib/puppet/network/handler/runner.rb
@@ -1,4 +1,4 @@
-require 'puppet/agent/runner'
+require 'puppet/run'
 
 class Puppet::Network::Handler
     class MissingMasterError < RuntimeError; end # Cannot find the master client
@@ -20,7 +20,7 @@ class Puppet::Network::Handler
             options[:ignoreschedules] = ignoreschedules if ignoreschedules
             options[:background] = !fg
 
-            runner = Puppet::Agent::Runner.new(options)
+            runner = Puppet::Run.new(options)
 
             runner.run
 
diff --git a/lib/puppet/run.rb b/lib/puppet/run.rb
new file mode 100644
index 000000000..1503f5d7f
--- /dev/null
+++ b/lib/puppet/run.rb
@@ -0,0 +1,65 @@
+require 'puppet/agent'
+require 'puppet/configurer'
+require 'puppet/indirector'
+
+# A basic class for running the agent.  Used by
+# puppetrun to kick off agents remotely.
+class Puppet::Run
+    extend Puppet::Indirector
+    indirects :runner, :terminus_class => :rest
+
+    attr_reader :status, :background, :options
+
+    def agent
+        Puppet::Agent.new(Puppet::Configurer)
+    end
+
+    def background?
+        background
+    end
+
+    def initialize(options = {})
+        if options.include?(:background)
+            @background = options[:background]
+            options.delete(:background)
+        end
+
+        valid_options = [:tags, :ignoreschedules]
+        options.each do |key, value|
+            raise ArgumentError, "Runner does not accept %s" % key unless valid_options.include?(key)
+        end
+
+        @options = options
+    end
+
+    def log_run
+        msg = ""
+        msg += "triggered run" %
+        if options[:tags]
+            msg += " with tags %s" % options[:tags]
+        end
+
+        if options[:ignoreschedules]
+            msg += " ignoring schedules"
+        end
+
+        Puppet.notice msg
+    end
+
+    def run
+        if agent.running?
+            @status = "running"
+            return
+        end
+
+        log_run()
+
+        if background?
+            Thread.new { agent.run(options) }
+        else
+            agent.run(options)
+        end
+
+        @status = "success"
+    end
+end
-- 
cgit