From 5d50ca790e7f752e07da84197b52ff84d2dcfdb4 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Wed, 3 Oct 2007 17:31:57 -0500
Subject: Fixing #814 -- when files are missing, the exceptions should now be
 more reasonable.

---
 lib/puppet/network/handler/configuration.rb | 17 +++++++----------
 lib/puppet/network/handler/master.rb        |  7 +------
 2 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/handler/configuration.rb b/lib/puppet/network/handler/configuration.rb
index 2df1b3ab4..353693bdc 100644
--- a/lib/puppet/network/handler/configuration.rb
+++ b/lib/puppet/network/handler/configuration.rb
@@ -107,16 +107,13 @@ class Puppet::Network::Handler
             benchmark(level, "Compiled configuration for %s" % node.name) do
                 begin
                     config = interpreter.compile(node)
-                rescue Puppet::Error => detail
-                    if Puppet[:trace]
-                        puts detail.backtrace
-                    end
-                    unless local?
-                        Puppet.err detail.to_s
-                    end
-                    raise XMLRPC::FaultException.new(
-                        1, detail.to_s
-                    )
+                rescue => detail
+                    # If we're local, then we leave it to the local system
+                    # to handle error reporting, but otherwise we do it here
+                    # so the interpreter doesn't need to know if the parser
+                    # is local or not.
+                    Puppet.err(detail.to_s) unless local?
+                    raise
                 end
             end
 
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 030950c61..25c4318b8 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -77,12 +77,7 @@ class Puppet::Network::Handler
             Puppet::Node::Facts.new(client, facts).save
 
             # And get the configuration from the config handler
-            begin
-                config = config_handler.configuration(client)
-            rescue => detail
-                puts detail.backtrace
-                raise
-            end
+            config = config_handler.configuration(client)
 
             return translate(config.extract)
         end
-- 
cgit 


From fd11603fe47668ba72f0d3f2b984174331a0a154 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Wed, 3 Oct 2007 21:55:41 -0500
Subject: Removing the Id tags from all of the files

---
 lib/puppet/network/authconfig.rb             | 1 -
 lib/puppet/network/authorization.rb          | 1 -
 lib/puppet/network/authstore.rb              | 1 -
 lib/puppet/network/client.rb                 | 1 -
 lib/puppet/network/client/ca.rb              | 1 -
 lib/puppet/network/client/dipper.rb          | 1 -
 lib/puppet/network/client/file.rb            | 1 -
 lib/puppet/network/client/proxy.rb           | 1 -
 lib/puppet/network/client/report.rb          | 1 -
 lib/puppet/network/client/resource.rb        | 1 -
 lib/puppet/network/client/runner.rb          | 1 -
 lib/puppet/network/client/status.rb          | 1 -
 lib/puppet/network/client_request.rb         | 1 -
 lib/puppet/network/handler.rb                | 1 -
 lib/puppet/network/handler/ca.rb             | 1 -
 lib/puppet/network/handler/filebucket.rb     | 1 -
 lib/puppet/network/handler/fileserver.rb     | 1 -
 lib/puppet/network/handler/report.rb         | 1 -
 lib/puppet/network/handler/resource.rb       | 1 -
 lib/puppet/network/handler/runner.rb         | 1 -
 lib/puppet/network/handler/status.rb         | 1 -
 lib/puppet/network/rights.rb                 | 1 -
 lib/puppet/network/server.rb                 | 1 -
 lib/puppet/network/server/mongrel.rb         | 1 -
 lib/puppet/network/server/webrick.rb         | 1 -
 lib/puppet/network/xmlrpc/client.rb          | 1 -
 lib/puppet/network/xmlrpc/processor.rb       | 1 -
 lib/puppet/network/xmlrpc/server.rb          | 1 -
 lib/puppet/network/xmlrpc/webrick_servlet.rb | 1 -
 29 files changed, 29 deletions(-)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb
index ebf005022..8e3773719 100644
--- a/lib/puppet/network/authconfig.rb
+++ b/lib/puppet/network/authconfig.rb
@@ -165,4 +165,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/authorization.rb b/lib/puppet/network/authorization.rb
index a3c1d50e1..9ea4bf69e 100644
--- a/lib/puppet/network/authorization.rb
+++ b/lib/puppet/network/authorization.rb
@@ -81,4 +81,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index 9af118e09..c16bef32f 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -294,4 +294,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client.rb b/lib/puppet/network/client.rb
index 351888c9e..7950abe3f 100644
--- a/lib/puppet/network/client.rb
+++ b/lib/puppet/network/client.rb
@@ -190,4 +190,3 @@ class Puppet::Network::Client
     require 'puppet/network/client/proxy'
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/ca.rb b/lib/puppet/network/client/ca.rb
index 46fb9f51f..a2704e451 100644
--- a/lib/puppet/network/client/ca.rb
+++ b/lib/puppet/network/client/ca.rb
@@ -56,4 +56,3 @@ class Puppet::Network::Client::CA < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/dipper.rb b/lib/puppet/network/client/dipper.rb
index c16e37725..0ec7087e5 100644
--- a/lib/puppet/network/client/dipper.rb
+++ b/lib/puppet/network/client/dipper.rb
@@ -78,4 +78,3 @@ class Puppet::Network::Client::Dipper < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/file.rb b/lib/puppet/network/client/file.rb
index 381a10cdb..6dd2adab2 100644
--- a/lib/puppet/network/client/file.rb
+++ b/lib/puppet/network/client/file.rb
@@ -4,4 +4,3 @@ class Puppet::Network::Client::File < Puppet::Network::Client::ProxyClient
     self.mkmethods
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/proxy.rb b/lib/puppet/network/client/proxy.rb
index 4cd37bb5d..17b1b0e14 100644
--- a/lib/puppet/network/client/proxy.rb
+++ b/lib/puppet/network/client/proxy.rb
@@ -25,4 +25,3 @@ class Puppet::Network::Client::ProxyClient < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/report.rb b/lib/puppet/network/client/report.rb
index cb4711afe..9bd61de2e 100644
--- a/lib/puppet/network/client/report.rb
+++ b/lib/puppet/network/client/report.rb
@@ -28,4 +28,3 @@ class Puppet::Network::Client::Report < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/resource.rb b/lib/puppet/network/client/resource.rb
index bf026dff0..bc4a8e53f 100644
--- a/lib/puppet/network/client/resource.rb
+++ b/lib/puppet/network/client/resource.rb
@@ -49,4 +49,3 @@ class Puppet::Network::Client::Resource < Puppet::Network::Client
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/runner.rb b/lib/puppet/network/client/runner.rb
index 12097c52f..5806dd343 100644
--- a/lib/puppet/network/client/runner.rb
+++ b/lib/puppet/network/client/runner.rb
@@ -10,4 +10,3 @@ class Puppet::Network::Client::Runner < Puppet::Network::Client::ProxyClient
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/client/status.rb b/lib/puppet/network/client/status.rb
index d35e44c1a..9dc22b606 100644
--- a/lib/puppet/network/client/status.rb
+++ b/lib/puppet/network/client/status.rb
@@ -2,4 +2,3 @@ class Puppet::Network::Client::Status < Puppet::Network::Client::ProxyClient
     self.mkmethods
 end
 
-# $Id$
diff --git a/lib/puppet/network/client_request.rb b/lib/puppet/network/client_request.rb
index 16a9d9993..86dd31bcf 100644
--- a/lib/puppet/network/client_request.rb
+++ b/lib/puppet/network/client_request.rb
@@ -29,4 +29,3 @@ module Puppet::Network # :nodoc:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler.rb b/lib/puppet/network/handler.rb
index c2fbfcba5..f6a658662 100644
--- a/lib/puppet/network/handler.rb
+++ b/lib/puppet/network/handler.rb
@@ -51,4 +51,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/ca.rb b/lib/puppet/network/handler/ca.rb
index 052eb5c19..de7a976c8 100644
--- a/lib/puppet/network/handler/ca.rb
+++ b/lib/puppet/network/handler/ca.rb
@@ -155,4 +155,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/filebucket.rb b/lib/puppet/network/handler/filebucket.rb
index 1bf8da854..38ef7f3f2 100755
--- a/lib/puppet/network/handler/filebucket.rb
+++ b/lib/puppet/network/handler/filebucket.rb
@@ -180,4 +180,3 @@ class Puppet::Network::Handler # :nodoc:
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/network/handler/fileserver.rb
index ae0e6553d..dd00450be 100755
--- a/lib/puppet/network/handler/fileserver.rb
+++ b/lib/puppet/network/handler/fileserver.rb
@@ -676,4 +676,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/report.rb b/lib/puppet/network/handler/report.rb
index 62e9cfdec..e202d4e2a 100755
--- a/lib/puppet/network/handler/report.rb
+++ b/lib/puppet/network/handler/report.rb
@@ -142,4 +142,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/resource.rb b/lib/puppet/network/handler/resource.rb
index 7709b85fe..0fcd694fb 100755
--- a/lib/puppet/network/handler/resource.rb
+++ b/lib/puppet/network/handler/resource.rb
@@ -192,4 +192,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/runner.rb b/lib/puppet/network/handler/runner.rb
index 4b9ccab75..a8d0da9ce 100755
--- a/lib/puppet/network/handler/runner.rb
+++ b/lib/puppet/network/handler/runner.rb
@@ -62,4 +62,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/handler/status.rb b/lib/puppet/network/handler/status.rb
index 48668ca47..fbdc7a765 100644
--- a/lib/puppet/network/handler/status.rb
+++ b/lib/puppet/network/handler/status.rb
@@ -14,4 +14,3 @@ class Puppet::Network::Handler
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/rights.rb b/lib/puppet/network/rights.rb
index 970a7aacf..a4133f22c 100755
--- a/lib/puppet/network/rights.rb
+++ b/lib/puppet/network/rights.rb
@@ -71,4 +71,3 @@ class Puppet::Network::Rights < Hash
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 1bf3f5f63..0dee30b10 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -2,4 +2,3 @@
 module Puppet::Network::Server # :nodoc:
 end
 
