puppet-rundeck-2013 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 04273c0938d80acbf315f2c674a0d67e39fb429eed2485fd28b2385f5b7796e3266acc6cbc8920eb7e563f15bd6a5a97757f2f055c026a33485809f6e08da9f7
-  data.tar.gz: 6532011a8d8798aac6505a5d310ad9c0e5f21ca366c19774b88d5ca25e7143ea45e189145d37e984d19aacb1fe3a3cfbe7718e1eac0f90a8f7780fca07e0bf75
 SHA1: 
-  metadata.gz: ad6015b013beea1537226fd370e883b70b60c03e
-  data.tar.gz: 7cd0c75a02c7280b09b149fc1a159879c8a6e2eb
+  data.tar.gz: 0979a2d10f17c3271961a4a4909a884b702da0a6
+  metadata.gz: 3727fe4c70a007bc5c7f01c7486a8c1f2a9d13c5
+SHA512: 
+  data.tar.gz: 3691c5cf9813d5b09c75a0c137c0d94aa554ac487b12dad737a44604e8ede6f84c267a66011c0e4366b47d4f43129012545f3e3922abc597868bfcfe8e4ff754
+  metadata.gz: 0a950e0102400254bb518fedfeace03b5b8e55ada9ef14950a3f87d2873ec3901eac26b336dfff76b8732bfde214d1a452542b46b334d480cf9846f7b37a7956

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bin/puppet-rundeck

@@ -66,7 +66,7 @@ begin
   PuppetRundeck.username = options[:username]
   PuppetRundeck.ssh_port = options[:ssh_port]
   PuppetRundeck.configure
-  PuppetRundeck.run! :host => "localhost", :port => options[:port] 
+  PuppetRundeck.run! :host => "localhost", :port => options[:port], :bind => '0.0.0.0'
 rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
   puts $!.to_s
   puts optparse

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)
+  def respond(required_tag=nil,uname=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
@@ -65,6 +65,12 @@ class PuppetRundeck < Sinatra::Base
         end
         facts = n.parameters
         os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
+
+        if uname == nil
+          targetusername = PuppetRundeck.username
+        else
+          targetusername = uname
+        end
       response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
       type="Node"
@@ -74,7 +80,7 @@ class PuppetRundeck < Sinatra::Base
       osName="#{xml_escape(facts["operatingsystem"])}"
       osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
       tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
-      username="#{xml_escape(PuppetRundeck.username)}"
+      username="#{xml_escape(targetusername)}"
       hostname="#{xml_escape(facts["ipaddress"] + ":" + PuppetRundeck.ssh_port.to_s)}"/>
 EOH
     end
@@ -85,11 +91,11 @@ EOH
   require 'pp'
 
   get '/tag/:tag' do
-    respond(params[:tag])
+    respond(params[:tag], params["user"])
   end
 
   get '/' do
-    respond
+    respond (nil, params["user"])
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: puppet-rundeck-2013
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - James Turnbull, Aleksejs Timohins
@@ -9,16 +9,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-08-26 00:00:00 Z
+date: 2013-08-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - <=
+    - &id004 
+      - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.6
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -44,14 +45,11 @@ dependencies:
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - &id005 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    - *id004
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 description: Provides a resource endpoint for RunDeck from a Puppet Server
 email: LazyDelphiBuilder@gmail.com
 executables: 
@@ -82,10 +80,10 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id005
+  - *id004
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id005
+  - *id004
 requirements: []
 
 rubyforge_project: