puppet-rundeck-2013 0.0.9 → 0.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +5 -5
  2. data/VERSION +1 -1
  3. data/bin/puppet-rundeck +1 -1
  4. data/lib/puppet-rundeck.rb +10 -4
  5. metadata +10 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
- SHA512:
3
- metadata.gz: 04273c0938d80acbf315f2c674a0d67e39fb429eed2485fd28b2385f5b7796e3266acc6cbc8920eb7e563f15bd6a5a97757f2f055c026a33485809f6e08da9f7
4
- data.tar.gz: 6532011a8d8798aac6505a5d310ad9c0e5f21ca366c19774b88d5ca25e7143ea45e189145d37e984d19aacb1fe3a3cfbe7718e1eac0f90a8f7780fca07e0bf75
5
2
  SHA1:
6
- metadata.gz: ad6015b013beea1537226fd370e883b70b60c03e
7
- data.tar.gz: 7cd0c75a02c7280b09b149fc1a159879c8a6e2eb
3
+ data.tar.gz: 0979a2d10f17c3271961a4a4909a884b702da0a6
4
+ metadata.gz: 3727fe4c70a007bc5c7f01c7486a8c1f2a9d13c5
5
+ SHA512:
6
+ data.tar.gz: 3691c5cf9813d5b09c75a0c137c0d94aa554ac487b12dad737a44604e8ede6f84c267a66011c0e4366b47d4f43129012545f3e3922abc597868bfcfe8e4ff754
7
+ metadata.gz: 0a950e0102400254bb518fedfeace03b5b8e55ada9ef14950a3f87d2873ec3901eac26b336dfff76b8732bfde214d1a452542b46b334d480cf9846f7b37a7956
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.9
1
+ 0.0.10
data/bin/puppet-rundeck CHANGED
@@ -66,7 +66,7 @@ begin
66
66
  PuppetRundeck.username = options[:username]
67
67
  PuppetRundeck.ssh_port = options[:ssh_port]
68
68
  PuppetRundeck.configure
69
- PuppetRundeck.run! :host => "localhost", :port => options[:port]
69
+ PuppetRundeck.run! :host => "localhost", :port => options[:port], :bind => '0.0.0.0'
70
70
  rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
71
71
  puts $!.to_s
72
72
  puts optparse
data/lib/puppet-rundeck.rb CHANGED
@@ -42,7 +42,7 @@ class PuppetRundeck < Sinatra::Base
42
42
  return input.to_s.to_xs
43
43
  end
44
44
 
45
- def respond(required_tag=nil)
45
+ def respond(required_tag=nil,uname=nil)
46
46
  response['Content-Type'] = 'text/xml'
47
47
  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)
48
48
  # Fix for 2.6 to 2.7 indirection difference
@@ -65,6 +65,12 @@ class PuppetRundeck < Sinatra::Base
65
65
  end
66
66
  facts = n.parameters
67
67
  os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
68
+
69
+ if uname == nil
70
+ targetusername = PuppetRundeck.username
71
+ else
72
+ targetusername = uname
73
+ end
68
74
  response_xml << <<-EOH
69
75
  <node name="#{xml_escape(n.name)}"
70
76
  type="Node"
@@ -74,7 +80,7 @@ class PuppetRundeck < Sinatra::Base
74
80
  osName="#{xml_escape(facts["operatingsystem"])}"
75
81
  osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
76
82
  tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
77
- username="#{xml_escape(PuppetRundeck.username)}"
83
+ username="#{xml_escape(targetusername)}"
78
84
  hostname="#{xml_escape(facts["ipaddress"] + ":" + PuppetRundeck.ssh_port.to_s)}"/>
79
85
  EOH
80
86
  end
@@ -85,11 +91,11 @@ EOH
85
91
  require 'pp'
86
92
 
87
93
  get '/tag/:tag' do
88
- respond(params[:tag])
94
+ respond(params[:tag], params["user"])
89
95
  end
90
96
 
91
97
  get '/' do
92
- respond
98
+ respond (nil, params["user"])
93
99
  end
94
100
 
95
101
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-rundeck-2013
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.9
4
+ version: 0.0.10
5
5
  platform: ruby
6
6
  authors:
7
7
  - James Turnbull, Aleksejs Timohins
@@ -9,16 +9,17 @@ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
11
 
12
- date: 2013-08-26 00:00:00 Z
12
+ date: 2013-08-28 00:00:00 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra
16
16
  prerelease: false
17
17
  requirement: &id001 !ruby/object:Gem::Requirement
18
18
  requirements:
19
- - - <=
19
+ - &id004
20
+ - ">="
20
21
  - !ruby/object:Gem::Version
21
- version: 1.3.6
22
+ version: "0"
22
23
  type: :runtime
23
24
  version_requirements: *id001
24
25
  - !ruby/object:Gem::Dependency
@@ -44,14 +45,11 @@ dependencies:
44
45
  - !ruby/object:Gem::Dependency
45
46
  name: yard
46
47
  prerelease: false
47
- requirement: &id004 !ruby/object:Gem::Requirement
48
+ requirement: &id005 !ruby/object:Gem::Requirement
48
49
  requirements:
49
- - &id005
50
- - ">="
51
- - !ruby/object:Gem::Version
52
- version: "0"
50
+ - *id004
53
51
  type: :development
54
- version_requirements: *id004
52
+ version_requirements: *id005
55
53
  description: Provides a resource endpoint for RunDeck from a Puppet Server
56
54
  email: LazyDelphiBuilder@gmail.com
57
55
  executables:
@@ -82,10 +80,10 @@ require_paths:
82
80
  - lib
83
81
  required_ruby_version: !ruby/object:Gem::Requirement
84
82
  requirements:
85
- - *id005
83
+ - *id004
86
84
  required_rubygems_version: !ruby/object:Gem::Requirement
87
85
  requirements:
88
- - *id005
86
+ - *id004
89
87
  requirements: []
90
88
 
91
89
  rubyforge_project: