Merge git@github.com:btm/chef into btm

Author: adamhjk

NOTICE

@@ -7,5 +7,6 @@ Contributors and Copyright holders:
 
  * Copyright 2008, Adam Jacob <adam@hjksolutions.com>
  * Copyright 2008, Arjuna Christensen <aj@hjksolutions.com>
+ * Copyright 2008, Bryan McLellan <btm@loftninjas.org>
  * Copyright 2008, Ezra Zygmuntowicz <ezra@engineyard.com>
- 
+ 

README.txt

@@ -20,13 +20,15 @@ RubyGems:
 
 * stomp
 * stompserver
-* ultraviolet
 * facter
 * ferret
 * merb-core
+* merb-haml
 * haml
-* ruby-openid
+* ruby-openid (>= 2.0.1)
 * json
+* mongrel
+* rspec
 
 External Servers:
 
@@ -47,6 +49,16 @@ Install all of the above.  To fire up a develpment environment, do the following
 
     chef-server -N -c 2
 
+  * Test run chef to begin node registration:
+
+    sudo ./bin/chef-client -l debug -c ./examples/config/chef-solo.rb
+
+  * Validate the node registration:
+
+    Visit http://localhost:4000
+      Login, enter an openid URL (see http://openid.net/get/)
+      Registrations, click Validate
+
   * Test run chef with:
 
     chef-client -l debug

chef-server/bin/chef-indexer

@@ -18,9 +18,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'rubygems'
 require 'optparse'
 require 'chef'
-require 'rubygems'
 require 'facter'
 
 config = {

chef/Rakefile

@@ -1,7 +1,6 @@
 # -*- ruby -*-
 require 'rubygems'
 require 'rake/gempackagetask'
-require './lib/chef.rb'
 require './tasks/rspec.rb'
 
 GEM = "chef"

chef/lib/chef/couchdb.rb

@@ -37,6 +37,7 @@ def create_db
     end
 
     def create_design_document(name, data)
+      create_db
       to_update = true
       begin
         old_doc = @rest.get_rest("#{Chef::Config[:couchdb_database]}/_design%2F#{name}")
@@ -146,4 +147,4 @@ def safe_name(name)
       end
 
   end
-end
+end

chef/tasks/rspec.rb

@@ -2,14 +2,6 @@
 require 'rake'
 require 'spec/rake/spectask'
 
-#desc "Run all examples"
-#Spec::Rake::SpecTask.new('spec') do |t|
-#  t.spec_files = FileList[File.join(File.dirname(__FILE__), "..", "spec", "**", "*.rb")]
-#end
-
-require 'spec/rake/spectask'
-require 'spec/translator'
-
 CHEF_ROOT = File.join(File.dirname(__FILE__), "..")
 
 task :default => :spec
@@ -51,4 +43,4 @@
     dir = CHEF_ROOT + '/spec'
     translator.translate(dir, dir)
   end
-end
+end

example-repository/Rakefile

@@ -22,7 +22,6 @@ require File.join(File.dirname(__FILE__), 'config', 'rake')
 
 require 'tempfile'
 
-$vcs = :svn
 if File.directory?(File.join(TOPDIR, ".svn"))
   $vcs = :svn
 elsif File.directory?(File.join(TOPDIR, ".git"))
@@ -47,6 +46,8 @@ task :update do
     else
       puts "* Skipping git pull, no origin specified"
     end
+  else
+    puts "* No SCM configured, skipping update"
   end
 end
 
@@ -171,4 +172,4 @@ EOH
   sh("(cd #{CADIR} && openssl x509 -noout -fingerprint -text < #{fqdn}.crt > #{fqdn}.info)")
   sh("(cd #{CADIR} && cat #{fqdn}.crt #{fqdn}.key > #{fqdn}.pem)")
   sh("(cd #{CADIR} && chmod 644 #{fqdn}.pem)")
-end
+end