chef-server-slice 0.7.10 → 0.7.12

data/app/controllers/application.rb

@@ -156,8 +156,12 @@ class ChefServerSlice::Application < Merb::Controller
       files_list = cookbook.definition_files
     when :libraries
       files_list = cookbook.lib_files
+    when :providers
+      files_list = cookbook.provider_files
+    when :resources
+      files_list = cookbook.resource_files
     else
-      raise ArgumentError, "segment must be one of :attributes, :recipes, :definitions or :libraries"
+      raise ArgumentError, "segment must be one of :attributes, :recipes, :definitions, :libraries, :providers, or :resources"
     end
     files_list
   end

data/app/controllers/{cookbook_recipes.rb → cookbook_segment.rb}

@@ -1,7 +1,8 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Christopher Walters (<cw@opscode.com>)
+# Copyright:: Copyright (c) 2009 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,32 +20,28 @@
 
 require 'chef' / 'mixin' / 'checksum'
 
-class ChefServerSlice::CookbookRecipes < ChefServerSlice::Application
+class ChefServerSlice::CookbookSegment < ChefServerSlice::Application
   
   provides :html, :json
+
   before :login_required 
   
   include Chef::Mixin::Checksum
   
-  def load_cookbook_recipes()
-    @recipe_files = load_cookbook_segment(params[:cookbook_id], :recipes)
-  end
-  
   def index
     if params[:id]
       show
     else
-      load_cookbook_recipes()
-      display @recipe_files
+      display load_cookbook_segment(params[:cookbook_id], params[:type])
     end
   end
 
   def show
     only_provides :json
-    load_cookbook_recipes
-    raise NotFound, "Cannot find a suitable recipe file!" unless @recipe_files.has_key?(params[:id])
+    files = load_cookbook_segment(params[:cookbook_id], params[:type])
     
-    to_send = @recipe_files[params[:id]][:file]
+    raise NotFound, "Cannot find a suitable #{params[:type].to_s.singularize} file!" unless files.has_key?(params[:id])
+    to_send = files[params[:id]][:file]
     current_checksum = checksum(to_send)
     Chef::Log.debug("old sum: #{params[:checksum]}, new sum: #{current_checksum}") 
     if current_checksum == params[:checksum]

data/app/controllers/cookbooks.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Christopher Brown (<cb@opscode.com>)
+# Author:: Christopher Walters (<cw@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,7 +23,7 @@ require 'chef' / 'cookbook_loader'
 class ChefServerSlice::Cookbooks < ChefServerSlice::Application
   
   provides :html, :json
-  before :login_required 
+  before :login_required
   
   def index
     @cl = Chef::CookbookLoader.new
@@ -36,28 +37,8 @@ class ChefServerSlice::Cookbooks < ChefServerSlice::Application
     display @cookbook
   end
   
-  def recipe_files
-    node = params.has_key?('node') ? params[:node] : nil 
-    @recipe_files = load_all_files(:recipes, node)
-    display @recipe_files
-  end
-
-  def attribute_files
-    node = params.has_key?('node') ? params[:node] : nil 
-    @attribute_files = load_all_files(:attributes, node)
-    display @attribute_files
-  end
-  
-  def definition_files
-    node = params.has_key?('node') ? params[:node] : nil 
-    @definition_files = load_all_files(:definitions, node)
-    display @definition_files
-  end
-  
-  def library_files
-    node = params.has_key?('node') ? params[:node] : nil 
-    @lib_files = load_all_files(:libraries, node)
-    display @lib_files
+  def files
+    display load_all_files(params[:type], params[:node])
   end
   
 end

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

@@ -31,10 +31,25 @@
               .code
                 %h4.head= link_to File.basename(f), "#"
                 %pre.ruby= syntax_highlight(f)
+        - unless @cookbook.resource_files.empty?
+          %h2.head= link_to "Resource Files", "#"
+          .files
+            - @cookbook.resource_files.each do |f|
+              .code
+                %h4.head= link_to File.basename(f), "#"
+                %pre.ruby= syntax_highlight(f)
+        - unless @cookbook.provider_files.empty?
+          %h2.head= link_to "Provider Files", "#"
+          .files
+            - @cookbook.provider_files.each do |f|
+              .code
+                %h4.head= link_to File.basename(f), "#"
+                %pre.ruby= syntax_highlight(f)
         - unless @cookbook.template_files.empty?
           %h2.head= link_to "Template Files", "#"
           .files
             - @cookbook.template_files.each do |f|
+              - rel = f.split('templates/',2)[1]
               .code
-                %h4.head= link_to File.basename(f), "#"
+                %h4.head= link_to rel, "#"
                 %pre.ruby= syntax_highlight(f)

data/lib/chef-server-slice.rb

@@ -94,16 +94,20 @@ if defined?(Merb::Plugins)
       scope.match("/search/:search_id/entries/:id", :method => 'post').to(:controller => "search_entries", :action => "update")
       scope.match("/search/:search_id/entries/:id", :method => 'delete').to(:controller => "search_entries", :action => "destroy")
 
-      scope.match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "attribute_files")
-      scope.match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "recipe_files")
-      scope.match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "definition_files")
-      scope.match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "library_files")
+      scope.match("/cookbooks/_attribute_files").to(:controller => "cookbooks", :action => "files", :type => :attributes)
+      scope.match("/cookbooks/_recipe_files").to(:controller => "cookbooks", :action => "files", :type => :recipes)
+      scope.match("/cookbooks/_definition_files").to(:controller => "cookbooks", :action => "files", :type => :definitions)
+      scope.match("/cookbooks/_library_files").to(:controller => "cookbooks", :action => "files", :type => :libraries)
+      scope.match("/cookbooks/_provider_files").to(:controller => "cookbooks", :action => "files", :type => :providers)
+      scope.match("/cookbooks/_resource_files").to(:controller => "cookbooks", :action => "files", :type => :resources)
 
       scope.match("/cookbooks/:cookbook_id/templates", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_templates", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_libraries", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_definitions", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_recipes", :action => "index")
-      scope.match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_attributes", :action => "index")
+      scope.match("/cookbooks/:cookbook_id/libraries", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :libraries)
+      scope.match("/cookbooks/:cookbook_id/definitions", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :definitions)
+      scope.match("/cookbooks/:cookbook_id/providers", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :providers)
+      scope.match("/cookbooks/:cookbook_id/resources", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :resources)
+      scope.match("/cookbooks/:cookbook_id/recipes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :recipes)
+      scope.match("/cookbooks/:cookbook_id/attributes", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_segment", :action => "index", :type => :attributes)
       scope.match("/cookbooks/:cookbook_id/files", :cookbook_id => /[\w\.]+/).to(:controller => "cookbook_files", :action => "index")
 
       scope.resources :cookbooks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server-slice
 version: !ruby/object:Gem::Version 
-  version: 0.7.10
+  version: 0.7.12
 platform: ruby
 authors: 
 - Opscode
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-16 00:00:00 +12:00
+date: 2009-10-21 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -155,11 +155,8 @@ files:
 - LICENSE
 - README.rdoc
 - app/controllers/application.rb
-- app/controllers/cookbook_attributes.rb
-- app/controllers/cookbook_definitions.rb
 - app/controllers/cookbook_files.rb
-- app/controllers/cookbook_libraries.rb
-- app/controllers/cookbook_recipes.rb
+- app/controllers/cookbook_segment.rb
 - app/controllers/cookbook_templates.rb
 - app/controllers/cookbooks.rb
 - app/controllers/exceptions.rb

data/app/controllers/cookbook_attributes.rb

@@ -1,59 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-require 'chef' / 'mixin' / 'checksum'
-
-class ChefServerSlice::CookbookAttributes < ChefServerSlice::Application
-  
-  provides :html, :json
-
-  before :login_required 
-  
-  include Chef::Mixin::Checksum
-  
-  def load_cookbook_attributes()
-    @attribute_files = load_cookbook_segment(params[:cookbook_id], :attributes)
-  end
-  
-  def index
-    if params[:id]
-      show
-    else
-      load_cookbook_attributes()
-      display @attribute_files
-    end
-  end
-
-  def show
-    only_provides :json
-    load_cookbook_attributes
-    raise NotFound, "Cannot find a suitable attribute file!" unless @attribute_files.has_key?(params[:id])
-    to_send = @attribute_files[params[:id]][:file]
-    current_checksum = checksum(to_send)
-    Chef::Log.debug("old sum: #{params[:checksum]}, new sum: #{current_checksum}") 
-    if current_checksum == params[:checksum]
-      display "File #{to_send} has not changed", :status => 304
-    else
-      send_file(to_send)
-    end
-  end
-  
-end
-
-

data/app/controllers/cookbook_definitions.rb

@@ -1,60 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-require 'chef' / 'mixin' / 'checksum'
-
-class ChefServerSlice::CookbookDefinitions < ChefServerSlice::Application
-  
-  provides :html, :json
-
-  before :login_required 
-  
-  include Chef::Mixin::Checksum
-  
-  def load_cookbook_definitions()
-    @definition_files = load_cookbook_segment(params[:cookbook_id], :definitions)
-  end
-  
-  def index
-    if params[:id]
-      show
-    else
-      load_cookbook_definitions()
-      display @definition_files
-    end
-  end
-
-  def show
-    only_provides :json
-    load_cookbook_definitions
-    raise NotFound, "Cannot find a suitable definition file!" unless @definition_files.has_key?(params[:id])
-    
-    to_send = @definition_files[params[:id]][:file]
-    current_checksum = checksum(to_send)
-    Chef::Log.debug("Old sum: #{params[:checksum]}, New sum: #{current_checksum}") 
-    if current_checksum == params[:checksum]
-      display "File #{to_send} has not changed", :status => 304
-    else
-      send_file(to_send)
-    end
-  end
-  
-end
-
-

data/app/controllers/cookbook_libraries.rb

@@ -1,60 +0,0 @@
-#
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Christopher Brown (<cb@opscode.com>)
-# Copyright:: Copyright (c) 2008 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.
-#
-
-require 'chef' / 'mixin' / 'checksum'
-require 'chef' / 'cookbook_loader'
-
-class ChefServerSlice::CookbookLibraries < ChefServerSlice::Application
-  
-  provides :html, :json
-  before :login_required 
-  
-  include Chef::Mixin::Checksum
-  
-  def load_cookbook_libs()
-    @lib_files = load_cookbook_segment(params[:cookbook_id], :libraries)
-  end
-  
-  def index
-    if params[:id]
-      show
-    else
-      load_cookbook_libs()
-      display @lib_files
-    end
-  end
-
-  def show
-    only_provides :json
-    load_cookbook_libs
-    raise NotFound, "Cannot find a suitable library file!" unless @lib_files.has_key?(params[:id])
-    
-    to_send = @lib_files[params[:id]][:file]
-    current_checksum = checksum(to_send)
-    Chef::Log.debug("Old sum: #{params[:checksum]}, New sum: #{current_checksum}") 
-    if current_checksum == params[:checksum]
-      display "File #{to_send} has not changed", :status => 304
-    else
-      send_file(to_send)
-    end
-  end
-  
-end
-
-