chef-server-webui 0.9.6 → 0.9.8.beta.1

data/Rakefile

@@ -21,7 +21,7 @@ spec = Gem::Specification.new do |s|
   s.version = ChefServerWebui::VERSION
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru" ]
   s.summary = SUMMARY
   s.description = s.summary
   s.author = AUTHOR
@@ -29,7 +29,6 @@ spec = Gem::Specification.new do |s|
   s.homepage = HOMEPAGE
 
   s.add_dependency "merb-core", "~> 1.1.0"
-  s.add_dependency "merb-slices", "~> 1.1.0"
   s.add_dependency "merb-assets", "~> 1.1.0"
   s.add_dependency "merb-helpers", "~> 1.1.0"
   s.add_dependency "merb-haml", "~> 1.1.0"

data/app/controllers/application.rb

@@ -51,14 +51,17 @@ class Application < Merb::Controller
     redirect(url(:users_login), {:message => { :error => $! }, :permanent => true})
   end
 
+  def require_admin
+    raise AdminAccessRequired unless is_admin?
+  end
 
-  def is_admin(name)
-    user = Chef::WebUIUser.load(name)
-    return user.admin
+  def is_admin?
+    user = Chef::WebUIUser.load(session[:user])
+    user.admin?
   end
 
-  #return true if there is only one admin left, false otehrwise
-  def is_last_admin
+  #return true if there is only one admin left, false otherwise
+  def is_last_admin?
     count = 0
     users = Chef::WebUIUser.list
     users.each do |u, url|
@@ -72,18 +75,9 @@ class Application < Merb::Controller
   end
 
   #whether or not the user should be able to edit a user's admin status
-  def edit_admin
-    is_admin(params[:user_id]) ? (!is_last_admin) : true
-  end
-
-  def authorized_user
-    if session[:level] == :admin
-      Chef::Log.debug("Authorized as Administrator")
-      true
-    else
-      Chef::Log.debug("Unauthorized")
-      raise Unauthorized, "The current user is not an Administrator, you can only Show and Edit the user itself. To control other users, login as an Administrator."
-    end
+  def can_edit_admin?
+    return false unless is_admin? && !is_last_admin?
+    true
   end
 
   # Store the URI of the current request in the session.

data/app/controllers/clients.rb

@@ -22,6 +22,7 @@ class Clients < Application
   provides :json
   provides :html
   before :login_required
+  before :require_admin, :exclude => [:index, :show]
   
   # GET /clients
   def index
@@ -61,6 +62,7 @@ class Clients < Application
 
   # GET /clients/new
   def new
+    raise AdminAccessRequired unless params[:user_id] == session[:user] unless session[:level] == :admin
     @client = Chef::ApiClient.new
     render
   end

data/app/controllers/databags.rb

@@ -21,7 +21,8 @@ require 'chef' / 'data_bag'
 class Databags < Application
   
   provides :html, :json
-  before :login_required 
+  before :login_required
+  before :require_admin
   
   def new
     @databag = Chef::DataBag.new

data/app/controllers/exceptions.rb

@@ -16,4 +16,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+class AdminAccessRequired < Merb::ControllerExceptions::Forbidden; end
 
+class Exceptions < Merb::Controller
+  def admin_access_required
+    render :layout => nil
+  end
+end

data/app/controllers/nodes.rb

@@ -25,6 +25,7 @@ class Nodes < Application
   provides :html
   
   before :login_required
+  before :require_admin, :only => [:destroy]
   
   def index
     begin

data/app/controllers/openid_consumer.rb

@@ -90,7 +90,11 @@ class OpenidConsumer < Application
           user = Chef::WebUIUser.load(u)
           if user.openid == oidresp.identity_url
             session[:user] = user.name
-            session[:level] = :admin              
+            if user.admin
+              session[:level] = :admin
+            else
+              session[:level] = :user
+            end
             break
           end
         end        

data/app/controllers/roles.rb

@@ -22,7 +22,8 @@ require 'chef/role'
 class Roles < Application
 
   provides :html
-  before :login_required 
+  before :login_required
+  before :require_admin, :only => [:destroy]
   
   # GET /roles
   def index
@@ -100,7 +101,7 @@ class Roles < Application
       @role = Chef::Role.new
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
-      @run_list = params[:for_role] ? params[:for_role] : []
+      @run_list = Chef::RunList.new.reset!(Array(params[:for_role]))
       @_message = { :error => "Could not create role" }
       render :new
     end
@@ -121,7 +122,8 @@ class Roles < Application
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @available_recipes = get_available_recipes 
       @available_roles = Chef::Role.list.keys.sort
-      @run_list = params[:for_role] ? params[:for_role] : []
+      @run_list = Chef::RunList.new.reset!( Array(params[:for_role]))
+      Chef::Log.error(@run_list.inspect)
       @role.default_attributes(JSON.parse(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(JSON.parse(params[:override_attributes])) if params[:override_attributes] != ''
       @_message = {:error => "Could not update role #{params[:id]}"}

data/app/controllers/users.rb

@@ -24,12 +24,12 @@ class Users < Application
 
   provides :html
   before :login_required, :exclude => [:login, :login_exec, :complete]
+  before :require_admin, :exclude => [:login, :login_exec, :complete, :show, :edit, :logout, :destroy]
   log_params_filtered :password, :password2, :new_password, :confirm_new_password
     
   # List users, only if the user is admin.
   def index
     begin
-      authorized_user
       @users = Chef::WebUIUser.list 
       render
     rescue => e
@@ -41,7 +41,6 @@ class Users < Application
   # Edit user. Admin can edit everyone, non-admin user can only edit itself.
   def edit
     begin
-      raise Forbidden, "The current user is not an Administrator, you can only Show and Edit the user itself. To control other users, login as an Administrator." unless params[:user_id] == session[:user] unless session[:level] == :admin
       @user = Chef::WebUIUser.load(params[:user_id])
       render
     rescue => e
@@ -53,7 +52,6 @@ class Users < Application
   # Show the details of a user. If the user is not admin, only able to show itself; otherwise able to show everyone
   def show
     begin
-      raise Forbidden, "The current user is not an Administrator, you can only Show and Edit the user itself. To control other users, login as an Administrator." unless params[:user_id] == session[:user] unless session[:level] == :admin
       @user = Chef::WebUIUser.load(params[:user_id])
       render
     rescue => e
@@ -67,8 +65,8 @@ class Users < Application
     begin
       @user = Chef::WebUIUser.load(params[:user_id])
       
-      if session[:level] == :admin and ['true','false'].include? params[:admin]
-        @user.admin = str_to_bool(params[:admin])
+      if session[:level] == :admin and !is_last_admin?
+        @user.admin = params[:admin] =~ /1/ ? true : false
       end
 
       if params[:user_id] == session[:user] && params[:admin] == 'false'
@@ -85,18 +83,18 @@ class Users < Application
         @user.set_openid(URI.parse(params[:openid]).normalize.to_s)
       end
       @user.save
-      @_message = { :notice => "Updated User #{@user.name}" }
+      @_message = { :notice => "Updated user #{@user.name}." }
       render :show
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @_message = { :error => "Could not update user" }
+      @u = Chef::WebUIUser.load(params[:user_id])
+      @_message = { :error => "Could not update user #{@user.name}." }
       render :edit
     end
   end
   
   def new
     begin
-      authorized_user
       @user = Chef::WebUIUser.new
       render
     rescue => e
@@ -107,7 +105,6 @@ class Users < Application
 
   def create
     begin
-      authorized_user
       @user = Chef::WebUIUser.new
       @user.name = params[:name]
       @user.set_password(params[:password], params[:password2])
@@ -153,12 +150,12 @@ class Users < Application
   
   def destroy
     begin
-      raise Forbidden, "The last admin user cannot be deleted" if (is_admin(params[:user_id]) && is_last_admin)
       raise Forbidden, "A non-admin user can only delete itself" if (params[:user_id] != session[:user] && session[:level] != :admin)
+      raise Forbidden, "The last admin user cannot be deleted" if (is_admin? && is_last_admin? && session[:user] == params[:user_id])
       @user = Chef::WebUIUser.load(params[:user_id])
       @user.destroy
       logout if params[:user_id] == session[:user]
-      redirect(absolute_url(:users), {:message => { :notice => "User #{params[:user_id]} deleted successfully" }, :permanent => true})
+      redirect(absolute_url(:users), {:message => { :notice => "User #{params[:user_id]} deleted successfully." }, :permanent => true})
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       session[:level] != :admin ? set_user_and_redirect : redirect_to_list_users({ :error => $! })

data/app/views/clients/_form.html.haml

@@ -10,7 +10,7 @@
       %div.group.form
         %label.label Private Key
         = check_box :name => "regen_private_key", :label => "Regenerate Private Key (Existing one will no longer work!)", :value => "1"
-        %br
+        %br/
         
     %div.group.form
       %label.label Admin

data/app/views/cookbooks/index.html.haml

@@ -3,8 +3,10 @@
     %h2.title Cookbooks
     .inner
       %table.table
-        %tr
-          %th.first Cookbook Name
+        %thead
+          %tr
+            %th.first Cookbook Name
+        %tbody
           - @cl.sort.each_with_index do |cookbook, index|
             %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
-              %td= link_to cookbook[0], url(:cookbook, { :id => cookbook[0] })
+              %td= link_to cookbook[0], url(:cookbook, { :id => cookbook[0] })

data/app/views/databags/index.html.haml

@@ -6,14 +6,16 @@
     .content
       .inner
         %table.table
-          %tr
-            %th.first{:colspan => 2} Databag Name
-            %th  
-            %th.last  
+          %thead
+            %tr
+              %th.first{:colspan => 2} Databag Name
+              %th  
+              %th.last  
+          %tbody
             - @databags.sort.each_with_index do |databag, index|
               %tr{:class => "#{index % 2 == 1 ? 'odd' : 'even'}"}
                 %td{:colspan => 2}= link_to databag[0], url(:databag, { :id => databag[0] })
                 %td
                   = link_to('Edit', url(:databag, :id => databag[0])) 
                   |
-                  = link_to('Delete', url(:databag, :id => databag[0]), :method => "delete", :confirm => "Really delete Databag #{databag[0]}?  There is no undo.")
+                  = link_to('Delete', url(:databag, :id => databag[0]), :method => "delete", :confirm => "Really delete Databag #{databag[0]}?  There is no undo.")

data/app/views/exceptions/admin_access_required.html.haml

@@ -0,0 +1,7 @@
+.block#block-messages
+  .content
+    %h2.title Messages
+    .inner
+      .flash
+        %div{:class => "message error"}
+          %p Administrative access required.

data/app/views/layout/application.html.haml

@@ -20,7 +20,8 @@
         #user-navigation
           %ul
             - if session[:user]
-              %li= link_to "Logout #{h session[:user]} (#{session[:level].to_s})", url(:users_logout), :method => "get", :confirm => "Are you sure you want to logout?"
+              %li= link_to "Edit account", url(:users_edit, :user_id => session[:user]), :method => 'get'
+              %li= link_to "Logout #{h session[:user]} (#{session[:level].to_s})", url(:users_logout), :method => 'get', :confirm => "Are you sure you want to logout?"
             - else
               %li= link_to "Login", url(:users_login), :rel => "facebox"
           .clear
@@ -49,7 +50,7 @@
           = catch_content :for_layout
           #footer
             .block
-              %p Copyright © 2009 Opscode
+              %p Copyright © 2010 Opscode
         #sidebar
           .block.notice#sidebar_block_notice= catch_content :sidebar_block_notice
           .block#sidebar_block= catch_content :sidebar_block

data/app/views/layout/login.html.haml

@@ -29,7 +29,7 @@
           = catch_content :for_layout
           #footer
             .block
-              %p Copyright © 2009 Opscode
+              %p Copyright © 2010 Opscode
         #sidebar
           .block.notice#sidebar_block_notice= catch_content :sidebar_block_notice
           .block#sidebar_block= catch_content :sidebar_block

data/app/views/nodes/show.html.haml

@@ -9,10 +9,12 @@
           .left
             %h3 Run List
             %table.table
-              %tr
-                %th.first Position
-                %th Name
-                %th.last Type
+              %thead
+                %tr
+                  %th.first Position
+                  %th Name
+                  %th.last Type
+              %tbody
                 - if @node.run_list.empty?
                   %tr
                     %td{:colspan => 2} This node has no roles or recipes applied.

data/app/views/status/index.html.haml

@@ -3,14 +3,16 @@
     %h2.title Status
     .inner
       %table.table
-        %tr
-          %th.first Node Name
-          %th Platform
-          %th FQDN
-          %th IP Address
-          %th Uptime
-          %th Last Check-in
-          %th.last Run List
+        %thead
+          %tr
+            %th.first Node Name
+            %th Platform
+            %th FQDN
+            %th IP Address
+            %th Uptime
+            %th Last Check-in
+            %th.last Run List
+        %tbody
           - if @status.empty?
             %tr
               %td{:colspan => 7}= "You appear to have no nodes - try connecting one, or creating or editing a #{link_to('client', url(:clients))}"
@@ -27,8 +29,9 @@
                       = link_to(node[1]["uptime"].split(" ")[0..1].join(" ") , "#", :class => 'tooltip')
                       .tooltip
                         %table.table.tooltip
-                          %tr
-                            %td= node[1]["uptime"]
+                          %tbody
+                            %tr
+                              %td= node[1]["uptime"]
                             
                 - unless node[1]["ohai_time"].nil?
                   - current_time = Time.now.to_f
@@ -55,10 +58,11 @@
                         = link_to(status_msg, "#", :class=> 'tooltip')
                         .tooltip
                           %table.table.tooltip
-                            %tr
-                              %td
-                                = ohai_time 
-                                %br
+                            %tbody
+                              %tr
+                                %td
+                                  = ohai_time 
+                                  %br/
                                   - if hours == 0
                                     = "#{minutes_text} ago" 
                                   - else
@@ -71,10 +75,12 @@
                       = link_to("Run List", "#", :class => 'tooltip')
                       .tooltip
                         %table.table.tooltip
-                          %tr
-                            %th.first Position
-                            %th Name
-                            %th.last Type
+                          %thead
+                            %tr
+                              %th.first Position
+                              %th Name
+                              %th.last Type
+                          %tbody
                             - if node[1].run_list.empty?
                               %tr
                                 %td{:colspan => 2} This node has no roles or recipes applied.

data/app/views/users/_form.html.haml

@@ -1,39 +1,40 @@
 .content
   .inner     
-    -if form_for == "login"
-      %div.group
-        .text_field= text_field :id => "user_name", :name => "name", :label => "Username: ", :class => "text_field", :value => params.has_key?(:name) ? h(params[:name]) : @user.name
-      %br
+    = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do
+      -if form_for == "login"
+        %div.group
+          .text_field= text_field :id => "user_name", :name => "name", :label => "Username: ", :value => params.has_key?(:name) ? h(params[:name]) : @user.name
+        %br/
+        
+        %div.group
+          .text_field= password_field :id=> "password", :name => "password", :label=>"Password: ", :class => "password_field"
+        %br/
+        =link_to("Or, log in with OpenID if you have one associated with an existing user account.", url(:openid_consumer))
+        %br/
       
-      %div.group
-        .text_field= password_field :id=> "password", :name => "password", :label=>"Password: ", :class => "password_field"
-      %br
-      =link_to("Or, log in with OpenID if you have one associated with an existing user account.", url(:openid_consumer))
-      %br 
-    
-    - if form_for == "edit"
-      %div.group.form
-        %label.label New Password
-        = password_field :id=>"user_new_password", :name => "new_password", :class =>"password_field"
-        %span.description New password for the User. Keep blank if you do not want to change password. 
+      - if form_for == "edit"
+        %div.group.form
+          %label.label New Password
+          = password_field :id=>"user_new_password", :name => "new_password", :class =>"password_field"
+          %span.description New password for the User. Keep blank if you do not want to change password. 
 
-      %div.group.form
-        %label.label Confirm New Password
-        = password_field :id=>"user_confirm_new_password", :name => "confirm_new_password", :class =>"password_field"
-        %span.description Confirm new password for the User. Keep blank if you do not want to change password.
+        %div.group.form
+          %label.label Confirm New Password
+          = password_field :id=>"user_confirm_new_password", :name => "confirm_new_password", :class =>"password_field"
+          %span.description Confirm new password for the User. Keep blank if you do not want to change password.
 
-      - if session[:level] == :admin && edit_admin
+        - if is_admin? && !is_last_admin?
+          %div.group.form
+            %label.label Admin
+            %input{ :type => "hidden", :name => "admin", :value => 0 }
+            %input{ :type => "checkbox", :name => "admin", :value => 1, :checked => @user.admin }
+            %span.description Whether or not the User is an admin. 
+        
         %div.group.form
-          %label.label Admin
-          = text_field :id => "user_admin", :name => "admin", :class => "text_field", :value => @user.admin
-          %span.description Whether or not the User is an admin. 
-      
-      %div.group.form
-        %label.label OpenID Association
-        = text_field :id => "openid", :name => "openid", :class => "text_field", :value => @user.openid
-        %span.description Associate an OpenID with the user account, leave blank if you do not want to associate one.   
-      
-    = form(:action => form_url, :method => :post, :id => form_id, :class => 'form') do
+          %label.label OpenID Association
+          = text_field :id => "openid", :name => "openid", :class => "text_field", :value => @user.openid
+          %span.description Associate an OpenID with the user account, leave blank if you do not want to associate one.   
+        
       %div.group
         .actions-bar
           .actions= submit submit_name, :id => submit_id, :class => 'button'

data/app/views/users/_navigation.html.haml

@@ -1,9 +1,12 @@
 .secondary-navigation
   %ul
-    %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:users))
-    %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:users_new))
+    - if is_admin?
+      %li{ :class => "first #{active == 'index' ? "active" : ''}"}= link_to('List', url(:users))
+    - if is_admin?
+      %li{ :class => (active == 'create' ? "active" : '')}= link_to('Create', url(:users_new))
     - if active != 'create' && active != 'index'
       %li{ :class => (active == 'show' ? "active" : '')}= link_to('Show', url(:users_show))
-      %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:users_edit, :user_id => params[:user_id]))
-      %li= link_to('Delete', url(:users_delete, :user_id => params[:user_id]), :method => "delete", :confirm => "Really delete user #{params[:user_id]}? There is no undo.")
+      - if @user.admin || @user.name == params[:user_id]
+        %li{ :class => (active == 'edit' ? "active" : '')}= link_to('Edit', url(:users_edit, :user_id => params[:user_id]))
+        %li= link_to('Delete', url(:users_delete, :user_id => params[:user_id]), :method => "delete", :confirm => "Really delete user #{params[:user_id]}? There is no undo.")
   .clear

data/app/views/users/edit.html.haml

@@ -1,6 +1,6 @@
 .block#block-tables
   .content
-    %h2.title= "User: #{h @user.name}"
+    %h2.title= "Edit user: #{h @user.name}"
     .inner
       = partial('navigation', :active => 'edit')
   = partial('form', :header => "Edit User #{@user.name}", :form_id => 'edit_user', :submit_name => "Save User", :submit_id => "edit_user_button", :form_for => 'edit', :form_url => url(:users_update, @user.name) )

data/bin/chef-server-webui

@@ -30,6 +30,13 @@ require "merb-core"
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib'))
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
+# Print the version if we have -v or --version
+if ARGV.any? { |arg| arg =~ /\-v|\-\-version/ }
+  require 'chef-server-webui/version'
+  puts "Chef Server (Web UI) Version: #{ChefServerWebui::VERSION}"
+  exit 1
+end
+
 require 'chef'
 require 'chef-server-webui'
 

data/config/environments/development.rb

@@ -0,0 +1,30 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# 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.
+#
+
+Chef::Log.info("")
+Chef::Log.info("*" * 80)
+Chef::Log.info("*   Starting Chef Server Web UI in Development Mode.")
+Chef::Log.info("*   Start the server with `-e production` for normal use")
+Chef::Log.info("*" * 80)
+Chef::Log.info("")
+
+Merb::Config.use do |c|
+  c[:exception_details]  = true
+  c[:reload_classes]     = true
+  c[:reload_templates]   = true
+end

data/config/environments/production.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# 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.
+#
+
+Merb::Config.use do |c|
+  c[:exception_details]  = false
+  c[:reload_classes]     = false
+  c[:reload_templates]   = false
+end

data/config/init.rb

@@ -1,24 +1,20 @@
 #
-# ==== Standalone Chefserver configuration
-# 
-# This configuration/environment file is only loaded by bin/slice, which can be 
-# used during development of the slice. It has no effect on this slice being
-# loaded in a host application. To run your slice in standalone mode, just
-# run 'slice' from its directory. The 'slice' command is very similar to
-# the 'merb' command, and takes all the same options, including -i to drop 
-# into an irb session for example.
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
 #
-# The usual Merb configuration directives and init.rb setup methods apply,
-# including use_orm and before_app_loads/after_app_loads.
+# 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
 #
-# If you need need different configurations for different environments you can 
-# even create the specific environment file in config/environments/ just like
-# in a regular Merb application. 
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# In fact, a slice is no different from a normal # Merb application - it only
-# differs by the fact that seamlessly integrates into a so called 'host'
-# application, which in turn can override or finetune the slice implementation
-# code and views.
+# 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.
 #
 
 
@@ -39,15 +35,11 @@ require 'chef/webui_user'
 use_template_engine :haml
 
 Merb::Config.use do |c|
-  # BUGBUG [cb] For some reason, this next line
-  # causes a merb slice to vomit around openid
-  #c[:fork_for_class_load] = false
+  c[:name] = "chef-server-webui"
+  c[:fork_for_class_load] = false
   c[:session_id_key]     = '_chef_server_session_id'
   c[:session_secret_key] = Chef::Config.manage_secret_key
   c[:session_store]      = 'cookie'
-  c[:exception_details]  = true
-  c[:reload_classes]     = true
-  c[:reload_templates]   = true
   
   c[:log_level] = Chef::Config[:log_level]
   if Chef::Config[:log_location].kind_of?(String)

data/config/rack.rb

@@ -1,3 +1,21 @@
+#
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# 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.
+#
+
 use Rack::ContentLength
 use Merb::Rack::Static, Merb.dir_for(:public)
 

data/config/router.rb

@@ -1,3 +1,22 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Daniel DeLeo (<dan@opscode.com>)
+# Copyright:: Copyright (c) 2008-2010 Opscode, Inc.
+# 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.
+#
+
 Merb::Router.prepare do
   resources :nodes, :id => /[^\/]+/
   resources :clients, :id => /[^\/]+/

data/lib/chef-server-webui/version.rb

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '0.9.6'
+  VERSION = '0.9.8.beta.1'
 end

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-webui
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
   - 9
-  - 6
-  version: 0.9.6
+  - 8
+  - beta
+  - 1
+  version: 0.9.8.beta.1
 platform: ruby
 authors: 
 - Opscode
@@ -14,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-02 00:00:00 -07:00
+date: 2010-07-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +35,7 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: merb-slices
+  name: merb-assets
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,7 +50,7 @@ dependencies:
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: merb-assets
+  name: merb-helpers
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,7 +65,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: merb-helpers
+  name: merb-haml
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,7 +80,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: merb-haml
+  name: merb-param-protection
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,24 +94,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: merb-param-protection
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: json
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - <=
@@ -121,10 +108,10 @@ dependencies:
         version: 1.4.2
   type: :runtime
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: thin
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,10 +121,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: haml
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -147,10 +134,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: ruby-openid
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -160,10 +147,10 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: coderay
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -173,7 +160,7 @@ dependencies:
         version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *id011
+  version_requirements: *id010
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
 executables: 
@@ -183,12 +170,15 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 - LICENSE
+- config.ru
 files: 
 - LICENSE
 - README.rdoc
 - Rakefile
 - config.ru
 - bin/chef-server-webui
+- config/environments/development.rb
+- config/environments/production.rb
 - config/init.rb
 - config/rack.rb
 - config/router.rb
@@ -256,6 +246,7 @@ files:
 - app/views/databags/index.html.haml
 - app/views/databags/new.html.haml
 - app/views/databags/show.html.haml
+- app/views/exceptions/admin_access_required.html.haml
 - app/views/exceptions/bad_request.json.erb
 - app/views/exceptions/internal_server_error.html.erb
 - app/views/exceptions/not_acceptable.html.erb
@@ -412,11 +403,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: