chef-server-webui 0.9.18 → 0.10.0.beta.0

data/app/controllers/nodes.rb

@@ -8,9 +8,9 @@
 # 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.
@@ -21,17 +21,19 @@
 require 'chef/node'
 
 class Nodes < Application
-  
+
   provides :html
-  
+
   before :login_required
   before :require_admin, :only => [:destroy]
-  
+
   def index
     begin
-      node_hash = Chef::Node.list
-      require 'pp'
-      pp node_hash
+      if session[:environment]
+        node_hash = Chef::Node.list_by_environment(session[:environment])
+      else
+        node_hash = Chef::Node.list
+      end
       @node_list = node_hash.keys.sort
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
@@ -42,35 +44,38 @@ class Nodes < Application
   end
 
   def show
-    begin      
+    begin
       @node =Chef::Node.load(params[:id])
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = {:error => "Could not load node #{params[:id]}"}
       @node = Chef::Node.new
-    end 
+    end
     render
   end
 
   def new
     begin
       @node = Chef::Node.new
-      @available_recipes = get_available_recipes 
+      @node.chef_environment(session[:environment] || "_default")
+      @available_recipes = list_available_recipes_for(@node.chef_environment)
       @available_roles = Chef::Role.list.keys.sort
       @run_list = @node.run_list
+      @env = session[:environment]
       render
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @node_list = Chef::Node.list()
       @_message = {:error => "Could not load available recipes, roles, or the run list"}
       render :index
-    end 
+    end
   end
 
   def edit
     begin
       @node = Chef::Node.load(params[:id])
-      @available_recipes = get_available_recipes 
+      @env = @node.chef_environment
+      @available_recipes = list_available_recipes_for(@node.chef_environment)
       @available_roles = Chef::Role.list.keys.sort
       @run_list = @node.run_list
       render
@@ -82,13 +87,14 @@ class Nodes < Application
       @run_list = []
       @_message = {:error => "Could not load node #{params[:id]}"}
       render
-    end 
+    end
   end
 
   def create
-    begin      
+    begin
       @node = Chef::Node.new
       @node.name params[:name]
+      @node.chef_environment params[:chef_environment]
       @node.normal_attrs = Chef::JSONCompat.from_json(params[:attributes])
       @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
       raise ArgumentError, "Node name cannot be blank" if (params[:name].nil? || params[:name].length==0)
@@ -97,7 +103,7 @@ class Nodes < Application
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @node.normal_attrs = Chef::JSONCompat.from_json(params[:attributes])
-      @available_recipes = get_available_recipes
+      @available_recipes = list_available_recipes_for(@node.chef_environment)
       @available_roles = Chef::Role.list.keys.sort
       @node.run_list params[:for_node]
       @run_list = @node.run_list
@@ -109,6 +115,7 @@ class Nodes < Application
   def update
     begin
       @node = Chef::Node.load(params[:id])
+      @node.chef_environment(params[:chef_environment])
       @node.run_list.reset!(params[:for_node] ? params[:for_node] : [])
       @node.normal_attrs = Chef::JSONCompat.from_json(params[:attributes])
       @node.save
@@ -116,7 +123,7 @@ class Nodes < Application
       render :show
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @available_recipes = get_available_recipes 
+      @available_recipes = list_available_recipes_for(@node.chef_environment)
       @available_roles = Chef::Role.list.keys.sort
       @run_list = Chef::RunList.new
       @run_list.reset!(params[:for_node])
@@ -135,7 +142,7 @@ class Nodes < Application
       @node_list = Chef::Node.list()
       @_message = {:error => "Could not delete the node"}
       render :index
-    end 
+    end
   end
-  
+
 end

data/app/controllers/roles.rb

@@ -7,9 +7,9 @@
 # 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.
@@ -24,7 +24,7 @@ class Roles < Application
   provides :html
   before :login_required
   before :require_admin, :only => [:destroy]
-  
+
   # GET /roles
   def index
     @role_list =  begin
@@ -33,7 +33,7 @@ class Roles < Application
                     Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
                     @_message = {:error => "Could not list roles"}
                     {}
-                  end 
+                  end
     render
   end
 
@@ -43,44 +43,54 @@ class Roles < Application
               Chef::Role.load(params[:id])
             rescue => e
               Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-              @_message = {:error => "Could not load role #{params[:id]}"}
+              @_message = {:error => "Could not load role #{params[:id]}."}
               Chef::Role.new
-            end 
+            end
+
+    @current_env = session[:environment] || "_default"
+    @env_run_list_exists = @role.env_run_lists.has_key?(@current_env)
+    @run_list = @role.run_list_for(@current_env)
+    @recipes = @run_list.expand(@current_env, 'server').recipes
     render
   end
 
   # GET /roles/new
   def new
     begin
-      @available_recipes = get_available_recipes 
       @role = Chef::Role.new
       @available_roles = Chef::Role.list.keys.sort
-      @run_list = @role.run_list
+      @environments = Chef::Environment.list.keys.sort
+      @run_lists = @environments.inject({}) { |run_lists, env| run_lists[env] = @role.env_run_lists[env]; run_lists}
+      @current_env = "_default"
+      @available_recipes = list_available_recipes_for(@current_env)
+      @existing_run_list_environments = @role.env_run_lists.keys
+      # merb select helper has no :include_blank => true, so fix the view in the controller.
+      @existing_run_list_environments.unshift('')
       render
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @role_list = Chef::Role.list()
-      @_message = {:error => "Could not load available recipes, roles, or the run list."}
-      render :index
-    end 
+      redirect url(:roles), :message => {:error => "Could not load available recipes, roles, or the run list."}
+    end
   end
 
   # GET /roles/:id/edit
   def edit
     begin
       @role = Chef::Role.load(params[:id])
-      @available_recipes = get_available_recipes 
       @available_roles = Chef::Role.list.keys.sort
+      @environments = Chef::Environment.list.keys.sort
+      @current_env = session[:environment] || "_default"
       @run_list = @role.run_list
+      @run_lists = @environments.inject({}) { |run_lists, env| run_lists[env] = @role.env_run_lists[env]; run_lists}
+      @existing_run_list_environments = @role.env_run_lists.keys
+      # merb select helper has no :include_blank => true, so fix the view in the controller.
+      @existing_run_list_environments.unshift('')
+      @available_recipes = list_available_recipes_for(@current_env)
+      render
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @role = Chef::Role.new
-      @available_recipes = []
-      @available_roles = []
-      @run_list = []
-      @_message = {:error => "Could not load role #{params[:id]}, the available recipes, roles, or the run list"}
-    end 
-    render
+      redirect url(:roles), :message => {:error => "Could not load role #{params[:id]}. #{e.message}"}
+    end
   end
 
   # POST /roles
@@ -88,7 +98,7 @@ class Roles < Application
     begin
       @role = Chef::Role.new
       @role.name(params[:name])
-      @role.run_list(params[:for_role] ? params[:for_role] : [])
+      @role.env_run_lists(params[:env_run_lists])
       @role.description(params[:description]) if params[:description] != ''
       @role.default_attributes(Chef::JSONCompat.from_json(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(Chef::JSONCompat.from_json(params[:override_attributes])) if params[:override_attributes] != ''
@@ -96,14 +106,7 @@ class Roles < Application
       redirect(url(:roles), :message => { :notice => "Created Role #{@role.name}" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @available_recipes = get_available_recipes 
-      @available_roles = Chef::Role.list.keys.sort
-      @role = Chef::Role.new
-      @role.default_attributes(Chef::JSONCompat.from_json(params[:default_attributes])) if params[:default_attributes] != ''
-      @role.override_attributes(Chef::JSONCompat.from_json(params[:override_attributes])) if params[:override_attributes] != ''
-      @run_list = Chef::RunList.new.reset!(Array(params[:for_role]))
-      @_message = { :error => "Could not create role" }
-      render :new
+      redirect(url(:new_role), :message => { :error => "Could not create role. #{e.message}" })
     end
   end
 
@@ -111,23 +114,15 @@ class Roles < Application
   def update
     begin
       @role = Chef::Role.load(params[:id])
-      @role.run_list(params[:for_role] ? params[:for_role] : [])
+      @role.env_run_lists(params[:env_run_lists])
       @role.description(params[:description]) if params[:description] != ''
       @role.default_attributes(Chef::JSONCompat.from_json(params[:default_attributes])) if params[:default_attributes] != ''
       @role.override_attributes(Chef::JSONCompat.from_json(params[:override_attributes])) if params[:override_attributes] != ''
       @role.save
-      @_message = { :notice => "Updated Role" }
-      render :show
+      redirect(url(:role, params[:id]), :message => { :notice => "Updated Role" })
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @available_recipes = get_available_recipes 
-      @available_roles = Chef::Role.list.keys.sort
-      @run_list = Chef::RunList.new.reset!( Array(params[:for_role]))
-      Chef::Log.error(@run_list.inspect)
-      @role.default_attributes(Chef::JSONCompat.from_json(params[:default_attributes])) if params[:default_attributes] != ''
-      @role.override_attributes(Chef::JSONCompat.from_json(params[:override_attributes])) if params[:override_attributes] != ''
-      @_message = {:error => "Could not update role #{params[:id]}"}
-      render :edit
+      redirect url(:edit_role, params[:id]), :message => {:error => "Could not update role #{params[:id]}. #{e.message}"}
     end
   end
 
@@ -139,10 +134,8 @@ class Roles < Application
       redirect(absolute_url(:roles), :message => { :notice => "Role #{@role.name} deleted successfully." }, :permanent => true)
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
-      @role_list = Chef::Role.list()
-      @_message = {:error => "Could not delete role #{params[:id]}"}
-      render :index
-    end 
+      redirect url(:roles), :message => {:error => "Could not delete role #{params[:id]}"}
+    end
   end
 
 end

data/app/controllers/search.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -19,10 +19,10 @@
 require 'chef' / 'search' / 'query'
 
 class Search < Application
-  
+
   provides :html
-  before :login_required 
-    
+  before :login_required
+
   def index
     @s = Chef::Search::Query.new
     @search_indexes = begin
@@ -31,20 +31,20 @@ class Search < Application
                         Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
                         @_message = {:error => "Could not list search indexes"}
                         {}
-                      end 
+                      end
     render
   end
 
   def show
     begin
       @s = Chef::Search::Query.new
-      query = params[:q].nil? ? "*:*" : (params[:q].empty? ? "*:*" : params[:q])
-      @results = @s.search(params[:id], query)      
+      query = (params[:q].nil? || params[:q].empty?) ? "*:*" : URI.escape(params[:q], Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      @results = @s.search(params[:id], query)
       @type = if params[:id].to_s == "node" || params[:id].to_s == "role" || params[:id].to_s == "client"
                 params[:id]
-              else 
-                "databag" 
-              end               
+              else
+                "databag"
+              end
       @results = @results - @results.last(2)
       @results.each do |result|
         result.delete(nil)
@@ -56,7 +56,7 @@ class Search < Application
       @_message = { :error => "Unable to find the #{params[:id]}. (#{$!})" }
       @search_indexes = @s.list_indexes
       render :index
-    end  
+    end
   end
-  
+
 end

data/app/helpers/application_helper.rb

@@ -4,9 +4,43 @@ require 'chef-server-webui/version'
 module Merb
   module ApplicationHelper
 
+    ROLE_STR = "role"
+    RECIPE_STR = "recipe"
+
+
     def chef_version
       ::ChefServerWebui::VERSION
     end
 
+    def class_for_run_list_item(item)
+      case item.type.to_s
+      when ROLE_STR
+        'ui-state-highlight'
+      when RECIPE_STR
+        'ui-state-default'
+      else
+        raise ArgumentError, "Cannot generate UI class for #{item.inspect}"
+      end
+    end
+
+    def display_run_list_item(item)
+      case item.type.to_s
+      when ROLE_STR
+        item.name
+      when RECIPE_STR
+        # webui not sophisticated enough for versioned recipes
+        # "#{item.name}@#{item.version}"
+        item.name
+      else
+        raise ArgumentError, "can't generate display string for #{item.inspect}"
+      end
+    end
+
+    def nav_link_item(title, dest)
+      name = title.gsub(/ /, "").downcase
+      klass = controller_name == name ? 'class="active"' : ""
+      link = link_to(title, url(dest))
+      "<li #{klass}>#{link}</li>"
+    end
   end
 end

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

@@ -0,0 +1,7 @@
+- unless @manifest[cookbook_part].empty?
+  %h4.head= link_to(cookbook_part, "JavaScript:void(0);")
+  .files
+    - @manifest[cookbook_part].each do |f|
+      .head= link_to(File.basename(f["name"]), "JavaScript:void(0);")
+      .code
+        %pre.ruby= highlight_content(f["url"], type)

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

@@ -1,12 +1,27 @@
 .block#block-tables
   .content
-    %h2.title Cookbooks
+    %h2.title
+      Cookbooks
     .inner
-      %table.table
+      %table.table#cookbook_version_table
         %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] })
+            %th Cookbook
+            %th Latest Version
+            %th Other Versions
+        %tbody.cookbook_versions
+          - @cl.keys.sort.each do |cookbook|
+            - versions = @cl[cookbook]
+            %tr
+              %td= cookbook
+              %td
+                %ul.cookbook_versions{ :id => "#{cookbook}_versions" }
+                  - versions[0..4].each_with_index do |v, i|
+                    - klass = i > 0 ? "other_version" : "latest_version"
+                    %li{ :class => klass }
+                      = link_to(v["version"], v["url"])
+                - if versions.length > 5
+                  = all_versions_link(cookbook)
+              %td.show_more
+                = versions.length > 1 ? more_versions_link(cookbook) : ""
+= js_include_tag "cookbook_versions"

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

@@ -1,56 +1,14 @@
-%script{:type=>"text/javascript", :src => "/javascripts/drop_down_menu.js"}
 .block#block-text
   .content
     %h2
       .title
-        = "Cookbook: #{h @manifest["name"]}"
-        - unless @other_versions.nil? || @other_versions.empty?    
-          %select{:name => "choice", :onchange => "jump(this)", :size => "1"}
-            %option{:value => ""} Other Versions
-            %option{:value => ""} --------------
-            - @other_versions.each do |v|
-              %option{:value => url(:show_specific_version_cookbook, :cookbook_id => @cookbook_id, :cb_version => v)} "#{v}"
+        = "#{@cookbook_id}"
+        %select{:name => "choice", :onchange => "jump(this)", :size => "1"}
+          - @versions.each do |version|
+            - selected = @version == version
+            %option{:value => cookbook_link(version), :selected => selected }
+              = version
     .inner
       .accordion
-        - unless @manifest["libraries"].empty?
-          %h2.head= link_to "Library Files", "JavaScript:void(0);"
-          .files
-            - @manifest["libraries"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])
-        - unless @manifest["attributes"].empty?
-          %h2.head= link_to "Attribute Files", "JavaScript:void(0);"
-          .files
-            - @manifest["attributes"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])
-        - unless @manifest["definitions"].empty?
-          %h2.head= link_to "Definition Files", "JavaScript:void(0);"
-          .files
-            - @manifest["definitions"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])
-        - unless @manifest["recipes"].empty?
-          %h2.head= link_to "Recipe Files", "JavaScript:void(0);"
-          .files
-            - @manifest["recipes"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])
-        - unless @manifest["templates"].empty?
-          %h2.head= link_to "Template Files", "JavaScript:void(0);"
-          .files
-            - @manifest["templates"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])
-        - unless @manifest["files"].empty?
-          %h2.head= link_to "Cookbook Files", "JavaScript:void(0);"
-          .files
-            - @manifest["files"].each do |f|
-              .code
-                %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre= show_plain_file(f["url"])
+        - cookbook_parts.each do |(part, type)|
+          = partial('cookbook_content', :cookbook_part => part, :type => type)