Merge branch 'chef-129' of git://github.com/fujin/chef into aj-ui

Conflicts:

	chef-server-slice/app/controllers/nodes.rb

Author: adamhjk

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "chef-server-slice/public/javascripts/jsoneditor"]
+	path = chef-server-slice/public/javascripts/jsoneditor
+	url = git://github.com/iterationlabs/jsoneditor.git
+[submodule "chef-server-slice/public/web-app-theme"]
+	path = chef-server-slice/public/web-app-theme
+	url = git://github.com/pilu/web-app-theme.git

README.rdoc

@@ -4,9 +4,7 @@
 
 == DESCRIPTION:
 
-Chef is a systems management framework masquerading as a configuration management tool.
-
-I'm in ur netwerk, cookin up yer servers. :)
+Chef is a systems integration framework masquerading as a configuration management tool.
 
 == REQUIREMENTS:
 
@@ -19,7 +17,7 @@ chef:
 *  stomp  
 *  ohai  
 
-chef-server and the chefserverslice (merb slice), same requires as chef above, plus:
+chef-server and the chef-server-slice (merb slice), same requires as chef above, plus:
 
 *  stompserver 
 *  ferret 
@@ -30,23 +28,14 @@ chef-server and the chefserverslice (merb slice), same requires as chef above, p
 *  ruby-openid 
 *  syntax
 
-Interim Note:
-
-Once the {chef,chef-server,chefserverslice}.gem set is installed, do the following:
-
-     > cd /Library/Ruby/Gems/1.8/gems/chef-server<xxx> # or wherever your gems land
-     > sudo rake slices:chefserverslice:install
-
-This installs the chefserverslice into the chef-server merb application
-
 External Servers:
 
 * stompserver (for easy stomp mq testing)
 * CouchDB
 
 == INSTALL:
 
-Install all of the above.  To fire up a develpment environment, do the following:
+Install all of the above.  To fire up a development environment, do the following:
 
   * Start CouchDB with 'couchdb'
   * Start stompserver with 'stompserver' 
@@ -57,10 +46,13 @@ Install all of the above.  To fire up a develpment environment, do the following
   * Start chef-server:
 
     chef-server -N -c 2
+    OR
+    (in chef-server-slice)
+    slice -N -c 2
 
   * Test run chef to begin node registration:
 
-    sudo ./bin/chef-client 
+    chef-client
 
   * Validate the node registration:
 

Rakefile

@@ -2,15 +2,22 @@ gems = %w[chef chef-server-slice chef-server]
 require 'rubygems'
 require 'cucumber/rake/task'
 
+namespace :git do
+  desc "Initialise and update the Git submodules"
+  task :submodule_update do
+    sh "git submodule update --init"
+  end
+end
+
 desc "Build the chef gems"
-task :gem do
+task :gem => "git:submodule_update" do
   gems.each do |dir|
     Dir.chdir(dir) { sh "rake package" }
   end
 end
 
 desc "Install the chef gems"
-task :install do
+task :install => "git:submodule_update" do
   gems.each do |dir|
     Dir.chdir(dir) { sh "rake install" }
   end

chef-server-slice/app/controllers/application.rb

@@ -107,7 +107,7 @@ def access_denied
     case content_type
     when :html
       store_location
-      redirect url(:openid_consumer)
+      redirect slice_url(:openid_consumer), :message => { :error => "You don't have access to that, please login."}
     else
       raise Unauthorized, "You must authenticate first!"
     end

chef-server-slice/app/controllers/nodes.rb

@@ -38,8 +38,8 @@ def show
     rescue Net::HTTPServerException => e
       raise NotFound, "Cannot load node #{params[:id]}"
     end
-    if params[:ajax] == "true"
-      render JSON.pretty_generate(@node), :layout=>false
+    if request.xhr?
+      render JSON.pretty_generate(@node), :layout => false
     else
       display @node
     end
@@ -57,7 +57,7 @@ def create
   end
 
   def update
-    if params[:ajax]
+    if request.xhr?
       @node = JSON.parse(params[:value])
     else      
       @node = params.has_key?("inflated_object") ? params["inflated_object"] : nil
@@ -66,8 +66,8 @@ def update
     if @node
       @status = 202
       @node.save
-      if params[:ajax]
-        partial("nodes/node", :node => @node)
+      if request.xhr?
+        partial :node, :node => @node
       else
         display @node
       end

chef-server-slice/app/controllers/openid_consumer.rb

@@ -26,7 +26,11 @@ class ChefServerSlice::OpenidConsumer < ChefServerSlice::Application
   provides :html, :json
 
   def index
-    render
+    if request.xhr?
+      render :layout => false
+    else  
+      render
+    end
   end
 
   def start

chef-server-slice/app/controllers/openid_register.rb

@@ -25,6 +25,8 @@ class ChefServerSlice::OpenidRegister < ChefServerSlice::Application
   provides :html, :json
 
   before :fix_up_node_id
+  before :login_required,  :only => [ :update, :destroy, :validate, :admin ]
+  before :authorized_node, :only => [ :update, :destroy, :validate, :admin ]
 
   def index
     @headers['X-XRDS-Location'] = Chef::Config[:openid_url] + "/openid/server/server/xrds"

chef-server-slice/app/helpers/cookbooks_helper.rb

@@ -22,9 +22,9 @@ module CookbooksHelper
       def syntax_highlight(code)
         converter = Syntax::Convertors::HTML.for_syntax "ruby"
         if File.exists?(code)
-          converter.convert(File.read(code))
+          converter.convert(File.read(code), false)
         else
-          converter.convert(code)
+          converter.convert(code, false)
         end
       end
     end

chef-server-slice/app/helpers/global_helpers.rb

@@ -33,6 +33,7 @@ def resource_collection(collection)
       def node_escape(node)
         node.gsub(/\./, '_')
       end
+                
     end
   end
 end

chef-server-slice/app/helpers/nodes_helper.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: AJ Christensen (<aj@junglist.gen.nz>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,19 +23,43 @@ module NodesHelper
       def recipe_list(node)
         response = ""
         node.recipes.each do |recipe|
-          response << "<li>#{recipe}</li>"
+          response << "<li>#{recipe}</li>\n"
         end
         response
       end
 
       def attribute_list(node)
         response = ""
         node.each_attribute do |k,v|
-          response << "<li><b>#{k}</b>: #{v}</li>"
+          response << "<li><b>#{k}</b>: #{v}</li>\n"
         end
         response
       end
+      
+      # Recursively build a tree of lists.
+      def build_tree(node)
+        list = "<dl>"
+        list << "\n<!-- Beginning of Node Tree -->"
+        walk = lambda do |key,value|
+          case value
+            when Hash, Array
+              list << "\n<!-- Beginning of Enumerable obj -->"
+              list << "\n<dt>#{key}</dt>"
+              list << "<dd>"
+              list << "\t<dl>\n"
+              value.each(&walk)
+              list << "\t</dl>\n"
+              list << "</dd>"
+              list << "\n<!-- End of Enumerable obj -->"
+              
+            else
+              list << "\n<dt>#{key}</dt>"
+              list << "<dd>#{value}</dd>"
+          end
+        end
+        node.attribute.sort{ |a,b| a[0] <=> b[0] }.each(&walk)
+        list << "</dl>"
+      end
     end
-
   end
 end