puppet-rundeck 0.0.4 → 0.0.5

data/Rakefile

@@ -13,7 +13,6 @@ begin
     gem.homepage = "http://github.com/jamtur01/puppet-rundeck"
     gem.authors = ["James Turnbull"]
     gem.add_dependency "sinatra"
-    gem.add_dependency "puppet", ">= 0.24.8"
     gem.add_dependency "builder", ">= 2.0.0"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/puppet-rundeck.rb

@@ -15,9 +15,14 @@
 #
 
 require 'sinatra/base'
-require 'puppet'
 require 'builder/xchar'
 
+begin
+  require 'puppet'
+rescue LoadError
+  puts "You need to have Puppet 0.24.8 or later installed"
+end
+
 class PuppetRundeck < Sinatra::Base
 
   class << self
@@ -36,23 +41,36 @@ class PuppetRundeck < Sinatra::Base
     return input.to_s.to_xs
   end
 
+  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>'
-      Puppet::Node.terminus_class = :yaml
+      # Fix for 2.6 to 2.7 indirection difference
       Puppet[:clientyamldir] = "$yamldir"
-      nodes = Puppet::Node.search("*")
+      if Puppet::Node.respond_to? :terminus_class
+        Puppet::Node.terminus_class = :yaml
+        nodes = Puppet::Node.search("*")
+      else
+        Puppet::Node.indirection.terminus_class = :yaml
+        nodes = Puppet::Node.indirection.search("*")
+      end
       nodes.each do |n|
-        facts = Puppet::Node::Facts.find(n.name)
-        tags = Puppet::Resource::Catalog.find(n.name).tags
+        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
 <node name="#{xml_escape(n.name)}"
       type="Node"
       description="#{xml_escape(n.name)}"
       osArch="#{xml_escape(facts.values["kernel"])}"
-      osFamily="#{xml_escape(facts.values["kernel"])}"
+      osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(facts.values["operatingsystem"])}"
       osVersion="#{xml_escape(facts.values["operatingsystemrelease"])}"
-      tags="#{xml_escape(tags.join(','))}"
+      tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
       username="#{xml_escape(PuppetRundeck.username)}"
       hostname="#{xml_escape(facts.values["fqdn"])}"/>
 EOH

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - James Turnbull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +11:00
+date: 2011-07-27 00:00:00 +10:00
 default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,26 +32,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: puppet
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 111
-        segments: 
-        - 0
-        - 24
-        - 8
-        version: 0.24.8
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -63,11 +47,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,11 +63,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,7 +77,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 description: Provides a resource endpoint for RunDeck from a Puppet Server
 email: james@puppetlabs.com
 executables: