puppet-rundeck 0.0.8 → 0.0.9

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bin/puppet-rundeck

@@ -51,11 +51,6 @@ optparse = OptionParser.new do |opts|
     options[:bind] = bind
   end
 
-  options[:ssh_port] = 22
-  opts.on( '-P', '--ssh-port PORT', 'The default port used by sshd on your puppet nodes') do |ssh_port|
-    options[:ssh_port] = ssh_port
-  end
-
   opts.separator ""
   opts.separator "Common options:"
 
@@ -69,7 +64,6 @@ begin
   optparse.parse!
   PuppetRundeck.config_file = options[:config_file]
   PuppetRundeck.username = options[:username]
-  PuppetRundeck.ssh_port = options[:ssh_port]
   PuppetRundeck.configure
   PuppetRundeck.run! :bind => options[:bind], :port => options[:port]
 rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument

data/lib/puppet-rundeck.rb

@@ -15,7 +15,7 @@
 #
 
 require 'sinatra/base'
-require 'builder/xchar'
+require 'fast_xs'
 
 begin
   require 'puppet'
@@ -30,7 +30,6 @@ class PuppetRundeck < Sinatra::Base
     attr_accessor :config_file
     attr_accessor :username
     attr_accessor :source
-    attr_accessor :ssh_port
 
     def configure
       Puppet[:config] = PuppetRundeck.config_file
@@ -40,15 +39,14 @@ class PuppetRundeck < Sinatra::Base
 
   def xml_escape(input)
     # don't know if is string, so convert to string first, then to XML escaped text.
-    return input.to_s.to_xs
+    return input.to_s.fast_xs
   end
 
-  require 'pp'
-  get '/' do
+  def respond(required_tag=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)
       # Fix for 2.6 to 2.7 indirection difference
-      Puppet[:clientyamldir] = "$yamldir" 
+      Puppet[:clientyamldir] = "$yamldir"
       if Puppet::Node.respond_to? :terminus_class
         Puppet::Node.terminus_class = :yaml
         nodes = Puppet::Node.search("*")
@@ -63,7 +61,10 @@ class PuppetRundeck < Sinatra::Base
         else
           tags = Puppet::Face[:catalog, :current].find(n.name).tags
         end
-        facts = n.values #n.parameters
+        if ! required_tag.nil?
+          next if ! tags.include? required_tag
+        end
+        facts = n.parameters
         os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
       response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
@@ -73,7 +74,7 @@ class PuppetRundeck < Sinatra::Base
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(facts["operatingsystem"])}"
       osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
-      tags="#{xml_escape(tags.join(','))}"
+      tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
       username="#{xml_escape(PuppetRundeck.username)}"
       hostname="#{xml_escape(facts["fqdn"])}"/>
 EOH
@@ -81,4 +82,12 @@ EOH
     response_xml << "</project>"
     response_xml
   end
+
+  get '/' do
+    respond
+  end
+
+  get '/tag/:tag' do
+    respond(params[:tag])
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet-rundeck
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -28,13 +28,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: fast_xs
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement