Minor bug fix for genome-bootstrap discovered by the django-example

The django-example only has one class.  A String was getting returned where an
Array was assumed. Yay for no unit tests for this.

On a side note, the django-example was useful for uncovering a few corner cases
with how we use Restr.  The problem with Restr happens whenever 1 of something
was returned.  While it's nice enough wrap things in an Array if multiple items
are returned, since Restr's XmlSimple instance is not setting 'forcearray =>
true' we have to wrap the call.

It would probably be a good idea to ask the Restr maintainer about the
'forcearray' parameter.

2 files changed, 8 insertions, 7 deletions

diff --git a/genome-bootstrap/extra/genome-bootstrap.spec b/genome-bootstrap/extra/genome-bootstrap.spec
index cf00c5b..86c6ae6 100644
--- a/genome-bootstrap/extra/genome-bootstrap.spec
+++ b/genome-bootstrap/extra/genome-bootstrap.spec
@@ -7,7 +7,7 @@ Summary: Tool for provisioning virtual machines
 Name: rubygem-%{gemname}
 
 Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 Group: Development/Languages
 License: Ruby License/GPL
 Source0: %{gemname}-%{version}.gem
diff --git a/genome-bootstrap/lib/genome-bootstrap/core.rb b/genome-bootstrap/lib/genome-bootstrap/core.rb
index 28b7e61..8991753 100644
--- a/genome-bootstrap/lib/genome-bootstrap/core.rb
+++ b/genome-bootstrap/lib/genome-bootstrap/core.rb
@@ -136,17 +136,18 @@ module GenomeBootstrap
       return status.nil? ? nil : status[0]
     end
 
-    # This is a workaround for a Restr "feature".  If only one element it is
-    # returned as a Hash instead of an Array.  The way we use Restr assumes that it
-    # will always return an Array.
+    # This is a workaround for a Restr "feature".  Restr does not set
+    # 'forcearray => true' for it's XmlSimple instance.  This means exactly
+    # what you would think.  We always want to work with arrays since puppet's
+    # external nodes cares what data structures are used.
     def restr_get(url, xml_node=nil)
       data = xml_node ? Restr.get(url)[xml_node] : Restr.get(url)
 
       return case data
-      when Hash
-        Array.new << data
-      when Array
+      when nil, Array
         data
+      else
+        Array.new << data
       end
     end
   end