added Dockefile and updated partial_search hostname

Dockerfile

@@ -0,0 +1,16 @@
+FROM ruby:2.2.5
+
+RUN mkdir -p /opt/chef-rundeck; mkdir -p /opt/knife
+
+RUN apt-get install git -y
+
+RUN git clone https:/ehlerst/chef-rundeck.git /opt/chef-rundeck
+
+### Get deps ready
+RUN gem install jeweler
+
+RUN cd /opt/chef-rundeck; gem build chef-rundeck.gemspec; gem install chef-rundeck
+
+EXPOSE 9980
+
+CMD ["/usr/local/bundle/bin/chef-rundeck", "-c", "/opt/knife/knife.rb", "-o", "0.0.0.0", "-t", "3600", "--partial-search", "true"]

README.md

@@ -11,6 +11,9 @@ A simple Sinatra app that presents matching node results of a Chef search format
 Install the gem and fire up chef-rundeck. Point it at a Chef client config file (a knife config would be ideal) using 
 the `-c` flag and provide the URI for your Chef server's web UI.
 
+To use with docker make your config files and mount the volume like this:
+`docker run -d -e 'USER=${job.username}' -v ~/.chef/chef-rundeck:/opt/knife -p 9980:9980 ehlers320/chef-rundeck:latest`
+
 ## Configuration Notes
 
 chef-rundeck binds to "localhost," which may result in it binding to an IPv6-only address in certain configurations.

lib/chef-rundeck.rb

@@ -109,6 +109,7 @@ def build_project (project="default", pattern="*:*", username=ChefRundeck.userna
  'platform' => [ 'platform'],
  'platform_version' => [ 'platform_version' ],
  'tags' => [ 'tags' ],
+ 'ipaddress' => [ 'ipaddress' ],
  'hostname' => [hostname]
  } 
  if !custom_attributes.nil? then
@@ -186,7 +187,7 @@ def build_node (node, username, hostname, custom_attributes)
  tags="#{xml_escape([ node['roles'], node['recipes'], node['chef_environment'], node['tags']].flatten.join(","))}"
  environment="#{xml_escape(node['chef_environment'])}"
  username="#{xml_escape(username)}"
- hostname="#{xml_escape(node['hostname'])}"
+ hostname="#{xml_escape(node['ipaddress'])}"
  editUrl="#{xml_escape(ChefRundeck.web_ui_url)}/nodes/#{xml_escape(node['name'])}/edit" #{custom_attributes.nil? ? '/': ''}>
 EOH
  if !custom_attributes.nil? then
@@ -315,12 +316,12 @@ def partial_search(type, query='*:*', *args, &block)
  end
  # If you pass a block, or have the start or rows arguments, do raw result parsing
  if Kernel.block_given? || args_hash[:start] || args_hash[:rows]
- PartialSearch.new.search(type, query, args_hash, &block)
+ Chef::PartialSearch.new.search(type, query, args_hash, &block)
 
  # Otherwise, do the iteration for the end user
  else
  results = Array.new
- PartialSearch.new.search(type, query, args_hash) do |o|
+ Chef::PartialSearch.new.search(type, query, args_hash) do |o|
  results << o
  end
  results

lib/partial_search.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright (c) 2012 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,54 +27,56 @@
 require 'chef/data_bag'
 require 'chef/data_bag_item'
 
-class PartialSearch
+class Chef
+ class PartialSearch
+ attr_accessor :rest
 
- attr_accessor :rest
-
- def initialize(url=nil)
- @rest = ::Chef::REST.new(url || ::Chef::Config[:chef_server_url])
- end
+ def initialize(url = nil)
+ @rest = ::Chef::REST.new(url || ::Chef::Config[:chef_server_url])
+ end
 
- # Search Solr for objects of a given type, for a given query. If you give
- # it a block, it will handle the paging for you dynamically.
- def search(type, query='*:*', args={}, &block)
- raise ArgumentError, "Type must be a string or a symbol!" unless (type.kind_of?(String) || type.kind_of?(Symbol))
+  # Search Solr for objects of a given type, for a given query. If you give
+  # it a block, it will handle the paging for you dynamically.
+  def search(type, query = '*:*', args = {}, &block)
+  fail ArgumentError, 'Type must be a string or a symbol!' unless type.is_a?(String) || type.is_a?(Symbol)
 
- sort = args.include?(:sort) ? args[:sort] : 'X_CHEF_id_CHEF_X asc'
- start = args.include?(:start) ? args[:start] : 0
- rows = args.include?(:rows) ? args[:rows] : 1000
- query_string = "search/#{type}?q=#{escape(query)}&sort=#{escape(sort)}&start=#{escape(start)}&rows=#{escape(rows)}"
- if args[:keys]
- response = @rest.post_rest(query_string, args[:keys])
- response_rows = response['rows'].map { |row| row['data'] }
- else
- response = @rest.get_rest(query_string)
- response_rows = response['rows']
- end
- if block
- response_rows.each { |o| block.call(o) unless o.nil?}
- unless (response["start"] + response_rows.length) >= response["total"]
- nstart = response["start"] + rows
- args_hash = {
- :keys => args[:keys],
- :sort => sort,
- :start => nstart,
- :rows => rows
- }
- search(type, query, args_hash, &block)
+ sort = args.include?(:sort) ? args[:sort] : 'X_CHEF_id_CHEF_X asc'
+ start = args.include?(:start) ? args[:start] : 0
+ rows = args.include?(:rows) ? args[:rows] : 1000
+ query_string = "search/#{type}?q=#{escape(query)}&sort=#{escape(sort)}&start=#{escape(start)}&rows=#{escape(rows)}"
+ if args[:keys]
+ response = @rest.post_rest(query_string, args[:keys])
+ response_rows = response['rows'].map { |row| row['data'] }
+ else
+ response = @rest.get_rest(query_string)
+ response_rows = response['rows']
+ end
+ if block
+ response_rows.each { |o| block.call(o) unless o.nil? }
+ unless (response['start'] + response_rows.length) >= response['total']
+ nstart = response['start'] + rows
+ args_hash = {
+ keys: args[:keys],
+ sort: sort,
+ start: nstart,
+ rows: rows
+ }
+ search(type, query, args_hash, &block)
+ end
+ true
+ else
+ [response_rows, response['start'], response['total']]
  end
- true
- else
- [ response_rows, response["start"], response["total"] ]
  end
- end
 
- def list_indexes
- response = @rest.get_rest("search")
- end
+ def list_indexes
+ @rest.get_rest('search')
+ end
+
+ private
 
- private
  def escape(s)
  s && URI.escape(s.to_s)
  end
+ end
 end