-# $Id$
diff --git a/lib/puppet/network/server/mongrel.rb b/lib/puppet/network/server/mongrel.rb
index 5bce40756..8cd7e807b 100644
--- a/lib/puppet/network/server/mongrel.rb
+++ b/lib/puppet/network/server/mongrel.rb
@@ -137,4 +137,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/server/webrick.rb b/lib/puppet/network/server/webrick.rb
index f24411ab3..dd9a91c7c 100644
--- a/lib/puppet/network/server/webrick.rb
+++ b/lib/puppet/network/server/webrick.rb
@@ -161,4 +161,3 @@ module Puppet
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/client.rb b/lib/puppet/network/xmlrpc/client.rb
index eb8d1b9ca..c652dbf8d 100644
--- a/lib/puppet/network/xmlrpc/client.rb
+++ b/lib/puppet/network/xmlrpc/client.rb
@@ -151,4 +151,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/processor.rb b/lib/puppet/network/xmlrpc/processor.rb
index 248354696..2c2dc61ec 100644
--- a/lib/puppet/network/xmlrpc/processor.rb
+++ b/lib/puppet/network/xmlrpc/processor.rb
@@ -88,4 +88,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/server.rb b/lib/puppet/network/xmlrpc/server.rb
index bd05703ba..e7435268a 100644
--- a/lib/puppet/network/xmlrpc/server.rb
+++ b/lib/puppet/network/xmlrpc/server.rb
@@ -17,4 +17,3 @@ module Puppet::Network
     end
 end
 
-# $Id$
diff --git a/lib/puppet/network/xmlrpc/webrick_servlet.rb b/lib/puppet/network/xmlrpc/webrick_servlet.rb
index 0ddb056dc..9a46ffb7c 100644
--- a/lib/puppet/network/xmlrpc/webrick_servlet.rb
+++ b/lib/puppet/network/xmlrpc/webrick_servlet.rb
@@ -118,4 +118,3 @@ module Puppet::Network::XMLRPC
     end
 end
 
-# $Id$
-- 
cgit 


From fd841b33a2920f26d472f4f38a559d8f2aa48a0c Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Thu, 4 Oct 2007 13:00:13 -0500
Subject: Updating first portion of the Network RESTServer spec with example
 code, getting the added examples to pass.

---
 lib/puppet/network/rest_server.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/rest_server.rb b/lib/puppet/network/rest_server.rb
index e415e8bcb..0ffa8ff16 100644
--- a/lib/puppet/network/rest_server.rb
+++ b/lib/puppet/network/rest_server.rb
@@ -1,2 +1,20 @@
 class Puppet::Network::RESTServer # :nodoc:
+  @@routes = {}
+  
+  def self.register(*indirections)
+    raise ArgumentError, "indirection names are required" if indirections.empty?
+    indirections.flatten.each { |i| @@routes[i.to_sym] = true }
+  end
+  
+  def self.unregister(*indirections)
+    raise ArgumentError, "indirection names are required" if indirections.empty?
+    indirections.flatten.each do |i|
+      raise(ArgumentError, "indirection [%s] is not known" % i) unless @@routes[i.to_sym]
+      @@routes.delete(i.to_sym)
+    end
+  end
+  
+  def self.reset
+    self.unregister(@@routes.keys) unless @@routes.keys.empty?
+  end
 end
-- 
cgit 


From 102ad23acb1c798c99b013e86b1d67350bbced7c Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Thu, 4 Oct 2007 13:19:15 -0500
Subject: Added .listening to REST server, handle listen states and
 transitions.

---
 lib/puppet/network/rest_server.rb | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/rest_server.rb b/lib/puppet/network/rest_server.rb
index 0ffa8ff16..7c745f321 100644
--- a/lib/puppet/network/rest_server.rb
+++ b/lib/puppet/network/rest_server.rb
@@ -1,5 +1,6 @@
 class Puppet::Network::RESTServer # :nodoc:
   @@routes = {}
+  @@listening = false
   
   def self.register(*indirections)
     raise ArgumentError, "indirection names are required" if indirections.empty?
@@ -17,4 +18,18 @@ class Puppet::Network::RESTServer # :nodoc:
   def self.reset
     self.unregister(@@routes.keys) unless @@routes.keys.empty?
   end
+  
+  def self.listening?
+    @@listening
+  end
+  
+  def self.listen
+    raise "Cannot listen -- already listening" if @@listening
+    @@listening = true
+  end
+  
+  def self.unlisten
+    raise "Cannot unlisten -- not currently listening" unless @@listening
+    @@listening = false
+  end
 end
-- 
cgit 


From 24121996ac214395106a0bb11f4d2a5c350f99b3 Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Thu, 4 Oct 2007 13:47:36 -0500
Subject: Allow for multiple REST servers to be active; some terminology
 changes in spec; fleshing out more behavior, implementing.

---
 lib/puppet/network/rest_server.rb | 44 ++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/rest_server.rb b/lib/puppet/network/rest_server.rb
index 7c745f321..50ca939ee 100644
--- a/lib/puppet/network/rest_server.rb
+++ b/lib/puppet/network/rest_server.rb
@@ -1,35 +1,37 @@
 class Puppet::Network::RESTServer # :nodoc:
-  @@routes = {}
-  @@listening = false
+  attr_reader :server
   
-  def self.register(*indirections)
+  def initialize(args = {})
+    raise(ArgumentError, "requires :server to be specified") unless args[:server]
+    @routes = {}
+    @listening = false
+    @server = args[:server]
+  end
+
+  def register(*indirections)
     raise ArgumentError, "indirection names are required" if indirections.empty?
-    indirections.flatten.each { |i| @@routes[i.to_sym] = true }
+    indirections.flatten.each { |i| @routes[i.to_sym] = true }
   end
   
-  def self.unregister(*indirections)
-    raise ArgumentError, "indirection names are required" if indirections.empty?
+  def unregister(*indirections)
+    indirections = @routes.keys if indirections.empty?
     indirections.flatten.each do |i|
-      raise(ArgumentError, "indirection [%s] is not known" % i) unless @@routes[i.to_sym]
-      @@routes.delete(i.to_sym)
+      raise(ArgumentError, "indirection [%s] is not known" % i) unless @routes[i.to_sym]
+      @routes.delete(i.to_sym)
     end
   end
-  
-  def self.reset
-    self.unregister(@@routes.keys) unless @@routes.keys.empty?
-  end
-  
-  def self.listening?
-    @@listening
+
+  def listening?
+    @listening
   end
   
-  def self.listen
-    raise "Cannot listen -- already listening" if @@listening
-    @@listening = true
+  def listen
+    raise "Cannot listen -- already listening" if listening?
+    @listening = true
   end
   
-  def self.unlisten
-    raise "Cannot unlisten -- not currently listening" unless @@listening
-    @@listening = false
+  def unlisten
+    raise "Cannot unlisten -- not currently listening" unless listening?
+    @listening = false
   end
 end
-- 
cgit 


From 29accba1b9343f4967c15d36506b3bf60d5f0f9c Mon Sep 17 00:00:00 2001
From: Rick Bradley <rick@rickbradley.com>
Date: Thu, 4 Oct 2007 13:52:22 -0500
Subject: Minor tweaks.

---
 lib/puppet/network/rest_server.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/puppet/network')

diff --git a/lib/puppet/network/rest_server.rb b/lib/puppet/network/rest_server.rb
index 50ca939ee..d1206928c 100644
--- a/lib/puppet/network/rest_server.rb
+++ b/lib/puppet/network/rest_server.rb
@@ -1,4 +1,4 @@
-class Puppet::Network::RESTServer # :nodoc:
+class Puppet::Network::RESTServer
   attr_reader :server
   
   def initialize(args = {})
-- 
cgit