puppet-rundeck-2013 0.0.11 → 0.0.12

data/README.rdoc

@@ -1,3 +1,6 @@
+{<img src="https://badge.fury.io/rb/puppet-rundeck-2013.png" alt="Gem Version" />}[http://badge.fury.io/rb/puppet-rundeck-2013]
+
+
 = puppet-rundeck-2013
 
 Integrates Puppet with RunDeck.
@@ -17,9 +20,11 @@ Requires:
 
 == Installation
 
+
 Install the gem:
 
-  $ sudo gem install puppet-rundeck
+  $ sudo gem install puppet-rundeck-2013
+  
 
 == Usage
 
@@ -59,10 +64,15 @@ on the same puppet server and puppet-rundeck instance:
 
    project.resources.url = http://localhost:8144/tag/production
 
+You can also specify a required facts to filter the node list, to provide different project URLs based
+on the same puppet server and puppet-rundeck instance:
+
+   project.resources.url = http://localhost:8144/facts/timezone=UTC&uptime_days=0
+
 In the version puppet-rundeck-2013 you can also pass configuration flags for puppet-rundeck.
 
 - user=rundeck_ssh_username - to override SSH user for Rundeck
-- use_tags=0 - to avoid adding default tags puppet from puppetmaster
+- use_tags=0 - to avoid adding default tags puppet from puppetmaster. Disabling tags drastically speeds up result generation.
 - add_facts=fact1,fact2,fact3 - list of facter facts that will be added as tags for rundeck
 
 Examples:
@@ -70,6 +80,9 @@ Examples:
 Add facts *fqdn* and *ipaddress* to list of tags, set SSH user to *root* and disable puppet-generated tags:
 curl http://127.0.0.1:8144/?add_facts=fqdn,ipaddress&user=root&use_tags=0
 
+Add facts *fqdn* and *ipaddress* to list of tags, set SSH user to *root* and disable puppet-generated tags only for nodes with timezone = UTC and having days uptime=0:
+curl http://127.0.0.1:8144/facts/timezone=UTC&uptime_days=0?add_facts=fqdn,ipaddress&user=root&use_tags=0
+
 
 You can specify some configuration options:
 

data/Rakefile

@@ -9,7 +9,7 @@ begin
     gem.description = %Q{Provides a resource endpoint for RunDeck from a Puppet Server}
     gem.files        = Dir["{lib,test}/**/*"] + Dir["[A-Z]*"]
     gem.require_path = "lib"
-    gem.email = "james@puppetlabs.com"
+    gem.email = "LazyDelphiBuilder@gmail.com"
     gem.homepage = "http://github.com/tdelphi/puppet-rundeck"
     gem.authors = ["James Turnbull","Aleksey Timohin"]
     gem.add_dependency "sinatra", "<= 1.3.6"

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/puppet-rundeck.rb

@@ -42,7 +42,7 @@ class PuppetRundeck < Sinatra::Base
     return input.to_s.to_xs
   end
 
-  def respond(required_tag=nil,uname=nil,use_tags=nil,add_facts=nil)
+  def respond(required_tag=nil,required_facts=nil,uname=nil,use_tags=nil,add_facts=nil)
     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)
 
@@ -61,6 +61,13 @@ class PuppetRundeck < Sinatra::Base
         nodes = Puppet::Node.indirection.search("*")
       end
 
+      if ! required_facts.nil?
+        # this should convert string 'fact1=fact1_value&fact2=fact2_value' to array [fact1, fact1_value, fact2, fact2_value]
+        local_required_facts = Hash[*required_facts.split(/[=&]/)].to_a
+      else
+        local_required_facts = nil
+      end
+
       nodes.each do |n|
         if should_use_tags
           if Puppet::Node::Facts.respond_to? :find
@@ -77,6 +84,11 @@ class PuppetRundeck < Sinatra::Base
         end
 
         facts = n.parameters
+
+        if ! local_required_facts.nil?
+          next if ! (local_required_facts-facts.to_a).empty?
+        end
+
         os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
 
         facts_string = nil
@@ -110,6 +122,12 @@ class PuppetRundeck < Sinatra::Base
           tags_string = [tags_string,facts_string].join(',')
         end
 
+        if PuppetRundeck.ssh_port.to_s == '22' then
+          hostname_port = ''
+        else
+          hostname_port = "\:#{PuppetRundeck.ssh_port.to_s}"
+        end
+
       response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
       type="Node"
@@ -120,7 +138,7 @@ class PuppetRundeck < Sinatra::Base
       osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
       tags="#{xml_escape(tags_string)}"
       username="#{xml_escape(targetusername)}"
-      hostname="#{xml_escape(facts["ipaddress"] + ":" + PuppetRundeck.ssh_port.to_s)}"/>
+      hostname="#{xml_escape(facts["ipaddress"] + hostname_port)}"/>
 EOH
     end
     response_xml << "</project>"
@@ -130,11 +148,15 @@ EOH
   require 'pp'
 
   get '/tag/:tag' do
-    respond(params[:tag], params["user"], params["use_tags"], params["add_facts"])
+    respond(params[:tag], nil, params["user"], params["use_tags"], params["add_facts"])
+  end
+
+  get '/facts/:fact' do
+    respond(nil, params[:fact], params["user"], params["use_tags"], params["add_facts"])
   end
 
   get '/' do
-    respond(nil, params["user"], params["use_tags"], params["add_facts"])
+    respond(nil, nil, params["user"], params["use_tags"], params["add_facts"])
   end
 
 end

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck-2013
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 0
-  - 11
-  version: 0.0.11
+  - 12
+  version: 0.0.12
 platform: ruby
 authors: 
-- James Turnbull, Aleksejs Timohins
+- James Turnbull, Aleksey Timohin
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2013-10-03 00:00:00 +00:00
+date: 2013-10-31 00:00:00 +00:00
 default_executable: puppet-rundeck
 dependencies: 
 - !ruby/object:Gem::Dependency