puppet-rundeck 0.0.3 → 0.0.4

data/Rakefile

@@ -24,16 +24,20 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
+rescue LoadError
+  puts "RSpec not available. Install it with: gem install rspec"
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/puppet-rundeck.rb

@@ -16,13 +16,10 @@
 
 require 'sinatra/base'
 require 'puppet'
-require 'puppet/rails'
 require 'builder/xchar'
 
 class PuppetRundeck < Sinatra::Base
 
-  include Puppet
-
   class << self
     attr_accessor :config_file
     attr_accessor :username
@@ -41,22 +38,23 @@ class PuppetRundeck < Sinatra::Base
 
   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::Facts.terminus_class = :yaml
+      Puppet::Node.terminus_class = :yaml
       Puppet[:clientyamldir] = "$yamldir"
-      nodes = Puppet::Node::Facts.search("*")
+      nodes = Puppet::Node.search("*")
       nodes.each do |n|
-        puts "Processing #{n.name}"
+        facts = Puppet::Node::Facts.find(n.name)
+        tags = Puppet::Resource::Catalog.find(n.name).tags
       response << <<-EOH
 <node name="#{xml_escape(n.name)}"
       type="Node"
       description="#{xml_escape(n.name)}"
-      osArch="#{xml_escape(n.values["kernel"])}"
-      osFamily="#{xml_escape(n.values["kernel"])}"
-      osName="#{xml_escape(n.values["operatingsystem"])}"
-      osVersion="#{xml_escape(n.values["operatingsystemrelease"])}"
-      tags="nil"
+      osArch="#{xml_escape(facts.values["kernel"])}"
+      osFamily="#{xml_escape(facts.values["kernel"])}"
+      osName="#{xml_escape(facts.values["operatingsystem"])}"
+      osVersion="#{xml_escape(facts.values["operatingsystemrelease"])}"
+      tags="#{xml_escape(tags.join(','))}"
       username="#{xml_escape(PuppetRundeck.username)}"
-      hostname="#{xml_escape(n.values["fqdn"])}"/>
+      hostname="#{xml_escape(facts.values["fqdn"])}"/>
 EOH
     end
     response << "</project>"

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rubygems'
 require 'puppet-rundeck'
 require 'spec'
 require 'spec/autorun'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - James Turnbull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-29 00:00:00 +11:00
 default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency