puppet-rundeck 0.0.2 → 0.0.3

data/README.rdoc

@@ -2,18 +2,18 @@
 
 Integrates Puppet with RunDeck.
 
-It assumes you have Puppet stored configuration running.
-
 Visiting the URL, for example localhost:8144, should return 
-a list of all stored configuration nodes and populate the appropriate 
-facts for use with RunDeck.
+a list of all nodes on the Puppet master and populates the 
+appropriate facts for use with RunDeck.
+
+Note: Version 0.0.2 required stored configuration to be enabled. Later versions do not.
 
 == Prerequisites
 
 Requires:
 
- - Puppet (with Stored Configuration enabled)
- - Builder (2.0.0 and later)
+- Puppet
+- Builder (2.0.0 and later)
 
 == Installation
 
@@ -31,13 +31,13 @@ Then browse to appropriate URL, by default `localhost:8144`
 
   $ curl localhost:8144
 
-A list of the current stored hosts and appropriate facts to configure them on RunDeck will be returned in XML.
+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>
-        <h name="pelin.lovedthanlost.net"
+        <node name="pelin.lovedthanlost.net"
         type="Node"
         description="pelin.lovedthanlost.net"
         osArch="Linux"
@@ -46,14 +46,19 @@ For example:
         osVersion="14"
         tags="nil"
         username="root"
-        hostname="pelin.lovedthanlost.net"
+        hostname="pelin.lovedthanlost.net"/>
       </project>
 
+To use with RunDeck specify the target URL as the value of the `project.resources.url` option in the 
+`project.properties` file for your project, for example:
+
+   project.resources.url = http://localhost:8144
+
 You can specify some configuration options:
 
-  * -c or --config to override the default Puppet configuration file (defaults to `/etc/puppet/puppet.conf`)
-  * -u or --username the user for RunDeck to SSH as, defaults to current user
-  * -p or --port the port to start `puppet-rundeck` on, default to 8144
+* -c or --config to override the default Puppet configuration file (defaults to `/etc/puppet/puppet.conf`)
+* -u or --username the user for RunDeck to SSH as, defaults to current user
+* -p or --port the port to start `puppet-rundeck` on, default to 8144
 
 == Credits
 

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.email = "james@puppetlabs.com"
     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"

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/puppet-rundeck.rb

@@ -26,11 +26,11 @@ class PuppetRundeck < Sinatra::Base
   class << self
     attr_accessor :config_file
     attr_accessor :username
+    attr_accessor :source
 
     def configure
       Puppet[:config] = PuppetRundeck.config_file
       Puppet.parse_config
-      Puppet::Rails.connect
     end
   end
 
@@ -41,21 +41,22 @@ 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>'
-    Host = Puppet::Rails::Host
-    Host.all.each do |h|
-      puts "Processing #{h.name}"
-      facts = h.get_facts_hash
+      Puppet::Node::Facts.terminus_class = :yaml
+      Puppet[:clientyamldir] = "$yamldir"
+      nodes = Puppet::Node::Facts.search("*")
+      nodes.each do |n|
+        puts "Processing #{n.name}"
       response << <<-EOH
-<node name="#{xml_escape(h.name)}"
+<node name="#{xml_escape(n.name)}"
       type="Node"
-      description="#{xml_escape(h.name)}"
-      osArch="#{xml_escape(facts["kernel"].first.value)}"
-      osFamily="#{xml_escape(facts["kernel"].first.value)}"
-      osName="#{xml_escape(facts["operatingsystem"].first.value)}"
-      osVersion="#{xml_escape(facts["operatingsystemrelease"].first.value)}"
+      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"
       username="#{xml_escape(PuppetRundeck.username)}"
-      hostname="#{xml_escape(facts["fqdn"].first.value)}"/>
+      hostname="#{xml_escape(n.values["fqdn"])}"/>
 EOH
     end
     response << "</project>"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Turnbull
@@ -15,13 +15,27 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 -08:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: puppet
+  name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: puppet
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,11 +47,11 @@ dependencies:
         - 8
         version: 0.24.8
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,11 +63,11 @@ dependencies:
         - 0
         version: 2.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,11 +79,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -79,7 +93,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Provides a resource endpoint for RunDeck from a Puppet Server
 email: james@puppetlabs.com
 executables: