chef-rundeck 1.0.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9ce7ece53bc0c72a4fe221d30e8babef9077dacf
+  data.tar.gz: 98f8966b2cda5a2eeb852333e7c409af35c6bfbb
+SHA512:
+  metadata.gz: adb94d82eab00bc70ee9c8ae0a9a21c269f4cd27a27cc4620c66e85777760ca39862e5d89b20b59465beca6255ea6a058d727d4845939ab6c18e0ebf68f07943
+  data.tar.gz: f522ced6479217a1ff953757f80dae46241bc9cfad96b3b923babd4dddb05c14c558ae66a917ab715d9a3f0eb2717a445bc876d5c6a8db2d4c4ff7fb08e5a6fd

data/bin/chef-rundeck

@@ -35,10 +35,10 @@ class ChefRundeckCLI
      :description => "The client.pem to sign requests"
  
    option :config_file,
-     :short => "-c CONFIG",
-     :long  => "--config CONFIG",
-     :default => 'config.rb',
-     :description => "The Chef configuration file to use"
+      :short => "-c CONFIG",
+      :long  => "--config CONFIG",
+      :default => '/etc/chef/client.rb',
+      :description => "The Chef configuration file to use, default /etc/chef/client.rb"
 
    option :username,
      :short => "-u USERNAME",
@@ -52,6 +52,18 @@ class ChefRundeckCLI
      :description => "The base URL of the Chef Web UI",
      :default => "https://manage.opscode.com"
 
+   option :project_config,
+     :short => "-f PROJECT_CONFIG",
+     :long => "--project-config PROJECT_CONFIG",
+     :description => "JSON project configuration file, default /etc/chef/rundeck.json",
+     :default => "/etc/chef/rundeck.json"
+
+   option :host,
+     :short => "-o HOST",
+     :long => "--host HOST",
+     :description => "Listen on HOST (default: localhost)",
+     :default => "localhost"
+
    option :port,
      :short => "-p PORT",
      :long => "--port PORT",
@@ -73,6 +85,7 @@ ChefRundeck.username = cli.config[:username]
 ChefRundeck.web_ui_url = cli.config[:web_ui_url]
 ChefRundeck.api_url = cli.config[:api_url]
 ChefRundeck.client_key = cli.config[:client_key]
+ChefRundeck.project_config = cli.config[:project_config]
 ChefRundeck.configure
 
 begin
@@ -84,5 +97,5 @@ rescue Exception => e
    puts "== Error writing pid file #{pid}!"
 end
 
-ChefRundeck.run! :host => 'localhost', :port => cli.config[:port] 
+ChefRundeck.run! :bind => cli.config[:host], :port => cli.config[:port]
 

data/lib/chef-rundeck.rb

@@ -1,12 +1,12 @@
 #
 # Copyright 2010, Opscode, Inc.
-#
+# 
 # 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.
@@ -20,6 +20,15 @@ require 'chef/node'
 require 'chef/mixin/xml_escape'
 require 'chef/rest'
 
+REQUIRED_ATTRS = [ :kernel, :fqdn, :platform, :platform_version ]
+
+class MissingAttribute < StandardError
+  attr_reader :name
+  def initialize(name)
+    @name = name
+  end
+end
+
 class ChefRundeck < Sinatra::Base
 
   include Chef::Mixin::XMLEscape
@@ -27,9 +36,10 @@ class ChefRundeck < Sinatra::Base
   class << self
     attr_accessor :config_file
     attr_accessor :username
-    attr_accessor :api_url
     attr_accessor :web_ui_url
+    attr_accessor :api_url
     attr_accessor :client_key
+    attr_accessor :project_config
 
     def configure
       Chef::Config.from_file(ChefRundeck.config_file)
@@ -42,36 +52,112 @@ class ChefRundeck < Sinatra::Base
       unless ChefRundeck.client_key
         ChefRundeck.client_key = Chef::Config[:client_key]
       end
+
+      if (File.exists?(ChefRundeck.project_config)) then
+        Chef::Log.info("Using JSON project file #{ChefRundeck.project_config}")
+        projects = File.open(ChefRundeck.project_config, "r") { |f| JSON.parse(f.read) }
+        projects.keys.each do | project |
+          get "/#{project}" do
+            content_type 'text/xml'
+            Chef::Log.info("Loading nodes for /#{project}")
+            response = build_project projects[project]['pattern'], projects[project]['username'], (projects[project]['hostname'].nil? ? "fqdn" : projects[project]['hostname']), projects[project]['attributes']
+            response
+          end
+        end
+      end
+      
+      get '/' do
+        content_type 'text/xml'
+        Chef::Log.info("Loading all nodes for /")
+        response = build_project
+        response
+      end
     end
   end
 
-  get '/' do
-    content_type 'text/xml'
-    response = '<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd"><project>'
-    rest = Chef::REST.new(ChefRundeck.api_url, ChefRundeck.username, ChefRundeck.client_key)
-    nodes = rest.get_rest("/nodes/")    
+  def build_project (pattern="*:*", username=ChefRundeck.username, hostname="fqdn", custom_attributes=nil)
+    response =  '<?xml version="1.0" encoding="UTF-8"?>'
+    response << '<!DOCTYPE project PUBLIC "-//DTO Labs Inc.//DTD Resources Document 1.0//EN" "project.dtd">'
+    response << '<project>'
+
+    q = Chef::Search::Query.new
+    q.search("node",pattern) do |node|
       
-    nodes.keys.each do |node_name|
-      node = rest.get_rest("/nodes/#{node_name}")
+      begin
+      if node_is_valid? node
+        response << build_node(node, username, hostname, custom_attributes)
+      else
+        Chef::Log.warn("invalid node element: #{node.inspect}")
+      end
+      rescue Exception => e
+        Chef::Log.error("=== could not generate xml for Node: #{node.name} - #{e.message}")
+        Chef::Log.debug(e.backtrace.join('\n'))
+      end
+    end
+    
+    response << "</project>"
+    Chef::Log.debug(response)
+    
+    return response
+  end
+end
+
+def build_node (node, username, hostname, custom_attributes)
       #--
       # Certain features in Rundeck require the osFamily value to be set to 'unix' to work appropriately. - SRK
       #++
-      os_family = node[:kernel][:os] =~ /windows/i ? 'windows' : 'unix'
-      response << <<-EOH
-<node name="#{xml_escape(node[:fqdn])}"
-      type="Node"
-      description="#{xml_escape(node_name)}"
+      data = ''
+      os_family = node[:kernel][:os] =~ /winnt|windows/i ? 'winnt' : 'unix'
+      nodeexec = node[:kernel][:os] =~ /winnt|windows/i ? "node-executor=\"overthere-winrm\"" : ''
+      data << <<-EOH
+<node name="#{xml_escape(node[:fqdn])}" #{nodeexec} 
+      type="Node" 
+      description="#{xml_escape(node.name)}"
       osArch="#{xml_escape(node[:kernel][:machine])}"
       osFamily="#{xml_escape(os_family)}"
       osName="#{xml_escape(node[:platform])}"
       osVersion="#{xml_escape(node[:platform_version])}"
-      tags="#{xml_escape([node.chef_environment, node[:tags].join(','), node.run_list.roles.join(',')].join(','))}"
-      username="#{xml_escape(ChefRundeck.username)}"
-      hostname="#{xml_escape(node[:fqdn])}"
-      editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node_name)}/edit"/>
+      tags="#{xml_escape(node.run_list.roles.concat(node.run_list.recipes).join(',') + ',' + node.chef_environment)}"
+      roles="#{xml_escape(node.run_list.roles.join(','))}"
+      recipes="#{xml_escape(node.run_list.recipes.join(','))}"
+      environment="#{xml_escape(node.chef_environment)}"
+      username="#{xml_escape(username)}"
+      hostname="#{xml_escape(node[hostname])}"
+      editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node.name)}/edit" #{custom_attributes.nil? ? '/': ''}>
+EOH
+     if !custom_attributes.nil? then
+       custom_attributes.each do |attr|
+        attr_name = attr
+        attr_value = get_custom_attr(node, attr.split('.'))
+        data << <<-EOH
+      <attribute name="#{attr_name}"><![CDATA[#{attr_value}]]></attribute>
 EOH
+        end
+        data << "</node>"
+      end
+
+  return data
+end
+
+def get_custom_attr (obj, params)
+  value = obj
+  Chef::Log.debug("loading custom attributes for node: #{obj} with #{params}")
+  params.each do |p|   
+    value = value[p.to_sym]
+    if value.nil? then
+      break
     end
-    response << "</project>"
-    response
   end
+  return value.nil? ? "" : value.to_s
+end
+
+def node_is_valid?(node)
+  node[:fqdn] and
+    node.name and
+    node[:kernel] and
+    node[:kernel][:machine] and
+    node[:kernel][:os] and
+    node[:platform] and
+    node[:platform_version] and
+    node.chef_environment     
 end

data/spec/chef-rundeck_spec.rb

@@ -7,6 +7,7 @@ describe 'ChefRundeck' do
     ChefRundeck.config_file = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/client.rb"
     ChefRundeck.username = ENV['USER']
     ChefRundeck.web_ui_url = 'https://manage.opscode.com'
+    ChefRundeck.project_config = "#{ENV['TRAVIS_BUILD_DIR']}/spec/support/chef-rundeck.json"
     ChefRundeck.configure
   end
   it 'fetch to root should return 200' do
@@ -17,4 +18,20 @@ describe 'ChefRundeck' do
     get '/'
     Nokogiri::XML(last_response.body).document.should be_true
   end
+  it 'fetched document should be node1 only' do
+    get '/node1_systems'
+    last_response.should be_ok
+    Nokogiri::XML(last_response.body).xpath("//project/node[@name='node1.chefrundeck.local']").length().should == 1
+    Nokogiri::XML(last_response.body).xpath("//project/node[@name='node2.chefrundeck.local']").length().should == 0
+  end
+  it 'fetched document should be node2 only' do
+    get '/node2_systems'
+    last_response.should be_ok
+    Nokogiri::XML(last_response.body).xpath("//project/node[@name='node1.chefrundeck.local']").length().should == 0
+    Nokogiri::XML(last_response.body).xpath("//project/node[@name='node2.chefrundeck.local']").length().should == 1
+  end 
+  it 'check custom attributes on node2 only' do
+    get '/node2_systems'
+    Nokogiri::XML(last_response.body).xpath("//project/node[@name='node2.chefrundeck.local']/attribute").length().should == 2
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-rundeck
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Adam Jacob
@@ -16,113 +15,99 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   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 Chef Server
@@ -145,28 +130,27 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 homepage: http://github.com/oswaldlabs/chef-rundeck
-licenses: []
+licenses:
+- Apache License 2.0 (Apache-2.0)
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 3
 summary: Integrates Chef with RunDeck
 test_files: []
-has_rdoc: