chef-server-webui 0.9.10.rc.2 → 0.9.10.rc.3

data/app/controllers/application.rb

@@ -29,7 +29,7 @@ class Application < Merb::Controller
   def login_required
    if session[:user]
      begin
-       Chef::WebUIUser.load(session[:user]) rescue (raise NotFound, "Cannot find User #{session[:user]}, maybe it got deleted by an Administrator.")
+       load_session_user
      rescue
        logout_and_redirect_to_login
      else
@@ -41,6 +41,12 @@ class Application < Merb::Controller
    end
   end
 
+  def load_session_user
+    Chef::WebUIUser.load(session[:user])
+  rescue
+    raise NotFound, "Cannot find User #{session[:user]}, maybe it got deleted by an Administrator."
+  end
+
   def cleanup_session
     [:user,:level].each { |n| session.delete(n) }
   end
@@ -214,6 +220,25 @@ class Application < Merb::Controller
     highlighted_file
   end
 
+  def show_plain_file(file_url)
+    Chef::Log.debug("fetching file from '#{file_url}' for highlighting")
+    r = Chef::REST.new(Chef::Config[:chef_server_url])
+    r.fetch(file_url) do |tempfile|
+      if binary?(tempfile.path)
+        return "Binary file not shown"
+      elsif ((File.size(tempfile.path) / (1048576)) > 5)
+        return "File too large to display"
+      else
+        return IO.read(tempfile.path)
+      end
+    end
+  end
+
+  def binary?(file)
+    s = (File.read(file, File.stat(file).blksize) || "")
+    s.empty? || ( s.count( "^ -~", "^\r\n" ).fdiv(s.size) > 0.3 || s.index( "\x00" ))
+  end
+
   def str_to_bool(str)
     str =~ /true/ ? true : false
   end

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

@@ -46,4 +46,11 @@
             - @manifest["templates"].each do |f|
               .code
                 %h4.head= link_to File.basename(f["name"]), "JavaScript:void(0);"
-                %pre.ruby= syntax_highlight(f["url"])   
+                %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"])

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

@@ -1,3 +1,3 @@
 module ChefServerWebui
-  VERSION = '0.9.10.rc.2'
+  VERSION = '0.9.10.rc.3'
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 9
   - 10
   - rc
-  - 2
-  version: 0.9.10.rc.2
+  - 3
+  version: 0.9.10.rc.3
 platform: ruby
 authors: 
 - Opscode
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-08 00:00:00 -07:00
+date: 2010-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency