268 files changed, 357 insertions, 24 deletions

diff --git a/LICENSE b/chef-server/LICENSE
index 11069edd79..11069edd79 100644
--- a/LICENSE
+++ b/chef-server/LICENSE
diff --git a/chef-server/NOTICE b/chef-server/NOTICE
new file mode 100644
index 0000000000..856fdc82b0
--- /dev/null
+++ b/chef-server/NOTICE
@@ -0,0 +1,10 @@
+Chef NOTICE
+===========
+
+Developed at HJK Solutions (http://www.hjksolutions.com).
+
+Contributors and Copyright holders:
+
+ * Copyright 2008, Adam Jacob <adam@hjksolutions.com>
+ * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
+ * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
diff --git a/chef-server/README.txt b/chef-server/README.txt
new file mode 100644
index 0000000000..08a0d31bf2
--- /dev/null
+++ b/chef-server/README.txt
@@ -0,0 +1,77 @@
+= chef-server
+
+* http://oss.hjksolutions.com/chef
+
+== DESCRIPTION:
+
+Chef is a configuration management tool inspired by Puppet. 
+
+I'm in ur netwerk, cookin up yer servers. :)
+
+== FEATURES/PROBLEMS:
+
+
+== SYNOPSIS:
+
+
+== REQUIREMENTS:
+
+RubyGems:
+
+* stomp
+* stompserver
+* ultraviolet
+* facter
+* ferret
+* merb-core
+* haml
+* ruby-openid
+* json
+
+External Servers:
+
+* stompserver (for easy stomp mq testing)
+* CouchDB
+
+== INSTALL:
+
+Install all of the above.  To fire up a develpment environment, do the following:
+
+  * Start CouchDB with 'couchdb'
+  * Start stompserver with 'stompserver' 
+  * Start chef-indexer with:
+
+		./bin/chef-indexer -l debug -c ./config/chef-server.rb
+
+  * Start chef-server on port 4000 with:
+
+    ./bin/chef-server
+
+  * Start chef-server on port 4001 with:
+
+    ./bin/chef-server -p 4001
+
+  * Test run chef with:
+
+    sudo ./bin/chef-client -l debug -c ./examples/config/chef-solo.rb
+
+== LICENSE:
+
+Chef - A configuration management system
+
+Author:: Adam Jacob (<adam@hjksolutions.com>)
+Copyright:: Copyright (c) 2008 HJK Solutions, LLC
+License:: Apache License, Version 2.0
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
+
diff --git a/chef-server/Rakefile b/chef-server/Rakefile
new file mode 100644
index 0000000000..4f7b21a9e3
--- /dev/null
+++ b/chef-server/Rakefile
@@ -0,0 +1,47 @@
+# -*- ruby -*-
+require 'rubygems'
+require 'rake/gempackagetask'
+
+GEM = "chef-server"
+VERSION = "0.0.1"
+AUTHOR = "Adam Jacob"
+EMAIL = "adam@hjksolutions.com"
+HOMEPAGE = "http://hjksolutions.com"
+SUMMARY = "A configuration management system server."
+
+spec = Gem::Specification.new do |s|
+  s.name = GEM
+  s.version = VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.txt", "LICENSE", 'NOTICE']
+  s.summary = SUMMARY
+  s.description = s.summary
+  s.author = AUTHOR
+  s.email = EMAIL
+  s.homepage = HOMEPAGE
+  
+  # Uncomment this to add a dependency
+  s.add_dependency "stomp"
+  s.add_dependency "stompserver"
+  s.add_dependency "ferret"
+  s.add_dependency "merb-core"
+  s.add_dependency "haml"
+  s.add_dependency "ruby-openid"
+  s.add_dependency "json"
+  
+  s.bindir       = "bin"
+  s.executables  = %w( chef-indexer chef-server  )
+  
+  s.files = %w(LICENSE README.txt Rakefile) + Dir.glob("{lib}/**/*")
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.gem_spec = spec
+end
+
+task :install => [:package] do
+  sh %{sudo gem install pkg/#{GEM}-#{VERSION}}
+end
+
+# vim: syntax=Ruby
\ No newline at end of file
diff --git a/bin/chef-indexer b/chef-server/bin/chef-indexer
index 76606e9219..4788aca0f7 100755
--- a/bin/chef-indexer
+++ b/chef-server/bin/chef-indexer
@@ -18,8 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-$: << File.join(File.dirname(__FILE__), "..", "lib")
-
 require 'optparse'
 require 'chef'
 require 'rubygems'
diff --git a/bin/chef-server b/chef-server/bin/chef-server
index 1322fdd03f..bfd0361156 100755
--- a/bin/chef-server
+++ b/chef-server/bin/chef-server
@@ -22,6 +22,7 @@
 
 require "rubygems"
 require "merb-core"
+require 'chef'
 
 if ARGV[0] && ARGV[0] =~ /^[^-]/
   ARGV.push "-H"
@@ -31,6 +32,17 @@ unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.inde
   ARGV.push *%w[-a mongrel]
 end
 
-ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "lib", "chef_server", "init.rb") ]
+ARGV.push *[ "-I", File.join(File.dirname(__FILE__), "..", "lib", "init.rb") ]
+
+if index = ARGV.index("-C")
+  config = ARGV[index+1]
+  ARGV.delete("-C")
+  ARGV.delete(config)
+  Chef::Config.from_file(File.expand_path(config))
+else
+  Chef::Config.from_file(
+    File.join("/etc", "chef", "server.rb")
+  )
+end
 
 Merb.start
diff --git a/lib/chef_server/controllers/application.rb b/chef-server/lib/controllers/application.rb
index d98492d3ad..6a501ea29c 100644
--- a/lib/chef_server/controllers/application.rb
+++ b/chef-server/lib/controllers/application.rb
@@ -16,6 +16,9 @@
 # limitations under the License.
 #
 
+require "chef" / "mixin" / "checksum"
+
+
 class Application < Merb::Controller
 
   def fix_up_node_id
diff --git a/lib/chef_server/controllers/cookbook_attributes.rb b/chef-server/lib/controllers/cookbook_attributes.rb
index 5dd2b44802..803421b6f5 100644
--- a/lib/chef_server/controllers/cookbook_attributes.rb
+++ b/chef-server/lib/controllers/cookbook_attributes.rb
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), "..", "..", "chef", "mixin", "checksum")
 
 class CookbookAttributes < Application
   
diff --git a/lib/chef_server/controllers/cookbook_definitions.rb b/chef-server/lib/controllers/cookbook_definitions.rb
index 07135371af..dbfeeca4d7 100644
--- a/lib/chef_server/controllers/cookbook_definitions.rb
+++ b/chef-server/lib/controllers/cookbook_definitions.rb
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), "..", "..", "chef", "mixin", "checksum")
 
 class CookbookDefinitions < Application
   
diff --git a/lib/chef_server/controllers/cookbook_files.rb b/chef-server/lib/controllers/cookbook_files.rb
index 30b0dead65..2d8078ad7e 100644
--- a/lib/chef_server/controllers/cookbook_files.rb
+++ b/chef-server/lib/controllers/cookbook_files.rb
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), "..", "..", "chef", "mixin", "checksum")
 
 class CookbookFiles < Application
   
diff --git a/lib/chef_server/controllers/cookbook_recipes.rb b/chef-server/lib/controllers/cookbook_recipes.rb
index 6c27ddadd6..5081ddced1 100644
--- a/lib/chef_server/controllers/cookbook_recipes.rb
+++ b/chef-server/lib/controllers/cookbook_recipes.rb
@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), "..", "..", "chef", "mixin", "checksum")
 
 class CookbookRecipes < Application
   
diff --git a/lib/chef_server/controllers/cookbook_templates.rb b/chef-server/lib/controllers/cookbook_templates.rb
index 4cb5e4622c..4cb5e4622c 100644
--- a/lib/chef_server/controllers/cookbook_templates.rb
+++ b/chef-server/lib/controllers/cookbook_templates.rb
diff --git a/lib/chef_server/controllers/cookbooks.rb b/chef-server/lib/controllers/cookbooks.rb
index e2a9d7f319..e2a9d7f319 100644
--- a/lib/chef_server/controllers/cookbooks.rb
+++ b/chef-server/lib/controllers/cookbooks.rb
diff --git a/lib/chef_server/controllers/exceptions.rb b/chef-server/lib/controllers/exceptions.rb
index d8f7307637..d8f7307637 100644
--- a/lib/chef_server/controllers/exceptions.rb
+++ b/chef-server/lib/controllers/exceptions.rb
diff --git a/lib/chef_server/controllers/nodes.rb b/chef-server/lib/controllers/nodes.rb
index 655b264862..655b264862 100644
--- a/lib/chef_server/controllers/nodes.rb
+++ b/chef-server/lib/controllers/nodes.rb
diff --git a/lib/chef_server/controllers/openid_consumer.rb b/chef-server/lib/controllers/openid_consumer.rb
index 4e3980ce3d..4e3980ce3d 100644
--- a/lib/chef_server/controllers/openid_consumer.rb
+++ b/chef-server/lib/controllers/openid_consumer.rb
diff --git a/lib/chef_server/controllers/openid_register.rb b/chef-server/lib/controllers/openid_register.rb
index f5113ef267..f5113ef267 100644
--- a/lib/chef_server/controllers/openid_register.rb
+++ b/chef-server/lib/controllers/openid_register.rb
diff --git a/lib/chef_server/controllers/openid_server.rb b/chef-server/lib/controllers/openid_server.rb
index 4cdaf67adb..4cdaf67adb 100644
--- a/lib/chef_server/controllers/openid_server.rb
+++ b/chef-server/lib/controllers/openid_server.rb
diff --git a/lib/chef_server/controllers/search.rb b/chef-server/lib/controllers/search.rb
index 0abbf352b8..0abbf352b8 100644
--- a/lib/chef_server/controllers/search.rb
+++ b/chef-server/lib/controllers/search.rb
diff --git a/lib/chef_server/controllers/search_entries.rb b/chef-server/lib/controllers/search_entries.rb
index c93add3dc5..c93add3dc5 100644
--- a/lib/chef_server/controllers/search_entries.rb
+++ b/chef-server/lib/controllers/search_entries.rb
diff --git a/lib/chef_server/helpers/global_helpers.rb b/chef-server/lib/helpers/global_helpers.rb
index f3b15129a8..f3b15129a8 100644
--- a/lib/chef_server/helpers/global_helpers.rb
+++ b/chef-server/lib/helpers/global_helpers.rb
diff --git a/lib/chef_server/helpers/nodes_helper.rb b/chef-server/lib/helpers/nodes_helper.rb
index 44a190a7c6..44a190a7c6 100644
--- a/lib/chef_server/helpers/nodes_helper.rb
+++ b/chef-server/lib/helpers/nodes_helper.rb
diff --git a/lib/chef_server/helpers/openid_server_helpers.rb b/chef-server/lib/helpers/openid_server_helpers.rb
index dc56d2742f..dc56d2742f 100644
--- a/lib/chef_server/helpers/openid_server_helpers.rb
+++ b/chef-server/lib/helpers/openid_server_helpers.rb
diff --git a/lib/chef_server/init.rb b/chef-server/lib/init.rb
index e88c478426..2aa5781a81 100644
--- a/lib/chef_server/init.rb
+++ b/chef-server/lib/init.rb
@@ -81,16 +81,6 @@ Merb.disable :json
 # OR
 # dependencies "RedCloth" => "> 3.0", "ruby-aes-cext" => "= 1.0"
 Merb::BootLoader.after_app_loads do
-  # Add dependencies here that must load after the application loads:
-  if File.exists?(File.join(File.dirname(__FILE__), "..", "..", "config", "server.rb")) 
-    Chef::Config.from_file(
-      File.join(File.dirname(__FILE__), "..", "..", "config", "server.rb")
-    )
-  else
-    Chef::Config.from_file(
-      File.join("/etc", "chef", "server.rb")
-    )
-  end
   Chef::Queue.connect
 
   # create the couch design docs for nodes and openid registrations
@@ -125,7 +115,7 @@ Merb.push_path(:helper, File.join(File.dirname(__FILE__), "helpers"))
 Merb.push_path(:public, File.join(File.dirname(__FILE__), "public"))
 
 require 'merb-haml'
-require 'uv'
+#require 'uv'
 
 
 #
diff --git a/lib/chef_server/public/images/merb.jpg b/chef-server/lib/public/images/merb.jpg
index a19dcf4048..a19dcf4048 100644
--- a/lib/chef_server/public/images/merb.jpg
+++ b/chef-server/lib/public/images/merb.jpg
diff --git a/lib/chef_server/public/stylesheets/master.css b/chef-server/lib/public/stylesheets/master.css
index 13bdffbe1b..13bdffbe1b 100644
--- a/lib/chef_server/public/stylesheets/master.css
+++ b/chef-server/lib/public/stylesheets/master.css
diff --git a/lib/chef_server/views/cookbook_templates/index.html.haml b/chef-server/lib/views/cookbook_templates/index.html.haml
index 307aefd812..307aefd812 100644
--- a/lib/chef_server/views/cookbook_templates/index.html.haml
+++ b/chef-server/lib/views/cookbook_templates/index.html.haml
diff --git a/lib/chef_server/views/cookbooks/_attribute_file.html.haml b/chef-server/lib/views/cookbooks/_attribute_file.html.haml
index af859d5ff3..af859d5ff3 100644
--- a/lib/chef_server/views/cookbooks/_attribute_file.html.haml
+++ b/chef-server/lib/views/cookbooks/_attribute_file.html.haml
diff --git a/lib/chef_server/views/cookbooks/attribute_files.html.haml b/chef-server/lib/views/cookbooks/attribute_files.html.haml
index 56fdcf7bee..56fdcf7bee 100644
--- a/lib/chef_server/views/cookbooks/attribute_files.html.haml
+++ b/chef-server/lib/views/cookbooks/attribute_files.html.haml
diff --git a/lib/chef_server/views/cookbooks/index.html.haml b/chef-server/lib/views/cookbooks/index.html.haml
index 008f74765c..008f74765c 100644
--- a/lib/chef_server/views/cookbooks/index.html.haml
+++ b/chef-server/lib/views/cookbooks/index.html.haml
diff --git a/lib/chef_server/views/cookbooks/show.html.haml b/chef-server/lib/views/cookbooks/show.html.haml
index 1b6557e012..1b6557e012 100644
--- a/lib/chef_server/views/cookbooks/show.html.haml
+++ b/chef-server/lib/views/cookbooks/show.html.haml
diff --git a/lib/chef_server/views/exceptions/bad_request.json.erb b/chef-server/lib/views/exceptions/bad_request.json.erb
index f266cf99b9..f266cf99b9 100644
--- a/lib/chef_server/views/exceptions/bad_request.json.erb
+++ b/chef-server/lib/views/exceptions/bad_request.json.erb
diff --git a/lib/chef_server/views/exceptions/internal_server_error.html.erb b/chef-server/lib/views/exceptions/internal_server_error.html.erb
index aadbfad350..aadbfad350 100644
--- a/lib/chef_server/views/exceptions/internal_server_error.html.erb
+++ b/chef-server/lib/views/exceptions/internal_server_error.html.erb
diff --git a/lib/chef_server/views/exceptions/not_acceptable.html.erb b/chef-server/lib/views/exceptions/not_acceptable.html.erb
index f632712bb2..f632712bb2 100644
--- a/lib/chef_server/views/exceptions/not_acceptable.html.erb
+++ b/chef-server/lib/views/exceptions/not_acceptable.html.erb
diff --git a/lib/chef_server/views/exceptions/not_found.html.erb b/chef-server/lib/views/exceptions/not_found.html.erb
index 388c72c31d..388c72c31d 100644
--- a/lib/chef_server/views/exceptions/not_found.html.erb
+++ b/chef-server/lib/views/exceptions/not_found.html.erb
diff --git a/lib/chef_server/views/layout/application.html.haml b/chef-server/lib/views/layout/application.html.haml
index 2be4097d29..2be4097d29 100644
--- a/lib/chef_server/views/layout/application.html.haml
+++ b/chef-server/lib/views/layout/application.html.haml
diff --git a/lib/chef_server/views/nodes/_action.html.haml b/chef-server/lib/views/nodes/_action.html.haml
index 8adb39338d..8adb39338d 100644
--- a/lib/chef_server/views/nodes/_action.html.haml
+++ b/chef-server/lib/views/nodes/_action.html.haml
diff --git a/lib/chef_server/views/nodes/_node.html.haml b/chef-server/lib/views/nodes/_node.html.haml
index 24b1f2816b..24b1f2816b 100644
--- a/lib/chef_server/views/nodes/_node.html.haml
+++ b/chef-server/lib/views/nodes/_node.html.haml
diff --git a/lib/chef_server/views/nodes/_resource.html.haml b/chef-server/lib/views/nodes/_resource.html.haml
index 7b9776b816..7b9776b816 100644
--- a/lib/chef_server/views/nodes/_resource.html.haml
+++ b/chef-server/lib/views/nodes/_resource.html.haml
diff --git a/lib/chef_server/views/nodes/compile.html.haml b/chef-server/lib/views/nodes/compile.html.haml
index 5656447ea8..5656447ea8 100644
--- a/lib/chef_server/views/nodes/compile.html.haml
+++ b/chef-server/lib/views/nodes/compile.html.haml
diff --git a/lib/chef_server/views/nodes/index.html.haml b/chef-server/lib/views/nodes/index.html.haml
index 667e1c7317..667e1c7317 100644
--- a/lib/chef_server/views/nodes/index.html.haml
+++ b/chef-server/lib/views/nodes/index.html.haml
diff --git a/lib/chef_server/views/nodes/show.html.haml b/chef-server/lib/views/nodes/show.html.haml
index 94708af6d3..94708af6d3 100644
--- a/lib/chef_server/views/nodes/show.html.haml
+++ b/chef-server/lib/views/nodes/show.html.haml
diff --git a/lib/chef_server/views/openid_consumer/index.html.haml b/chef-server/lib/views/openid_consumer/index.html.haml
index 576ef8d787..576ef8d787 100644
--- a/lib/chef_server/views/openid_consumer/index.html.haml
+++ b/chef-server/lib/views/openid_consumer/index.html.haml
diff --git a/lib/chef_server/views/openid_consumer/start.html.haml b/chef-server/lib/views/openid_consumer/start.html.haml
index 75ed9a9257..75ed9a9257 100644
--- a/lib/chef_server/views/openid_consumer/start.html.haml
+++ b/chef-server/lib/views/openid_consumer/start.html.haml
diff --git a/lib/chef_server/views/openid_login/index.html.haml b/chef-server/lib/views/openid_login/index.html.haml
index 17ae69017a..17ae69017a 100644
--- a/lib/chef_server/views/openid_login/index.html.haml
+++ b/chef-server/lib/views/openid_login/index.html.haml
diff --git a/lib/chef_server/views/openid_register/index.html.haml b/chef-server/lib/views/openid_register/index.html.haml
index fe4798c59d..fe4798c59d 100644
--- a/lib/chef_server/views/openid_register/index.html.haml
+++ b/chef-server/lib/views/openid_register/index.html.haml
diff --git a/lib/chef_server/views/openid_register/show.html.haml b/chef-server/lib/views/openid_register/show.html.haml
index cfd38e8963..cfd38e8963 100644
--- a/lib/chef_server/views/openid_register/show.html.haml
+++ b/chef-server/lib/views/openid_register/show.html.haml
diff --git a/lib/chef_server/views/openid_server/decide.html.haml b/chef-server/lib/views/openid_server/decide.html.haml
index 8082a5068d..8082a5068d 100644
--- a/lib/chef_server/views/openid_server/decide.html.haml
+++ b/chef-server/lib/views/openid_server/decide.html.haml
diff --git a/lib/chef_server/views/search/_search_form.html.haml b/chef-server/lib/views/search/_search_form.html.haml
index 99303e1714..99303e1714 100644
--- a/lib/chef_server/views/search/_search_form.html.haml
+++ b/chef-server/lib/views/search/_search_form.html.haml
diff --git a/lib/chef_server/views/search/index.html.haml b/chef-server/lib/views/search/index.html.haml
index 742c1110b0..742c1110b0 100644
--- a/lib/chef_server/views/search/index.html.haml
+++ b/chef-server/lib/views/search/index.html.haml
diff --git a/lib/chef_server/views/search/show.html.haml b/chef-server/lib/views/search/show.html.haml
index 5380a7477a..5380a7477a 100644
--- a/lib/chef_server/views/search/show.html.haml
+++ b/chef-server/lib/views/search/show.html.haml
diff --git a/lib/chef_server/views/search_entries/index.html.haml b/chef-server/lib/views/search_entries/index.html.haml
index 77d140242e..77d140242e 100644
--- a/lib/chef_server/views/search_entries/index.html.haml
+++ b/chef-server/lib/views/search_entries/index.html.haml
diff --git a/lib/chef_server/views/search_entries/show.html.haml b/chef-server/lib/views/search_entries/show.html.haml
index 7ca34b32ab..7ca34b32ab 100644
--- a/lib/chef_server/views/search_entries/show.html.haml
+++ b/chef-server/lib/views/search_entries/show.html.haml
diff --git a/chef-server/pkg/chef-server-0.0.1.gem b/chef-server/pkg/chef-server-0.0.1.gem
new file mode 100644
index 0000000000..86a59594cf
--- /dev/null
+++ b/chef-server/pkg/chef-server-0.0.1.gem
diff --git a/History.txt b/chef/History.txt
index 02d903461e..02d903461e 100644
--- a/History.txt
+++ b/chef/History.txt
diff --git a/chef/LICENSE b/chef/LICENSE
new file mode 100644
index 0000000000..11069edd79
--- /dev/null
+++ b/chef/LICENSE
@@ -0,0 +1,201 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+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.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/Manifest.txt b/chef/Manifest.txt
index 79d961a738..79d961a738 100644
--- a/Manifest.txt
+++ b/chef/Manifest.txt
diff --git a/NOTICE b/chef/NOTICE
index e2385f99a2..e2385f99a2 100644
--- a/NOTICE
+++ b/chef/NOTICE
diff --git a/README.txt b/chef/README.txt
index 70758161ae..70758161ae 100644
--- a/README.txt
+++ b/chef/README.txt
diff --git a/Rakefile b/chef/Rakefile
index 3acfc1d70e..13738158e4 100644
--- a/Rakefile
+++ b/chef/Rakefile
@@ -24,17 +24,14 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
   
   # Uncomment this to add a dependency
-  s.add_dependency "stomp"
-  s.add_dependency "stompserver"
-  s.add_dependency "ferret"
   s.add_dependency "facter"
-  s.add_dependency "merb-core"
-  s.add_dependency "haml"
   s.add_dependency "ruby-openid"
   s.add_dependency "json"
+  s.add_dependency "erubis"  
+  s.add_dependency "extlib"
   
   s.bindir       = "bin"
-  s.executables  = %w( chef-client chef-indexer chef-server chef-solo )
+  s.executables  = %w( chef-client  chef-solo )
   
   s.require_path = 'lib'
   s.files = %w(LICENSE README.txt Rakefile) + Dir.glob("{lib,specs,config,examples}/**/*")
diff --git a/bin/chef-client b/chef/bin/chef-client
index a80020b0aa..a80020b0aa 100755
--- a/bin/chef-client
+++ b/chef/bin/chef-client
diff --git a/bin/chef-solo b/chef/bin/chef-solo
index ecc06afb79..ecc06afb79 100755
--- a/bin/chef-solo
+++ b/chef/bin/chef-solo
diff --git a/config/server.rb b/chef/config/server.rb
index 74c12df403..74c12df403 100644
--- a/config/server.rb
+++ b/chef/config/server.rb
diff --git a/docs/design/HighLevel.graffle b/chef/docs/design/HighLevel.graffle
index e3a5aec187..e3a5aec187 100644
--- a/docs/design/HighLevel.graffle
+++ b/chef/docs/design/HighLevel.graffle
diff --git a/docs/recipe.rb b/chef/docs/recipe.rb
index b132ff42ea..b132ff42ea 100644
--- a/docs/recipe.rb
+++ b/chef/docs/recipe.rb
diff --git a/examples/config.rb b/chef/examples/config.rb
index 171554c416..171554c416 100644
--- a/examples/config.rb
+++ b/chef/examples/config.rb
diff --git a/examples/config/chef-solo.rb b/chef/examples/config/chef-solo.rb
index 2a85253b37..2a85253b37 100644
--- a/examples/config/chef-solo.rb
+++ b/chef/examples/config/chef-solo.rb
diff --git a/examples/config/cookbooks/fakefile/attributes/first.rb b/chef/examples/config/cookbooks/fakefile/attributes/first.rb
index 927dafe967..927dafe967 100644
--- a/examples/config/cookbooks/fakefile/attributes/first.rb
+++ b/chef/examples/config/cookbooks/fakefile/attributes/first.rb
diff --git a/examples/config/cookbooks/fakefile/definitions/test.rb b/chef/examples/config/cookbooks/fakefile/definitions/test.rb
index ce32293943..ce32293943 100644
--- a/examples/config/cookbooks/fakefile/definitions/test.rb
+++ b/chef/examples/config/cookbooks/fakefile/definitions/test.rb
diff --git a/examples/config/cookbooks/fakefile/files/default/remote_test/another/turn/the_page.txt b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/another/turn/the_page.txt
index 9664cb3e15..9664cb3e15 100644
--- a/examples/config/cookbooks/fakefile/files/default/remote_test/another/turn/the_page.txt
+++ b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/another/turn/the_page.txt
diff --git a/examples/config/cookbooks/fakefile/files/default/remote_test/another/window.txt b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/another/window.txt
index 68a3bf17e4..68a3bf17e4 100644
--- a/examples/config/cookbooks/fakefile/files/default/remote_test/another/window.txt
+++ b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/another/window.txt
diff --git a/examples/config/cookbooks/fakefile/files/default/remote_test/mycat.txt b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/mycat.txt
index d4d8511934..d4d8511934 100644
--- a/examples/config/cookbooks/fakefile/files/default/remote_test/mycat.txt
+++ b/chef/examples/config/cookbooks/fakefile/files/default/remote_test/mycat.txt
diff --git a/examples/config/cookbooks/fakefile/files/default/the_park.txt b/chef/examples/config/cookbooks/fakefile/files/default/the_park.txt
index c71308a6ca..c71308a6ca 100644
--- a/examples/config/cookbooks/fakefile/files/default/the_park.txt
+++ b/chef/examples/config/cookbooks/fakefile/files/default/the_park.txt
diff --git a/examples/config/cookbooks/fakefile/recipes/default.rb b/chef/examples/config/cookbooks/fakefile/recipes/default.rb
index 12ba3e69d9..12ba3e69d9 100644
--- a/examples/config/cookbooks/fakefile/recipes/default.rb
+++ b/chef/examples/config/cookbooks/fakefile/recipes/default.rb
diff --git a/examples/config/cookbooks/fakefile/templates/default/monkey.erb b/chef/examples/config/cookbooks/fakefile/templates/default/monkey.erb
index 29c2639381..29c2639381 100644
--- a/examples/config/cookbooks/fakefile/templates/default/monkey.erb
+++ b/chef/examples/config/cookbooks/fakefile/templates/default/monkey.erb
diff --git a/examples/config/cookbooks/rubygems_server/attributes/first.rb b/chef/examples/config/cookbooks/rubygems_server/attributes/first.rb
index d1b7bd6a23..d1b7bd6a23 100644
--- a/examples/config/cookbooks/rubygems_server/attributes/first.rb
+++ b/chef/examples/config/cookbooks/rubygems_server/attributes/first.rb
diff --git a/examples/config/cookbooks/rubygems_server/files/default/packages/net-scp-1.0.1.gem b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-scp-1.0.1.gem
index d3eafbca10..d3eafbca10 100644
--- a/examples/config/cookbooks/rubygems_server/files/default/packages/net-scp-1.0.1.gem
+++ b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-scp-1.0.1.gem
diff --git a/examples/config/cookbooks/rubygems_server/files/default/packages/net-sftp-2.0.1.gem b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-sftp-2.0.1.gem
index e9bc3c2276..e9bc3c2276 100644
--- a/examples/config/cookbooks/rubygems_server/files/default/packages/net-sftp-2.0.1.gem
+++ b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-sftp-2.0.1.gem
diff --git a/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-2.0.3.gem b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-2.0.3.gem
index b11cbe00cc..b11cbe00cc 100644
--- a/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-2.0.3.gem
+++ b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-2.0.3.gem
diff --git a/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-gateway-1.0.0.gem b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-gateway-1.0.0.gem
index 545f850a71..545f850a71 100644
--- a/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-gateway-1.0.0.gem
+++ b/chef/examples/config/cookbooks/rubygems_server/files/default/packages/net-ssh-gateway-1.0.0.gem
diff --git a/examples/config/cookbooks/rubygems_server/recipes/default.rb b/chef/examples/config/cookbooks/rubygems_server/recipes/default.rb
index 6b60456094..6b60456094 100644
--- a/examples/config/cookbooks/rubygems_server/recipes/default.rb
+++ b/chef/examples/config/cookbooks/rubygems_server/recipes/default.rb
diff --git a/examples/config/cookbooks/servicetest/recipes/default.rb b/chef/examples/config/cookbooks/servicetest/recipes/default.rb
index 812b48e19d..812b48e19d 100644
--- a/examples/config/cookbooks/servicetest/recipes/default.rb
+++ b/chef/examples/config/cookbooks/servicetest/recipes/default.rb
diff --git a/examples/config/cookbooks/tempfile/attributes/second.rb b/chef/examples/config/cookbooks/tempfile/attributes/second.rb
index df791b8429..df791b8429 100644
--- a/examples/config/cookbooks/tempfile/attributes/second.rb
+++ b/chef/examples/config/cookbooks/tempfile/attributes/second.rb
diff --git a/examples/config/cookbooks/tempfile/recipes/default.rb b/chef/examples/config/cookbooks/tempfile/recipes/default.rb
index b4fa86ac32..b4fa86ac32 100644
--- a/examples/config/cookbooks/tempfile/recipes/default.rb
+++ b/chef/examples/config/cookbooks/tempfile/recipes/default.rb
diff --git a/examples/config/nodes/adam.rb b/chef/examples/config/nodes/adam.rb
index c3e8e4bc16..c3e8e4bc16 100644
--- a/examples/config/nodes/adam.rb
+++ b/chef/examples/config/nodes/adam.rb
diff --git a/examples/config/nodes/default.rb b/chef/examples/config/nodes/default.rb
index d365690c60..d365690c60 100644
--- a/examples/config/nodes/default.rb
+++ b/chef/examples/config/nodes/default.rb
diff --git a/examples/config/nodes/junglist.gen.nz.rb b/chef/examples/config/nodes/junglist.gen.nz.rb
index 70ce7661b5..70ce7661b5 100644
--- a/examples/config/nodes/junglist.gen.nz.rb
+++ b/chef/examples/config/nodes/junglist.gen.nz.rb
diff --git a/examples/config/nodes/latte.rb b/chef/examples/config/nodes/latte.rb
index 8987738151..8987738151 100644
--- a/examples/config/nodes/latte.rb
+++ b/chef/examples/config/nodes/latte.rb
diff --git a/examples/mrepo/Rakefile b/chef/examples/mrepo/Rakefile
index e69de29bb2..e69de29bb2 100644
--- a/examples/mrepo/Rakefile
+++ b/chef/examples/mrepo/Rakefile
diff --git a/examples/node.rb b/chef/examples/node.rb
index ef1e6a73fa..ef1e6a73fa 100644
--- a/examples/node.rb
+++ b/chef/examples/node.rb
diff --git a/examples/node.yml b/chef/examples/node.yml
index d61a14875d..d61a14875d 100644
--- a/examples/node.yml
+++ b/chef/examples/node.yml
diff --git a/examples/sample_definition.rb b/chef/examples/sample_definition.rb
index f536369290..f536369290 100644
--- a/examples/sample_definition.rb
+++ b/chef/examples/sample_definition.rb
diff --git a/examples/sample_recipe.rb b/chef/examples/sample_recipe.rb
index 6abb31bfcd..6abb31bfcd 100644
--- a/examples/sample_recipe.rb
+++ b/chef/examples/sample_recipe.rb
diff --git a/chef/examples/search_index/segments b/chef/examples/search_index/segments
new file mode 100644
index 0000000000..01d633b27e
--- /dev/null
+++ b/chef/examples/search_index/segments
diff --git a/chef/examples/search_index/segments_0 b/chef/examples/search_index/segments_0
new file mode 100644
index 0000000000..b642403384
--- /dev/null
+++ b/chef/examples/search_index/segments_0
diff --git a/examples/search_syntax.rb b/chef/examples/search_syntax.rb
index 4be57b7802..4be57b7802 100644
--- a/examples/search_syntax.rb
+++ b/chef/examples/search_syntax.rb
diff --git a/examples/user_index.pl b/chef/examples/user_index.pl
index e78a8125f4..e78a8125f4 100755
--- a/examples/user_index.pl
+++ b/chef/examples/user_index.pl
diff --git a/examples/user_index.rb b/chef/examples/user_index.rb
index 485cff81b8..485cff81b8 100755
--- a/examples/user_index.rb
+++ b/chef/examples/user_index.rb
diff --git a/lib/chef.rb b/chef/lib/chef.rb
index ac7f43adef..ac7f43adef 100644
--- a/lib/chef.rb
+++ b/chef/lib/chef.rb
diff --git a/lib/chef/client.rb b/chef/lib/chef/client.rb
index fd7e263ce0..fd7e263ce0 100644
--- a/lib/chef/client.rb
+++ b/chef/lib/chef/client.rb
diff --git a/lib/chef/compile.rb b/chef/lib/chef/compile.rb
index d5f38368ed..d5f38368ed 100644
--- a/lib/chef/compile.rb
+++ b/chef/lib/chef/compile.rb
diff --git a/lib/chef/config.rb b/chef/lib/chef/config.rb
index 573cf9dfb7..573cf9dfb7 100644
--- a/lib/chef/config.rb
+++ b/chef/lib/chef/config.rb
diff --git a/lib/chef/cookbook.rb b/chef/lib/chef/cookbook.rb
index 46fc956d83..46fc956d83 100644
--- a/lib/chef/cookbook.rb
+++ b/chef/lib/chef/cookbook.rb
diff --git a/lib/chef/cookbook_loader.rb b/chef/lib/chef/cookbook_loader.rb
index 6f6c8d8010..6f6c8d8010 100644
--- a/lib/chef/cookbook_loader.rb
+++ b/chef/lib/chef/cookbook_loader.rb
diff --git a/lib/chef/couchdb.rb b/chef/lib/chef/couchdb.rb
index 22a651ca48..22a651ca48 100644
--- a/lib/chef/couchdb.rb
+++ b/chef/lib/chef/couchdb.rb
diff --git a/lib/chef/exceptions.rb b/chef/lib/chef/exceptions.rb
index fa037a7f6c..fa037a7f6c 100644
--- a/lib/chef/exceptions.rb
+++ b/chef/lib/chef/exceptions.rb
diff --git a/lib/chef/file_cache.rb b/chef/lib/chef/file_cache.rb
index ea9e17fbb7..ea9e17fbb7 100644
--- a/lib/chef/file_cache.rb
+++ b/chef/lib/chef/file_cache.rb
diff --git a/lib/chef/file_store.rb b/chef/lib/chef/file_store.rb
index 6fe13e5ad6..6fe13e5ad6 100644
--- a/lib/chef/file_store.rb
+++ b/chef/lib/chef/file_store.rb
diff --git a/lib/chef/log.rb b/chef/lib/chef/log.rb
index ff98cc9dff..ff98cc9dff 100644
--- a/lib/chef/log.rb
+++ b/chef/lib/chef/log.rb
diff --git a/lib/chef/log/formatter.rb b/chef/lib/chef/log/formatter.rb
index 9f758178f5..9f758178f5 100644
--- a/lib/chef/log/formatter.rb
+++ b/chef/lib/chef/log/formatter.rb
diff --git a/lib/chef/mixin/check_helper.rb b/chef/lib/chef/mixin/check_helper.rb
index 959b57cbb7..959b57cbb7 100644
--- a/lib/chef/mixin/check_helper.rb
+++ b/chef/lib/chef/mixin/check_helper.rb
diff --git a/lib/chef/mixin/checksum.rb b/chef/lib/chef/mixin/checksum.rb
index 5a7eed4165..5a7eed4165 100644
--- a/lib/chef/mixin/checksum.rb
+++ b/chef/lib/chef/mixin/checksum.rb
diff --git a/lib/chef/mixin/command.rb b/chef/lib/chef/mixin/command.rb
index 08344148a5..08344148a5 100644
--- a/lib/chef/mixin/command.rb
+++ b/chef/lib/chef/mixin/command.rb
diff --git a/lib/chef/mixin/create_path.rb b/chef/lib/chef/mixin/create_path.rb
index dc9200eaf5..dc9200eaf5 100644
--- a/lib/chef/mixin/create_path.rb
+++ b/chef/lib/chef/mixin/create_path.rb
diff --git a/lib/chef/mixin/from_file.rb b/chef/lib/chef/mixin/from_file.rb
index 05f7fe8e8b..05f7fe8e8b 100644
--- a/lib/chef/mixin/from_file.rb
+++ b/chef/lib/chef/mixin/from_file.rb
diff --git a/lib/chef/mixin/generate_url.rb b/chef/lib/chef/mixin/generate_url.rb
index 3eb8c4f70d..3eb8c4f70d 100644
--- a/lib/chef/mixin/generate_url.rb
+++ b/chef/lib/chef/mixin/generate_url.rb
diff --git a/lib/chef/mixin/params_validate.rb b/chef/lib/chef/mixin/params_validate.rb
index 4d8ddb74c3..4d8ddb74c3 100644
--- a/lib/chef/mixin/params_validate.rb
+++ b/chef/lib/chef/mixin/params_validate.rb
diff --git a/lib/chef/mixin/template.rb b/chef/lib/chef/mixin/template.rb
index f3980922a1..f3980922a1 100644
--- a/lib/chef/mixin/template.rb
+++ b/chef/lib/chef/mixin/template.rb
diff --git a/lib/chef/node.rb b/chef/lib/chef/node.rb
index e1c8ef2d9a..e1c8ef2d9a 100644
--- a/lib/chef/node.rb
+++ b/chef/lib/chef/node.rb
diff --git a/lib/chef/openid_registration.rb b/chef/lib/chef/openid_registration.rb
index 748c865097..748c865097 100644
--- a/lib/chef/openid_registration.rb
+++ b/chef/lib/chef/openid_registration.rb
diff --git a/lib/chef/platform.rb b/chef/lib/chef/platform.rb
index c7a7be1236..c7a7be1236 100644
--- a/lib/chef/platform.rb
+++ b/chef/lib/chef/platform.rb
diff --git a/lib/chef/provider.rb b/chef/lib/chef/provider.rb
index 3251693cb3..3251693cb3 100644
--- a/lib/chef/provider.rb
+++ b/chef/lib/chef/provider.rb
diff --git a/lib/chef/provider/directory.rb b/chef/lib/chef/provider/directory.rb
index d042b6a8eb..d042b6a8eb 100644
--- a/lib/chef/provider/directory.rb
+++ b/chef/lib/chef/provider/directory.rb
diff --git a/lib/chef/provider/execute.rb b/chef/lib/chef/provider/execute.rb
index 67a706e4f1..67a706e4f1 100644
--- a/lib/chef/provider/execute.rb
+++ b/chef/lib/chef/provider/execute.rb
diff --git a/lib/chef/provider/file.rb b/chef/lib/chef/provider/file.rb
index d25e5decca..d25e5decca 100644
--- a/lib/chef/provider/file.rb
+++ b/chef/lib/chef/provider/file.rb
diff --git a/lib/chef/provider/link.rb b/chef/lib/chef/provider/link.rb
index 843a4ad009..843a4ad009 100644
--- a/lib/chef/provider/link.rb
+++ b/chef/lib/chef/provider/link.rb
diff --git a/lib/chef/provider/package.rb b/chef/lib/chef/provider/package.rb
index a68c2e88f2..a68c2e88f2 100644
--- a/lib/chef/provider/package.rb
+++ b/chef/lib/chef/provider/package.rb
diff --git a/lib/chef/provider/package/apt.rb b/chef/lib/chef/provider/package/apt.rb
index a2e9bd68a2..a2e9bd68a2 100644
--- a/lib/chef/provider/package/apt.rb
+++ b/chef/lib/chef/provider/package/apt.rb
diff --git a/lib/chef/provider/package/portage.rb b/chef/lib/chef/provider/package/portage.rb
index 8981a386bc..8981a386bc 100644
--- a/lib/chef/provider/package/portage.rb
+++ b/chef/lib/chef/provider/package/portage.rb
diff --git a/lib/chef/provider/package/rubygems.rb b/chef/lib/chef/provider/package/rubygems.rb
index 69459ffef4..69459ffef4 100644
--- a/lib/chef/provider/package/rubygems.rb
+++ b/chef/lib/chef/provider/package/rubygems.rb
diff --git a/lib/chef/provider/remote_directory.rb b/chef/lib/chef/provider/remote_directory.rb
index 47d62b6308..47d62b6308 100644
--- a/lib/chef/provider/remote_directory.rb
+++ b/chef/lib/chef/provider/remote_directory.rb
diff --git a/lib/chef/provider/remote_file.rb b/chef/lib/chef/provider/remote_file.rb
index cc0812346e..cc0812346e 100644
--- a/lib/chef/provider/remote_file.rb
+++ b/chef/lib/chef/provider/remote_file.rb
diff --git a/lib/chef/provider/script.rb b/chef/lib/chef/provider/script.rb
index 4669361142..4669361142 100644
--- a/lib/chef/provider/script.rb
+++ b/chef/lib/chef/provider/script.rb
diff --git a/lib/chef/provider/service.rb b/chef/lib/chef/provider/service.rb
index 5ac53478e3..5ac53478e3 100644
--- a/lib/chef/provider/service.rb
+++ b/chef/lib/chef/provider/service.rb
diff --git a/lib/chef/provider/service/debian.rb b/chef/lib/chef/provider/service/debian.rb
index 21f166ba6a..21f166ba6a 100644
--- a/lib/chef/provider/service/debian.rb
+++ b/chef/lib/chef/provider/service/debian.rb
diff --git a/lib/chef/provider/service/init.rb b/chef/lib/chef/provider/service/init.rb
index 0ccfc232d8..0ccfc232d8 100644
--- a/lib/chef/provider/service/init.rb
+++ b/chef/lib/chef/provider/service/init.rb
diff --git a/lib/chef/provider/sysctl.rb b/chef/lib/chef/provider/sysctl.rb
index 09b5942f5e..09b5942f5e 100644
--- a/lib/chef/provider/sysctl.rb
+++ b/chef/lib/chef/provider/sysctl.rb
diff --git a/lib/chef/provider/template.rb b/chef/lib/chef/provider/template.rb
index 550a1388bf..550a1388bf 100644
--- a/lib/chef/provider/template.rb
+++ b/chef/lib/chef/provider/template.rb
diff --git a/lib/chef/provider/user.rb b/chef/lib/chef/provider/user.rb
index a3de68d93c..a3de68d93c 100644
--- a/lib/chef/provider/user.rb
+++ b/chef/lib/chef/provider/user.rb
diff --git a/lib/chef/provider/user/useradd.rb b/chef/lib/chef/provider/user/useradd.rb
index 96736a27a8..96736a27a8 100644
--- a/lib/chef/provider/user/useradd.rb
+++ b/chef/lib/chef/provider/user/useradd.rb
diff --git a/lib/chef/queue.rb b/chef/lib/chef/queue.rb
index 86eb7df257..86eb7df257 100644
--- a/lib/chef/queue.rb
+++ b/chef/lib/chef/queue.rb
diff --git a/lib/chef/recipe.rb b/chef/lib/chef/recipe.rb
index e2e20640f7..e2e20640f7 100644
--- a/lib/chef/recipe.rb
+++ b/chef/lib/chef/recipe.rb
diff --git a/lib/chef/resource.rb b/chef/lib/chef/resource.rb
index 75349a7927..75349a7927 100644
--- a/lib/chef/resource.rb
+++ b/chef/lib/chef/resource.rb
diff --git a/lib/chef/resource/apt_package.rb b/chef/lib/chef/resource/apt_package.rb
index 58e8b14edc..58e8b14edc 100644
--- a/lib/chef/resource/apt_package.rb
+++ b/chef/lib/chef/resource/apt_package.rb
diff --git a/lib/chef/resource/bash.rb b/chef/lib/chef/resource/bash.rb
index 7af5f9756a..7af5f9756a 100644
--- a/lib/chef/resource/bash.rb
+++ b/chef/lib/chef/resource/bash.rb
diff --git a/lib/chef/resource/csh.rb b/chef/lib/chef/resource/csh.rb
index 29de9777b9..29de9777b9 100644
--- a/lib/chef/resource/csh.rb
+++ b/chef/lib/chef/resource/csh.rb
diff --git a/lib/chef/resource/directory.rb b/chef/lib/chef/resource/directory.rb
index 7e8944f5fc..7e8944f5fc 100644
--- a/lib/chef/resource/directory.rb
+++ b/chef/lib/chef/resource/directory.rb
diff --git a/lib/chef/resource/execute.rb b/chef/lib/chef/resource/execute.rb
index 232cfe4d64..232cfe4d64 100644
--- a/lib/chef/resource/execute.rb
+++ b/chef/lib/chef/resource/execute.rb
diff --git a/lib/chef/resource/file.rb b/chef/lib/chef/resource/file.rb
index 099bd76591..099bd76591 100644
--- a/lib/chef/resource/file.rb
+++ b/chef/lib/chef/resource/file.rb
diff --git a/lib/chef/resource/gem_package.rb b/chef/lib/chef/resource/gem_package.rb
index 1ec9463337..1ec9463337 100644
--- a/lib/chef/resource/gem_package.rb
+++ b/chef/lib/chef/resource/gem_package.rb
diff --git a/lib/chef/resource/link.rb b/chef/lib/chef/resource/link.rb
index 46b5793b0f..46b5793b0f 100644
--- a/lib/chef/resource/link.rb
+++ b/chef/lib/chef/resource/link.rb
diff --git a/lib/chef/resource/package.rb b/chef/lib/chef/resource/package.rb
index f5f1c8418e..f5f1c8418e 100644
--- a/lib/chef/resource/package.rb
+++ b/chef/lib/chef/resource/package.rb
diff --git a/lib/chef/resource/perl.rb b/chef/lib/chef/resource/perl.rb
index a9b891ed5c..a9b891ed5c 100644
--- a/lib/chef/resource/perl.rb
+++ b/chef/lib/chef/resource/perl.rb
diff --git a/lib/chef/resource/portage_package.rb b/chef/lib/chef/resource/portage_package.rb
index 0e300da7a3..0e300da7a3 100644
--- a/lib/chef/resource/portage_package.rb
+++ b/chef/lib/chef/resource/portage_package.rb
diff --git a/lib/chef/resource/python.rb b/chef/lib/chef/resource/python.rb
index ac2b27c00f..ac2b27c00f 100644
--- a/lib/chef/resource/python.rb
+++ b/chef/lib/chef/resource/python.rb
diff --git a/lib/chef/resource/remote_directory.rb b/chef/lib/chef/resource/remote_directory.rb
index a23b39d42c..a23b39d42c 100644
--- a/lib/chef/resource/remote_directory.rb
+++ b/chef/lib/chef/resource/remote_directory.rb
diff --git a/lib/chef/resource/remote_file.rb b/chef/lib/chef/resource/remote_file.rb
index dace234398..dace234398 100644
--- a/lib/chef/resource/remote_file.rb
+++ b/chef/lib/chef/resource/remote_file.rb
diff --git a/lib/chef/resource/ruby.rb b/chef/lib/chef/resource/ruby.rb
index 591f1a658b..591f1a658b 100644
--- a/lib/chef/resource/ruby.rb
+++ b/chef/lib/chef/resource/ruby.rb
diff --git a/lib/chef/resource/script.rb b/chef/lib/chef/resource/script.rb
index d59882ab9c..d59882ab9c 100644
--- a/lib/chef/resource/script.rb
+++ b/chef/lib/chef/resource/script.rb
diff --git a/lib/chef/resource/service.rb b/chef/lib/chef/resource/service.rb
index 1c9a784745..1c9a784745 100644
--- a/lib/chef/resource/service.rb
+++ b/chef/lib/chef/resource/service.rb
diff --git a/lib/chef/resource/sysctl.rb b/chef/lib/chef/resource/sysctl.rb
index 203ad72425..203ad72425 100644
--- a/lib/chef/resource/sysctl.rb
+++ b/chef/lib/chef/resource/sysctl.rb
diff --git a/lib/chef/resource/template.rb b/chef/lib/chef/resource/template.rb
index 5f2512a274..5f2512a274 100644
--- a/lib/chef/resource/template.rb
+++ b/chef/lib/chef/resource/template.rb
diff --git a/lib/chef/resource/user.rb b/chef/lib/chef/resource/user.rb
index 1702753408..1702753408 100644
--- a/lib/chef/resource/user.rb
+++ b/chef/lib/chef/resource/user.rb
diff --git a/lib/chef/resource_collection.rb b/chef/lib/chef/resource_collection.rb
index 5278b15c72..5278b15c72 100644
--- a/lib/chef/resource_collection.rb
+++ b/chef/lib/chef/resource_collection.rb
diff --git a/lib/chef/resource_definition.rb b/chef/lib/chef/resource_definition.rb
index 9a0a9cb09a..9a0a9cb09a 100644
--- a/lib/chef/resource_definition.rb
+++ b/chef/lib/chef/resource_definition.rb
diff --git a/lib/chef/rest.rb b/chef/lib/chef/rest.rb
index b78df6c35f..b78df6c35f 100644
--- a/lib/chef/rest.rb
+++ b/chef/lib/chef/rest.rb
diff --git a/lib/chef/runner.rb b/chef/lib/chef/runner.rb
index b943ef5ec4..b943ef5ec4 100644
--- a/lib/chef/runner.rb
+++ b/chef/lib/chef/runner.rb
diff --git a/lib/chef/search.rb b/chef/lib/chef/search.rb
index 229f738399..229f738399 100644
--- a/lib/chef/search.rb
+++ b/chef/lib/chef/search.rb
diff --git a/lib/chef/search_index.rb b/chef/lib/chef/search_index.rb
index 932a451999..932a451999 100644
--- a/lib/chef/search_index.rb
+++ b/chef/lib/chef/search_index.rb
diff --git a/log/chef-server.log b/chef/log/chef-server.log
index eabfde15a0..eabfde15a0 100644
--- a/log/chef-server.log
+++ b/chef/log/chef-server.log
diff --git a/chef/log/merb.main.pid b/chef/log/merb.main.pid
new file mode 100644
index 0000000000..0eb419a8f1
--- /dev/null
+++ b/chef/log/merb.main.pid
@@ -0,0 +1 @@
+12210
\ No newline at end of file
diff --git a/log/merb_test.log b/chef/log/merb_test.log
index dae0e5d9dd..dae0e5d9dd 100644
--- a/log/merb_test.log
+++ b/chef/log/merb_test.log
diff --git a/chef/log/stompserver.pid b/chef/log/stompserver.pid
new file mode 100644
index 0000000000..20e502d586
--- /dev/null
+++ b/chef/log/stompserver.pid
@@ -0,0 +1 @@
+12157
\ No newline at end of file
diff --git a/chef/pkg/chef-0.0.1.gem b/chef/pkg/chef-0.0.1.gem
new file mode 100644
index 0000000000..c090729e12
--- /dev/null
+++ b/chef/pkg/chef-0.0.1.gem
diff --git a/spec/chef_server/controllers/log/merb_test.log b/chef/spec/chef_server/controllers/log/merb_test.log
index 86fbe4b9cb..86fbe4b9cb 100644
--- a/spec/chef_server/controllers/log/merb_test.log
+++ b/chef/spec/chef_server/controllers/log/merb_test.log
diff --git a/spec/chef_server/controllers/nodes_spec.rb b/chef/spec/chef_server/controllers/nodes_spec.rb
index 65c2df301a..65c2df301a 100644
--- a/spec/chef_server/controllers/nodes_spec.rb
+++ b/chef/spec/chef_server/controllers/nodes_spec.rb
diff --git a/spec/chef_server/controllers/openid_consumer_spec.rb b/chef/spec/chef_server/controllers/openid_consumer_spec.rb
index 0156fd8d49..0156fd8d49 100644
--- a/spec/chef_server/controllers/openid_consumer_spec.rb
+++ b/chef/spec/chef_server/controllers/openid_consumer_spec.rb
diff --git a/spec/chef_server/controllers/openid_register_spec.rb b/chef/spec/chef_server/controllers/openid_register_spec.rb
index c883715fc6..c883715fc6 100644
--- a/spec/chef_server/controllers/openid_register_spec.rb
+++ b/chef/spec/chef_server/controllers/openid_register_spec.rb
diff --git a/spec/chef_server/log/merb_test.log b/chef/spec/chef_server/log/merb_test.log
index b2aa15df9a..b2aa15df9a 100644
--- a/spec/chef_server/log/merb_test.log
+++ b/chef/spec/chef_server/log/merb_test.log
diff --git a/spec/chef_server/spec.opts b/chef/spec/chef_server/spec.opts
index 3a2ff550a2..3a2ff550a2 100644
--- a/spec/chef_server/spec.opts
+++ b/chef/spec/chef_server/spec.opts
diff --git a/spec/chef_server/spec_helper.rb b/chef/spec/chef_server/spec_helper.rb
index 90c1e0af7a..90c1e0af7a 100644
--- a/spec/chef_server/spec_helper.rb
+++ b/chef/spec/chef_server/spec_helper.rb
diff --git a/spec/data/bad-config.rb b/chef/spec/data/bad-config.rb
index 5477a69366..5477a69366 100644
--- a/spec/data/bad-config.rb
+++ b/chef/spec/data/bad-config.rb
diff --git a/spec/data/compile/cookbooks/test/attributes/george.rb b/chef/spec/data/compile/cookbooks/test/attributes/george.rb
index 5df9567761..5df9567761 100644
--- a/spec/data/compile/cookbooks/test/attributes/george.rb
+++ b/chef/spec/data/compile/cookbooks/test/attributes/george.rb
diff --git a/spec/data/compile/cookbooks/test/definitions/new_cat.rb b/chef/spec/data/compile/cookbooks/test/definitions/new_cat.rb
index a49b53348c..a49b53348c 100644
--- a/spec/data/compile/cookbooks/test/definitions/new_cat.rb
+++ b/chef/spec/data/compile/cookbooks/test/definitions/new_cat.rb
diff --git a/spec/data/compile/cookbooks/test/recipes/default.rb b/chef/spec/data/compile/cookbooks/test/recipes/default.rb
index d769dc826d..d769dc826d 100644
--- a/spec/data/compile/cookbooks/test/recipes/default.rb
+++ b/chef/spec/data/compile/cookbooks/test/recipes/default.rb
diff --git a/spec/data/compile/cookbooks/test/recipes/one.rb b/chef/spec/data/compile/cookbooks/test/recipes/one.rb
index 7795cc1d4a..7795cc1d4a 100644
--- a/spec/data/compile/cookbooks/test/recipes/one.rb
+++ b/chef/spec/data/compile/cookbooks/test/recipes/one.rb
diff --git a/spec/data/compile/cookbooks/test/recipes/two.rb b/chef/spec/data/compile/cookbooks/test/recipes/two.rb
index 01def1b2ac..01def1b2ac 100644
--- a/spec/data/compile/cookbooks/test/recipes/two.rb
+++ b/chef/spec/data/compile/cookbooks/test/recipes/two.rb
diff --git a/spec/data/compile/nodes/compile.rb b/chef/spec/data/compile/nodes/compile.rb
index 84d52bb1cf..84d52bb1cf 100644
--- a/spec/data/compile/nodes/compile.rb
+++ b/chef/spec/data/compile/nodes/compile.rb
diff --git a/spec/data/config.rb b/chef/spec/data/config.rb
index 0b3340ce57..0b3340ce57 100644
--- a/spec/data/config.rb
+++ b/chef/spec/data/config.rb
diff --git a/spec/data/cookbooks/openldap/attributes/default.rb b/chef/spec/data/cookbooks/openldap/attributes/default.rb
index 204ae9ed77..204ae9ed77 100644
--- a/spec/data/cookbooks/openldap/attributes/default.rb
+++ b/chef/spec/data/cookbooks/openldap/attributes/default.rb
diff --git a/spec/data/cookbooks/openldap/attributes/smokey.rb b/chef/spec/data/cookbooks/openldap/attributes/smokey.rb
index 63f5b56c7f..63f5b56c7f 100644
--- a/spec/data/cookbooks/openldap/attributes/smokey.rb
+++ b/chef/spec/data/cookbooks/openldap/attributes/smokey.rb
diff --git a/spec/data/cookbooks/openldap/definitions/client.rb b/chef/spec/data/cookbooks/openldap/definitions/client.rb
index ac81831d11..ac81831d11 100644
--- a/spec/data/cookbooks/openldap/definitions/client.rb
+++ b/chef/spec/data/cookbooks/openldap/definitions/client.rb
diff --git a/spec/data/cookbooks/openldap/definitions/server.rb b/chef/spec/data/cookbooks/openldap/definitions/server.rb
index 2df437aa84..2df437aa84 100644
--- a/spec/data/cookbooks/openldap/definitions/server.rb
+++ b/chef/spec/data/cookbooks/openldap/definitions/server.rb
diff --git a/spec/data/cookbooks/openldap/ignore b/chef/spec/data/cookbooks/openldap/ignore
index e96f4e7df4..e96f4e7df4 100644
--- a/spec/data/cookbooks/openldap/ignore
+++ b/chef/spec/data/cookbooks/openldap/ignore
diff --git a/spec/data/cookbooks/openldap/recipes/default.rb b/chef/spec/data/cookbooks/openldap/recipes/default.rb
index 0ac8a9bb4b..0ac8a9bb4b 100644
--- a/spec/data/cookbooks/openldap/recipes/default.rb
+++ b/chef/spec/data/cookbooks/openldap/recipes/default.rb
diff --git a/spec/data/cookbooks/openldap/recipes/gigantor.rb b/chef/spec/data/cookbooks/openldap/recipes/gigantor.rb
index b450eca7cd..b450eca7cd 100644
--- a/spec/data/cookbooks/openldap/recipes/gigantor.rb
+++ b/chef/spec/data/cookbooks/openldap/recipes/gigantor.rb
diff --git a/spec/data/cookbooks/openldap/recipes/one.rb b/chef/spec/data/cookbooks/openldap/recipes/one.rb
index e1c3cff92e..e1c3cff92e 100644
--- a/spec/data/cookbooks/openldap/recipes/one.rb
+++ b/chef/spec/data/cookbooks/openldap/recipes/one.rb
diff --git a/spec/data/cookbooks/openldap/templates/default/test.erb b/chef/spec/data/cookbooks/openldap/templates/default/test.erb
index f39fa7da89..f39fa7da89 100644
--- a/spec/data/cookbooks/openldap/templates/default/test.erb
+++ b/chef/spec/data/cookbooks/openldap/templates/default/test.erb
diff --git a/spec/data/definitions/test.rb b/chef/spec/data/definitions/test.rb
index b0d0effc27..b0d0effc27 100644
--- a/spec/data/definitions/test.rb
+++ b/chef/spec/data/definitions/test.rb
diff --git a/spec/data/kitchen/openldap/attributes/default.rb b/chef/spec/data/kitchen/openldap/attributes/default.rb
index d208959475..d208959475 100644
--- a/spec/data/kitchen/openldap/attributes/default.rb
+++ b/chef/spec/data/kitchen/openldap/attributes/default.rb
diff --git a/spec/data/kitchen/openldap/attributes/robinson.rb b/chef/spec/data/kitchen/openldap/attributes/robinson.rb
index 9d6b44d464..9d6b44d464 100644
--- a/spec/data/kitchen/openldap/attributes/robinson.rb
+++ b/chef/spec/data/kitchen/openldap/attributes/robinson.rb
diff --git a/spec/data/kitchen/openldap/definitions/client.rb b/chef/spec/data/kitchen/openldap/definitions/client.rb
index d4c2263b54..d4c2263b54 100644
--- a/spec/data/kitchen/openldap/definitions/client.rb
+++ b/chef/spec/data/kitchen/openldap/definitions/client.rb
diff --git a/spec/data/kitchen/openldap/definitions/drewbarrymore.rb b/chef/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
index 510f0c35da..510f0c35da 100644
--- a/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
+++ b/chef/spec/data/kitchen/openldap/definitions/drewbarrymore.rb
diff --git a/spec/data/kitchen/openldap/recipes/gigantor.rb b/chef/spec/data/kitchen/openldap/recipes/gigantor.rb
index 70a41960eb..70a41960eb 100644
--- a/spec/data/kitchen/openldap/recipes/gigantor.rb
+++ b/chef/spec/data/kitchen/openldap/recipes/gigantor.rb
diff --git a/spec/data/kitchen/openldap/recipes/ignoreme.rb b/chef/spec/data/kitchen/openldap/recipes/ignoreme.rb
index 15095986c6..15095986c6 100644
--- a/spec/data/kitchen/openldap/recipes/ignoreme.rb
+++ b/chef/spec/data/kitchen/openldap/recipes/ignoreme.rb
diff --git a/spec/data/kitchen/openldap/recipes/woot.rb b/chef/spec/data/kitchen/openldap/recipes/woot.rb
index 44893dae36..44893dae36 100644
--- a/spec/data/kitchen/openldap/recipes/woot.rb
+++ b/chef/spec/data/kitchen/openldap/recipes/woot.rb
diff --git a/spec/data/nodes/default.rb b/chef/spec/data/nodes/default.rb
index e1c3cff92e..e1c3cff92e 100644
--- a/spec/data/nodes/default.rb
+++ b/chef/spec/data/nodes/default.rb
diff --git a/spec/data/nodes/test.example.com.rb b/chef/spec/data/nodes/test.example.com.rb
index 9c374395bf..9c374395bf 100644
--- a/spec/data/nodes/test.example.com.rb
+++ b/chef/spec/data/nodes/test.example.com.rb
diff --git a/spec/data/nodes/test.rb b/chef/spec/data/nodes/test.rb
index d968816d60..d968816d60 100644
--- a/spec/data/nodes/test.rb
+++ b/chef/spec/data/nodes/test.rb
diff --git a/spec/data/recipes/test.rb b/chef/spec/data/recipes/test.rb
index 1c94b917f0..1c94b917f0 100644
--- a/spec/data/recipes/test.rb
+++ b/chef/spec/data/recipes/test.rb
diff --git a/spec/data/seattle.txt b/chef/spec/data/seattle.txt
index 19f6290939..19f6290939 100644
--- a/spec/data/seattle.txt
+++ b/chef/spec/data/seattle.txt
diff --git a/spec/lib/chef/provider/easy.rb b/chef/spec/lib/chef/provider/easy.rb
index b637efa768..b637efa768 100644
--- a/spec/lib/chef/provider/easy.rb
+++ b/chef/spec/lib/chef/provider/easy.rb
diff --git a/spec/lib/chef/provider/snakeoil.rb b/chef/spec/lib/chef/provider/snakeoil.rb
index 0486402686..0486402686 100644
--- a/spec/lib/chef/provider/snakeoil.rb
+++ b/chef/spec/lib/chef/provider/snakeoil.rb
diff --git a/spec/lib/chef/resource/cat.rb b/chef/spec/lib/chef/resource/cat.rb
index e651c44512..e651c44512 100644
--- a/spec/lib/chef/resource/cat.rb
+++ b/chef/spec/lib/chef/resource/cat.rb
diff --git a/spec/lib/chef/resource/zen_master.rb b/chef/spec/lib/chef/resource/zen_master.rb
index 8b4225fbd4..8b4225fbd4 100644
--- a/spec/lib/chef/resource/zen_master.rb
+++ b/chef/spec/lib/chef/resource/zen_master.rb
diff --git a/spec/rcov.opts b/chef/spec/rcov.opts
index 484626ea9c..484626ea9c 100644
--- a/spec/rcov.opts
+++ b/chef/spec/rcov.opts
diff --git a/spec/spec.opts b/chef/spec/spec.opts
index c9c9b4ddf0..c9c9b4ddf0 100644
--- a/spec/spec.opts
+++ b/chef/spec/spec.opts
diff --git a/spec/spec_helper.rb b/chef/spec/spec_helper.rb
index 9120b2876c..9120b2876c 100644
--- a/spec/spec_helper.rb
+++ b/chef/spec/spec_helper.rb
diff --git a/spec/unit/chef_spec.rb b/chef/spec/unit/chef_spec.rb
index 7d2af6f88d..7d2af6f88d 100644
--- a/spec/unit/chef_spec.rb
+++ b/chef/spec/unit/chef_spec.rb
diff --git a/spec/unit/client_spec.rb b/chef/spec/unit/client_spec.rb
index a2732f28c3..a2732f28c3 100644
--- a/spec/unit/client_spec.rb
+++ b/chef/spec/unit/client_spec.rb
diff --git a/spec/unit/compile_spec.rb b/chef/spec/unit/compile_spec.rb
index c7f76a4a58..c7f76a4a58 100644
--- a/spec/unit/compile_spec.rb
+++ b/chef/spec/unit/compile_spec.rb
diff --git a/spec/unit/config_spec.rb b/chef/spec/unit/config_spec.rb
index 51e33401d8..51e33401d8 100644
--- a/spec/unit/config_spec.rb
+++ b/chef/spec/unit/config_spec.rb
diff --git a/spec/unit/cookbook_loader_spec.rb b/chef/spec/unit/cookbook_loader_spec.rb
index 501329777b..501329777b 100644
--- a/spec/unit/cookbook_loader_spec.rb
+++ b/chef/spec/unit/cookbook_loader_spec.rb
diff --git a/spec/unit/cookbook_spec.rb b/chef/spec/unit/cookbook_spec.rb
index 85b4040771..85b4040771 100644
--- a/spec/unit/cookbook_spec.rb
+++ b/chef/spec/unit/cookbook_spec.rb
diff --git a/spec/unit/couchdb_spec.rb b/chef/spec/unit/couchdb_spec.rb
index 621439df51..621439df51 100644
--- a/spec/unit/couchdb_spec.rb
+++ b/chef/spec/unit/couchdb_spec.rb
diff --git a/spec/unit/file_cache_spec.rb b/chef/spec/unit/file_cache_spec.rb
index c84eea376e..c84eea376e 100644
--- a/spec/unit/file_cache_spec.rb
+++ b/chef/spec/unit/file_cache_spec.rb
diff --git a/spec/unit/file_store_spec.rb b/chef/spec/unit/file_store_spec.rb
index 8addeb9e31..8addeb9e31 100644
--- a/spec/unit/file_store_spec.rb
+++ b/chef/spec/unit/file_store_spec.rb
diff --git a/spec/unit/log/formatter_spec.rb b/chef/spec/unit/log/formatter_spec.rb
index e0d8bfd773..e0d8bfd773 100644
--- a/spec/unit/log/formatter_spec.rb
+++ b/chef/spec/unit/log/formatter_spec.rb
diff --git a/spec/unit/log_spec.rb b/chef/spec/unit/log_spec.rb
index 14892b1af4..14892b1af4 100644
--- a/spec/unit/log_spec.rb
+++ b/chef/spec/unit/log_spec.rb
diff --git a/spec/unit/mixin/params_validate_spec.rb b/chef/spec/unit/mixin/params_validate_spec.rb
index 937589b059..937589b059 100644
--- a/spec/unit/mixin/params_validate_spec.rb
+++ b/chef/spec/unit/mixin/params_validate_spec.rb
diff --git a/spec/unit/mixin/template_spec.rb b/chef/spec/unit/mixin/template_spec.rb
index 0ff929e8f6..0ff929e8f6 100644
--- a/spec/unit/mixin/template_spec.rb
+++ b/chef/spec/unit/mixin/template_spec.rb
diff --git a/spec/unit/node_spec.rb b/chef/spec/unit/node_spec.rb
index 605bb8b628..605bb8b628 100644
--- a/spec/unit/node_spec.rb
+++ b/chef/spec/unit/node_spec.rb
diff --git a/spec/unit/openid_registration_spec.rb b/chef/spec/unit/openid_registration_spec.rb
index d849369796..d849369796 100644
--- a/spec/unit/openid_registration_spec.rb
+++ b/chef/spec/unit/openid_registration_spec.rb
diff --git a/spec/unit/platform_spec.rb b/chef/spec/unit/platform_spec.rb
index 4eeeebed89..4eeeebed89 100644
--- a/spec/unit/platform_spec.rb
+++ b/chef/spec/unit/platform_spec.rb
diff --git a/spec/unit/provider/directory_spec.rb b/chef/spec/unit/provider/directory_spec.rb
index 4978b27288..4978b27288 100644
--- a/spec/unit/provider/directory_spec.rb
+++ b/chef/spec/unit/provider/directory_spec.rb
diff --git a/spec/unit/provider/file_spec.rb b/chef/spec/unit/provider/file_spec.rb
index 9ea628a357..9ea628a357 100644
--- a/spec/unit/provider/file_spec.rb
+++ b/chef/spec/unit/provider/file_spec.rb
diff --git a/spec/unit/provider/link_spec.rb b/chef/spec/unit/provider/link_spec.rb
index 462ab9409b..462ab9409b 100644
--- a/spec/unit/provider/link_spec.rb
+++ b/chef/spec/unit/provider/link_spec.rb
diff --git a/spec/unit/provider/remote_file_spec.rb b/chef/spec/unit/provider/remote_file_spec.rb
index 51c48d0f9a..51c48d0f9a 100644
--- a/spec/unit/provider/remote_file_spec.rb
+++ b/chef/spec/unit/provider/remote_file_spec.rb
diff --git a/spec/unit/provider/template_spec.rb b/chef/spec/unit/provider/template_spec.rb
index abc98e2ea3..abc98e2ea3 100644
--- a/spec/unit/provider/template_spec.rb
+++ b/chef/spec/unit/provider/template_spec.rb
diff --git a/spec/unit/provider_spec.rb b/chef/spec/unit/provider_spec.rb
index 0512012598..0512012598 100644
--- a/spec/unit/provider_spec.rb
+++ b/chef/spec/unit/provider_spec.rb
diff --git a/spec/unit/queue_spec.rb b/chef/spec/unit/queue_spec.rb
index e902f44631..e902f44631 100644
--- a/spec/unit/queue_spec.rb
+++ b/chef/spec/unit/queue_spec.rb
diff --git a/spec/unit/recipe_spec.rb b/chef/spec/unit/recipe_spec.rb
index 77d5354993..77d5354993 100644
--- a/spec/unit/recipe_spec.rb
+++ b/chef/spec/unit/recipe_spec.rb
diff --git a/spec/unit/resource/bash_spec.rb b/chef/spec/unit/resource/bash_spec.rb
index f86e63d32e..f86e63d32e 100644
--- a/spec/unit/resource/bash_spec.rb
+++ b/chef/spec/unit/resource/bash_spec.rb
diff --git a/spec/unit/resource/csh_spec.rb b/chef/spec/unit/resource/csh_spec.rb
index 67ba4499fa..67ba4499fa 100644
--- a/spec/unit/resource/csh_spec.rb
+++ b/chef/spec/unit/resource/csh_spec.rb
diff --git a/spec/unit/resource/directory_spec.rb b/chef/spec/unit/resource/directory_spec.rb
index 98cc28fbc6..98cc28fbc6 100644
--- a/spec/unit/resource/directory_spec.rb
+++ b/chef/spec/unit/resource/directory_spec.rb
diff --git a/spec/unit/resource/execute_spec.rb b/chef/spec/unit/resource/execute_spec.rb
index 94cb3d3d92..94cb3d3d92 100644
--- a/spec/unit/resource/execute_spec.rb
+++ b/chef/spec/unit/resource/execute_spec.rb
diff --git a/spec/unit/resource/file_spec.rb b/chef/spec/unit/resource/file_spec.rb
index b67598d738..b67598d738 100644
--- a/spec/unit/resource/file_spec.rb
+++ b/chef/spec/unit/resource/file_spec.rb
diff --git a/spec/unit/resource/link_spec.rb b/chef/spec/unit/resource/link_spec.rb
index fa0810cced..fa0810cced 100644
--- a/spec/unit/resource/link_spec.rb
+++ b/chef/spec/unit/resource/link_spec.rb
diff --git a/spec/unit/resource/package_spec.rb b/chef/spec/unit/resource/package_spec.rb
index 8756e4f603..8756e4f603 100644
--- a/spec/unit/resource/package_spec.rb
+++ b/chef/spec/unit/resource/package_spec.rb
diff --git a/spec/unit/resource/perl_spec.rb b/chef/spec/unit/resource/perl_spec.rb
index 528bcef08c..528bcef08c 100644
--- a/spec/unit/resource/perl_spec.rb
+++ b/chef/spec/unit/resource/perl_spec.rb
diff --git a/spec/unit/resource/python_spec.rb b/chef/spec/unit/resource/python_spec.rb
index 11c5b84d04..11c5b84d04 100644
--- a/spec/unit/resource/python_spec.rb
+++ b/chef/spec/unit/resource/python_spec.rb
diff --git a/spec/unit/resource/remote_directory_spec.rb b/chef/spec/unit/resource/remote_directory_spec.rb
index 2d9ce122af..2d9ce122af 100644
--- a/spec/unit/resource/remote_directory_spec.rb
+++ b/chef/spec/unit/resource/remote_directory_spec.rb
diff --git a/spec/unit/resource/remote_file_spec.rb b/chef/spec/unit/resource/remote_file_spec.rb
index 4c052e0260..4c052e0260 100644
--- a/spec/unit/resource/remote_file_spec.rb
+++ b/chef/spec/unit/resource/remote_file_spec.rb
diff --git a/spec/unit/resource/ruby_spec.rb b/chef/spec/unit/resource/ruby_spec.rb
index 5351462154..5351462154 100644
--- a/spec/unit/resource/ruby_spec.rb
+++ b/chef/spec/unit/resource/ruby_spec.rb
diff --git a/spec/unit/resource/script_spec.rb b/chef/spec/unit/resource/script_spec.rb
index f003028fd6..f003028fd6 100644
--- a/spec/unit/resource/script_spec.rb
+++ b/chef/spec/unit/resource/script_spec.rb
diff --git a/spec/unit/resource/service_spec.rb b/chef/spec/unit/resource/service_spec.rb
index f5941f89ae..f5941f89ae 100644
--- a/spec/unit/resource/service_spec.rb
+++ b/chef/spec/unit/resource/service_spec.rb
diff --git a/spec/unit/resource/template_spec.rb b/chef/spec/unit/resource/template_spec.rb
index 106fe77bda..106fe77bda 100644
--- a/spec/unit/resource/template_spec.rb
+++ b/chef/spec/unit/resource/template_spec.rb
diff --git a/spec/unit/resource_collection_spec.rb b/chef/spec/unit/resource_collection_spec.rb
index 37eeac18db..37eeac18db 100644
--- a/spec/unit/resource_collection_spec.rb
+++ b/chef/spec/unit/resource_collection_spec.rb
diff --git a/spec/unit/resource_definition_spec.rb b/chef/spec/unit/resource_definition_spec.rb
index 8ba7556b70..8ba7556b70 100644
--- a/spec/unit/resource_definition_spec.rb
+++ b/chef/spec/unit/resource_definition_spec.rb
diff --git a/spec/unit/resource_spec.rb b/chef/spec/unit/resource_spec.rb
index 3ca48060fa..3ca48060fa 100644
--- a/spec/unit/resource_spec.rb
+++ b/chef/spec/unit/resource_spec.rb
diff --git a/spec/unit/rest_spec.rb b/chef/spec/unit/rest_spec.rb
index 56c2954a1a..56c2954a1a 100644
--- a/spec/unit/rest_spec.rb
+++ b/chef/spec/unit/rest_spec.rb
diff --git a/spec/unit/runner_spec.rb b/chef/spec/unit/runner_spec.rb
index f73d5efb22..f73d5efb22 100644
--- a/spec/unit/runner_spec.rb
+++ b/chef/spec/unit/runner_spec.rb
diff --git a/spec/unit/search_index_spec.rb b/chef/spec/unit/search_index_spec.rb
index ff234c6a41..ff234c6a41 100644
--- a/spec/unit/search_index_spec.rb
+++ b/chef/spec/unit/search_index_spec.rb
diff --git a/spec/unit/search_spec.rb b/chef/spec/unit/search_spec.rb
index 94e3560a23..94e3560a23 100644
--- a/spec/unit/search_spec.rb
+++ b/chef/spec/unit/search_spec.rb
diff --git a/stories/chef-client b/chef/stories/chef-client
index 93b8656268..93b8656268 100644
--- a/stories/chef-client
+++ b/chef/stories/chef-client
diff --git a/stories/chef-client.rb b/chef/stories/chef-client.rb
index 3e07b8a847..3e07b8a847 100644
--- a/stories/chef-client.rb
+++ b/chef/stories/chef-client.rb
diff --git a/stories/story_helper.rb b/chef/stories/story_helper.rb
index cb0d1eb375..cb0d1eb375 100644
--- a/stories/story_helper.rb
+++ b/chef/stories/story_helper.rb
diff --git a/tasks/rspec.rb b/chef/tasks/rspec.rb
index 80b0a79557..80b0a79557 100644
--- a/tasks/rspec.rb
+++ b/chef/tasks/rspec.rb