puppet-rundeck 0.0.5 → 0.0.6

data/README.rdoc

@@ -12,7 +12,7 @@ Note: Version 0.0.2 required stored configuration to be enabled. Later versions
 
 Requires:
 
-- Puppet
+- Puppet (0.25.5 and later)
 - Builder (2.0.0 and later)
 
 == Installation
@@ -34,7 +34,7 @@ Then browse to appropriate URL, by default `localhost:8144`
 A list of the current hosts and appropriate facts to configure them on RunDeck will be returned in XML.
 
 For example:
- 
+
       <?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd">
       <project>
         <node name="pelin.lovedthanlost.net"
@@ -44,7 +44,7 @@ For example:
         osFamily="Linux"
         osName="Fedora"
         osVersion="14"
-        tags="nil"
+        tags="production"
         username="root"
         hostname="pelin.lovedthanlost.net"/>
       </project>
@@ -63,7 +63,7 @@ You can specify some configuration options:
 == Credits
 
 Original concept heavily stolen from Adam Jacob's chef-rundeck gem 
- 
+
 == Copyright
 
-Copyright (c) 2010 James Turnbull. See LICENSE for details.
+Copyright (c) 2011 James Turnbull. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/puppet-rundeck.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2010, James Turnbull
+# Copyright 2011, James Turnbull
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ require 'builder/xchar'
 begin
   require 'puppet'
 rescue LoadError
-  puts "You need to have Puppet 0.24.8 or later installed"
+  puts "You need to have Puppet 0.25.5 or later installed"
 end
 
 class PuppetRundeck < Sinatra::Base
@@ -43,7 +43,8 @@ class PuppetRundeck < Sinatra::Base
 
   require 'pp'
   get '/' do
-    response = '<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd"><project>'
+    response['Content-Type'] = 'text/xml'
+    response_xml = %Q(<?xml version="1.0" encoding="UTF-8"?>\n<!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd">\n<project>\n)
       # Fix for 2.6 to 2.7 indirection difference
       Puppet[:clientyamldir] = "$yamldir"
       if Puppet::Node.respond_to? :terminus_class
@@ -54,28 +55,22 @@ class PuppetRundeck < Sinatra::Base
         nodes = Puppet::Node.indirection.search("*")
       end
       nodes.each do |n|
-        if Puppet::Node::Facts.respond_to? :find
-          facts = Puppet::Node::Facts.find(n.name)
-          tags = Puppet::Resource::Catalog.find(n.name).tags
-        else
-          facts = Puppet::Node::Facts.indirection.find(n.name)
-          tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
-        end
-        os_family = facts.values["kernel"] =~ /windows/i ? 'windows' : 'unix'
-      response << <<-EOH
+        facts = n.parameters
+        os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
+      response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
       type="Node"
       description="#{xml_escape(n.name)}"
-      osArch="#{xml_escape(facts.values["kernel"])}"
+      osArch="#{xml_escape(facts["kernel"])}"
       osFamily="#{xml_escape(os_family)}"
-      osName="#{xml_escape(facts.values["operatingsystem"])}"
-      osVersion="#{xml_escape(facts.values["operatingsystemrelease"])}"
-      tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
+      osName="#{xml_escape(facts["operatingsystem"])}"
+      osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
+      tags="#{xml_escape([n.environment])}"
       username="#{xml_escape(PuppetRundeck.username)}"
-      hostname="#{xml_escape(facts.values["fqdn"])}"/>
+      hostname="#{xml_escape(facts["fqdn"])}"/>
 EOH
     end
-    response << "</project>"
-    response
+    response_xml << "</project>"
+    response_xml
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - James Turnbull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-27 00:00:00 +10:00
+date: 2011-11-22 00:00:00 +11:00
 default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency