puppet-rundeck 0.0.7 → 0.0.8

data/README.rdoc

@@ -54,6 +54,11 @@ To use with RunDeck specify the target URL as the value of the `project.resource
 
    project.resources.url = http://localhost:8144
 
+Yo can also specify a required tag 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/tag/production
+
 You can specify some configuration options:
 
 * -c or --config to override the default Puppet configuration file (defaults to `/etc/puppet/puppet.conf`)

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/bin/puppet-rundeck

@@ -1,13 +1,13 @@
 #!/usr/bin/env ruby
 #
 # Copyright 2010, James Turnbull
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,11 +30,11 @@ optparse = OptionParser.new do |opts|
 
   opts.separator ''
   opts.separator 'Configuration options:'
- 
-  options[:config_file] = "/etc/puppet/puppet.conf" 
+
+  options[:config_file] = "/etc/puppet/puppet.conf"
   opts.on( '-c', '--config FILE', 'Specify the location of your Puppet configuration file') do |config_file|
     options[:config_file] = config_file
-  end 
+  end
 
   options[:username] = ENV['USER']
   opts.on( '-u', '--username USERNAME', 'The Username for Rundeck to SSH as') do |username|
@@ -46,9 +46,19 @@ optparse = OptionParser.new do |opts|
     options[:port] = port
   end
 
+  options[:bind] = "localhost"
+  opts.on( '-b', '--bind HOSTNAME', 'The hostname or IP address of the interface to run puppet-rundeck on') do |bind|
+    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:"
- 
+
   opts.on_tail('-h', '--help', 'Display this screen' ) do
     puts opts
     exit
@@ -59,8 +69,9 @@ begin
   optparse.parse!
   PuppetRundeck.config_file = options[:config_file]
   PuppetRundeck.username = options[:username]
+  PuppetRundeck.ssh_port = options[:ssh_port]
   PuppetRundeck.configure
-  PuppetRundeck.run! :host => "localhost", :port => options[:port] 
+  PuppetRundeck.run! :bind => options[:bind], :port => options[:port]
 rescue OptionParser::InvalidArgument, OptionParser::InvalidOption, OptionParser::MissingArgument
   puts $!.to_s
   puts optparse

data/lib/puppet-rundeck.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2011, James Turnbull
+# Copyright 2012, James Turnbull
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ require 'builder/xchar'
 
 begin
   require 'puppet'
+  require 'puppet/face'
 rescue LoadError
   puts "You need to have Puppet 0.25.5 or later installed"
 end
@@ -29,6 +30,7 @@ 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
@@ -46,7 +48,7 @@ class PuppetRundeck < Sinatra::Base
     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("*")
@@ -54,13 +56,14 @@ class PuppetRundeck < Sinatra::Base
         Puppet::Node.indirection.terminus_class = :yaml
         nodes = Puppet::Node.indirection.search("*")
       end
+      Puppet::Node.indirection.terminus_class = :plain
       nodes.each do |n|
         if Puppet::Node::Facts.respond_to? :find
           tags = Puppet::Resource::Catalog.find(n.name).tags
         else
-          tags = Puppet::Resource::Catalog.indirection.find(n.name).tags
+          tags = Puppet::Face[:catalog, :current].find(n.name).tags
         end
-        facts = n.parameters
+        facts = n.values #n.parameters
         os_family = facts["kernel"] =~ /windows/i ? 'windows' : 'unix'
       response_xml << <<-EOH
 <node name="#{xml_escape(n.name)}"
@@ -70,7 +73,7 @@ class PuppetRundeck < Sinatra::Base
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(facts["operatingsystem"])}"
       osVersion="#{xml_escape(facts["operatingsystemrelease"])}"
-      tags="#{xml_escape([n.environment, tags.join(',')].join(','))}"
+      tags="#{xml_escape(tags.join(','))}"
       username="#{xml_escape(PuppetRundeck.username)}"
       hostname="#{xml_escape(facts["fqdn"])}"/>
 EOH

metadata

@@ -1,92 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppet-rundeck
-version: !ruby/object:Gem::Version 
-  hash: 17
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 7
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - James Turnbull
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-05-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: builder
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Provides a resource endpoint for RunDeck from a Puppet Server
 email: james@puppetlabs.com
-executables: 
+executables:
 - puppet-rundeck
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -96,39 +93,31 @@ files:
 - spec/spec_helper.rb
 - bin/puppet-rundeck
 homepage: http://github.com/jamtur01/puppet-rundeck
-licenses: []
-
+licenses:
+- Apache-2.0
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.28
 signing_key: 
 specification_version: 3
 summary: Integrates Puppet with RunDeck
-test_files: 
+test_files:
 - spec/puppet-rundesk_spec.rb
 - spec/spec_helper.rb
-has_rdoc: