chef-server-webui 0.9.0.a4 → 0.9.0.a6

data/app/controllers/application.rb

@@ -209,19 +209,15 @@ class Application < Merb::Controller
     count
   end
 
-  def syntax_highlight(code)
-    tokens = File.exists?(code) ? CodeRay.scan_file(code, :ruby) : CodeRay.scan(code, :ruby)
-    CodeRay.encode_tokens(tokens, :span)
-  end
-
-  def get_file(uri)
+  def syntax_highlight(file_url)
+    Chef::Log.debug("fetching file from '#{file_url}' for highlighting")
     r = Chef::REST.new(Chef::Config[:chef_server_url])
-    content = r.get_rest(uri)
-    a = Tempfile.new("cookbook_temp_file")
-    File.open(a.path, 'w'){|f| f.write(content)}
-    path = a.path
-    a.close
-    path
+    highlighted_file = nil
+    r.fetch(file_url) do |tempfile|
+      tokens = CodeRay.scan_file(tempfile.path, :ruby)
+      highlighted_file = CodeRay.encode_tokens(tokens, :span)
+    end
+    highlighted_file
   end
 
   def str_to_bool(str)
@@ -240,21 +236,7 @@ class Application < Merb::Controller
 
   def get_available_recipes
     r = Chef::REST.new(Chef::Config[:chef_server_url])
-    result = Array.new
-    cookbooks = r.get_rest("cookbooks")
-    cookbooks.keys.sort.each do |key|
-      cb = r.get_rest(cookbooks[key])
-      cb["recipes"].each do |recipe|
-        recipe["name"] =~ /(.+)\.rb/
-        r_name = $1;
-        if r_name == "default"
-          result << key
-        else
-          result << "#{key}::#{r_name}"
-        end
-      end
-    end
-    result
+    r.get_rest('cookbooks/_recipes')
   end
 
   def convert_newline_to_br(string)

data/app/controllers/cookbooks.rb

@@ -18,11 +18,12 @@
 # limitations under the License.
 #
 
-require 'chef' / 'cookbook_loader'
+require 'chef/cookbook_loader'
+require 'chef/cookbook_version'
 
 class Cookbooks < Application
   
-  provides :html, :json
+  provides :html
   before :login_required
   before :params_helper
   
@@ -58,6 +59,8 @@ class Cookbooks < Application
       # by default always show the largest version number (assuming largest means most recent)
       @other_versions = versions - [version]
       raise NotFound unless @cookbook
+
+      @manifest = @cookbook.manifest
       display @cookbook
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")

data/app/controllers/nodes.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef' / 'node'
+require 'chef/node'
 
 class Nodes < Application
   
@@ -29,7 +29,9 @@ class Nodes < Application
   def index
     begin
       node_hash = Chef::Node.list
-      @node_list = node_hash.keys.sort_by {|a,b| node_hash[a] <=> node_hash[b]}
+      require 'pp'
+      pp node_hash
+      @node_list = node_hash.keys.sort
     rescue => e
       Chef::Log.error("#{e}\n#{e.backtrace.join("\n")}")
       @_message = {:error => "Could not list nodes"}

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

@@ -3,7 +3,7 @@
   .content
     %h2
       .title
-        = "Cookbook: #{h @cookbook.manifest["name"]}"
+        = "Cookbook: #{h @manifest["name"]}"
         - unless @other_versions.nil? || @other_versions.empty?    
           %select{:name => "choice", :onchange => "jump(this)", :size => "1"}
             %option{:value => ""} Other Versions
@@ -12,38 +12,38 @@
               %option{:value => url(:show_specific_version_cookbook, :cookbook_id => @cookbook_id, :cb_version => v)} "#{v}"
     .inner
       .accordion
-        - unless @cookbook.manifest["libraries"].empty?
+        - unless @manifest["libraries"].empty?
           %h2.head= link_to "Library Files", "JavaScript:void(0);"
           .files
-            - @cookbook.manifest["libraries"].each do |f|
+            - @manifest["libraries"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
-        - unless @cookbook.manifest["attributes"].empty?
+                %pre.ruby= syntax_highlight(f["url"])
+        - unless @manifest["attributes"].empty?
           %h2.head= link_to "Attribute Files", "JavaScript:void(0);"
           .files
-            - @cookbook.manifest["attributes"].each do |f|
+            - @manifest["attributes"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
-        - unless @cookbook.manifest["definitions"].empty?
+                %pre.ruby= syntax_highlight(f["url"])
+        - unless @manifest["definitions"].empty?
           %h2.head= link_to "Definition Files", "JavaScript:void(0);"
           .files
-            - @cookbook.manifest["definitions"].each do |f|
+            - @manifest["definitions"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
-        - unless @cookbook.manifest["recipes"].empty?
+                %pre.ruby= syntax_highlight(f["url"])
+        - unless @manifest["recipes"].empty?
           %h2.head= link_to "Recipe Files", "JavaScript:void(0);"
           .files
-            - @cookbook.manifest["recipes"].each do |f|
+            - @manifest["recipes"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))
-        - unless @cookbook.manifest["templates"].empty?
+                %pre.ruby= syntax_highlight(f["url"])
+        - unless @manifest["templates"].empty?
           %h2.head= link_to "Template Files", "JavaScript:void(0);"
           .files
-            - @cookbook.manifest["templates"].each do |f|
+            - @manifest["templates"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(get_file(f["uri"]))   
+                %pre.ruby= syntax_highlight(f["url"])   

data/bin/chef-server-webui

@@ -27,21 +27,12 @@ require "rubygems"
 require "merb-core"
 
 # Load chef and chef-server-api from source rather than gem, if present
-$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib/chef'))
+$:.unshift(File.expand_path(File.dirname(__FILE__) + '/../../chef/lib'))
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 require 'chef'
 require 'chef-server-webui'
 
-# Ensure the chef gem we load is the same version as the chef server
-unless defined?(Chef)
-  gem "chef", "=" + CHEF_SERVER_WEBUI_VERSION
-  require 'chef'  
-end
-
-#Dir.chdir File.join(File.dirname(__FILE__),"..")
-#__DIR__ = Dir.getwd
-
 if ARGV[0] && ARGV[0] =~ /^[^-]/
   ARGV.push "-H"
 end 

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

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '0.9.0.a4'
+  VERSION = '0.9.0.a6'
 end

data/public/stylesheets/chef.css

@@ -51,22 +51,27 @@ dl dt { font-weight: bold; }
 
 div.sortable {
   height: 200px;
-  width: 225px;
+  width: 350px;
   margin-right: 10px;
   border: 1px solid black;
-  overflow: scroll;
+  overflow-y: scroll;
   background: #777777;
 }
 
 div.sortable.run-list {
   height: 430px;
-  width: 225px;
+  width: 350px;
   margin-right: 10px;
   border: 1px solid black;
-  overflow: scroll;
+  overflow-y: scroll;
   background: #777777;
 }
 
+div.run-list ul.ui-sortable#for_node, div.run-list ul.ui-sortable#for_role {
+  min-height: 420px;
+}
+
+
 div.clear {
   clear: left;
 }
@@ -125,9 +130,24 @@ div.editor {
   border: 1px solid black;
 }
 
-#node_available_roles, #node_available_recipes, #for_node, #for_role, #available_recipes { list-style-type: none; margin: 0; padding: 0; float: left; margin-right: 10px; background: #eee; padding: 5px; width: 200px;}
+#node_available_roles, #node_available_recipes, #for_node, #for_role, #available_recipes { 
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  float: left;
+  margin-right: 10px; 
+  background: #eee; 
+  padding: 5px; 
+  width: 325px;
+  min-height:200px;
+}
 
-#node_available_roles li, #node_available_recipes li, #for_node li, #for_role li, #available_recipes li { margin: 0 5px 5px 5px; padding: 5px; width: 175px; }
+#node_available_roles li, #node_available_recipes li, #for_node li, #for_role li, #available_recipes li { 
+  margin: 0 5px 5px 5px; 
+  padding: 5px; 
+  width: 310px; 
+  overflow:hidden;
+}
 
 #sidebar_block {
   display: none;

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 0
-  - a4
-  version: 0.9.0.a4
+  - a6
+  version: 0.9.0.a6
 platform: ruby
 authors: 
 - Opscode
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -07:00
+date: 2010-06-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency