puppet-rundeck 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/VERSION +1 -1
  2. data/lib/puppet-rundeck.rb +6 -1
  3. metadata +7 -8
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.6
1
+ 0.0.7
@@ -55,6 +55,11 @@ class PuppetRundeck < Sinatra::Base
55
55
  nodes = Puppet::Node.indirection.search("*")
56
56
  end
57
57
  nodes.each do |n|
58
+ if Puppet::Node::Facts.respond_to? :find
59
+ tags = Puppet::Resource::Catalog.find(n.name).tags
60
+ else
61
+ tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
62
+ end
58
63
  facts = n.parameters
59
64
  os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
60
65
  response_xml << <<-EOH
@@ -65,7 +70,7 @@ class PuppetRundeck < Sinatra::Base
65
70
  osFamily="#{xml_escape(os_family)}"
66
71
  osName="#{xml_escape(facts["operatingsystem"])}"
67
72
  osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
68
- tags="#{xml_escape([n.environment])}"
73
+ tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
69
74
  username="#{xml_escape(PuppetRundeck.username)}"
70
75
  hostname="#{xml_escape(facts["fqdn"])}"/>
71
76
  EOH
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet-rundeck
3
3
  version: !ruby/object:Gem::Version
4
- hash: 19
5
- prerelease: false
4
+ hash: 17
5
+ prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 6
10
- version: 0.0.6
9
+ - 7
10
+ version: 0.0.7
11
11
  platform: ruby
12
12
  authors:
13
13
  - James Turnbull
@@ -15,8 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2011-11-22 00:00:00 +11:00
19
- default_executable: puppet-rundeck
18
+ date: 2012-05-22 00:00:00 Z
20
19
  dependencies:
21
20
  - !ruby/object:Gem::Dependency
22
21
  name: sinatra
@@ -96,7 +95,6 @@ files:
96
95
  - spec/puppet-rundesk_spec.rb
97
96
  - spec/spec_helper.rb
98
97
  - bin/puppet-rundeck
99
- has_rdoc: true
100
98
  homepage: http://github.com/jamtur01/puppet-rundeck
101
99
  licenses: []
102
100
 
@@ -126,10 +124,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
126
124
  requirements: []
127
125
 
128
126
  rubyforge_project:
129
- rubygems_version: 1.3.7
127
+ rubygems_version: 1.8.11
130
128
  signing_key:
131
129
  specification_version: 3
132
130
  summary: Integrates Puppet with RunDeck
133
131
  test_files:
134
132
  - spec/puppet-rundesk_spec.rb
135
133
  - spec/spec_helper.rb
134
+ has_rdoc: