chef-server 0.7.16 → 0.8.2

data/bin/chef-server

@@ -26,8 +26,9 @@
 require "rubygems"
 require "merb-core"
 
-[ 'chef', 'chef-server-slice' ].each do |lib|
-  library = File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb")
+[ 'chef', 'chef-server-api' ].each do |lib|
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")))
+  library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb"))
   require library if File.exists?(library)
 end
 
@@ -50,7 +51,7 @@ if ARGV[0] && ARGV[0] =~ /^[^-]/
   ARGV.push "-H"
 end 
 unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
-  ARGV.push *%w[-a mongrel]
+  ARGV.push *%w[-a thin]
 end
 ARGV.push *[ "-I", File.join(__DIR__, "config", "init.rb") ]
 ARGV.push *[ "-m", __DIR__]
@@ -66,4 +67,7 @@ else
   )
 end
 
+Chef::Log.init(Chef::Config[:log_location]) 
+Chef::Log.level = Chef::Config[:log_level]
+
 Merb.start

data/bin/chef-server-webui

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+#
+# ./chef-server - Serving up piping hot infrastructure!
+#
+# Author:: Adam Jacob (<adam@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.
+
+# Based on the 'merb' command, by Ezra
+
+# Add chef and chef-server-slice lib dirs to the load path
+# Load chef and chef-server slice from source rather than gem, if present
+
+require "rubygems"
+require "merb-core"
+
+[ 'chef', 'chef-server-webui' ].each do |lib|
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "lib")))
+  library = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", lib, "lib", "#{lib}.rb"))
+  require library if File.exists?(library)
+end
+
+ObjectSpace.each_object(Gem::Specification) do |gem|
+  next unless gem.name == "chef-server"
+  CHEF_SERVER_VERSION = gem.version.to_s
+  break
+end
+
+# Ensure the chef gem we load is the same version as the chef server
+unless defined?(Chef)
+  gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
+  require 'chef'  
+end
+
+Dir.chdir File.join(File.dirname(__FILE__),"..")
+__DIR__ = Dir.getwd
+
+if ARGV[0] && ARGV[0] =~ /^[^-]/
+  ARGV.push "-H"
+end 
+unless %w[-a --adapter -i --irb-console -r --script-runner].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-a thin]
+end
+unless %w[-p --port].any? { |o| ARGV.index(o) }
+  ARGV.push *%w[-p 4040]
+end
+ARGV.push *[ "-I", File.join(__DIR__, "config", "init-webui.rb") ]
+ARGV.push *[ "-m", __DIR__]
+
+if index = ARGV.index("-C")
+  config = ARGV[index+1]
+  ARGV.delete("-C")
+  ARGV.delete(config)
+  Chef::Config.from_file(File.expand_path(config))
+else
+  Chef::Config.from_file(
+    File.join("/etc", "chef", "server.rb")
+  )
+end
+
+Chef::Log.init(Chef::Config[:log_location]) 
+Chef::Log.level = Chef::Config[:log_level]
+
+Merb.start

data/config-webui.ru

@@ -0,0 +1,25 @@
+require 'rubygems'
+require 'merb-core'
+require 'chef'
+
+Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
+
+Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
+                   :environment => 'production',
+                   :fork_for_class_load => false,
+                   :init_file => File.dirname(__FILE__) / "config/init-webui.rb")
+Merb.environment = Merb::Config[:environment]
+Merb.root = Merb::Config[:merb_root]
+Merb::BootLoader.run
+
+Merb::Slices.config.each do |slice_module, config|
+  slice_module = Object.full_const_get(slice_module.to_s.camel_case) if slice_module.class.in?(String, Symbol)
+  slice_module.send("public_components").each do |component|
+    slice_static_dir = slice_module.send("dir_for", :public)
+    use Merb::Rack::Static, slice_static_dir
+  end
+end
+
+run Merb::Rack::Application.new
+
+

data/config.ru

@@ -4,8 +4,10 @@ require 'chef'
 
 Chef::Config.from_file(File.join("/etc", "chef", "server.rb"))
 
-Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)),
-                   :environment => ENV['RACK_ENV'], :init_file => File.dirname(__FILE__) / "config/init.rb")
+Merb::Config.setup(:merb_root   => File.expand_path(File.dirname(__FILE__)), 
+                   :environment => 'production',
+                   :fork_for_class_load => false,
+                   :init_file => File.dirname(__FILE__) / "config/init.rb")
 Merb.environment = Merb::Config[:environment]
 Merb.root = Merb::Config[:merb_root]
 Merb::BootLoader.run

data/config/dependencies-webui.rb

@@ -0,0 +1,27 @@
+# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
+merb_gems_version = "> 1.0"
+
+%w{chef chef-server-webui}.each do |dep|
+  $:.unshift(File.expand_path(File.join(File.dirname(__FILE__), "..", "..", dep, "lib")))
+end
+
+dependency "chef", :immediate=>true unless defined?(Chef)
+
+begin
+  require 'chef'
+  require 'chef-server-webui'
+rescue
+end
+  
+# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
+dependency "merb-core", merb_gems_version 
+dependency "merb-slices", merb_gems_version  
+dependency "merb-haml", merb_gems_version
+dependency "merb-assets", merb_gems_version
+dependency "merb-helpers", merb_gems_version
+if defined?(CHEF_SERVER_VERSION)
+  dependency "chef-server-webui", CHEF_SERVER_VERSION unless defined?(ChefServerWebui)
+else
+  dependency "chef-server-webui" unless defined?(ChefServerWebui)
+end
+

data/config/dependencies.rb

@@ -1,13 +1,24 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
 merb_gems_version = "> 1.0"
 
+%w{chef chef-server-api chef-solr}.each do |dep|
+  $:.unshift(File.join(File.dirname(__FILE__), "..", "..", dep, "lib"))
+end
+
+begin
+  require 'chef'
+  require 'chef-server-api'
+rescue
+end
+  
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-core", merb_gems_version 
 dependency "merb-assets", merb_gems_version  
 dependency "merb-helpers", merb_gems_version 
 dependency "merb-slices", merb_gems_version  
 if defined?(CHEF_SERVER_VERSION)
-  dependency "chef-server-slice", CHEF_SERVER_VERSION unless defined?(ChefServerSlice)
+  dependency "chef-server-api", CHEF_SERVER_VERSION unless defined?(ChefServerApi)
 else
-  dependency "chef-server-slice" unless defined?(ChefServerSlice)
+  dependency "chef-server-api" unless defined?(ChefServerApi)
 end
+

data/config/environments/development.rb

@@ -4,7 +4,6 @@ Merb::Config.use { |c|
   c[:reload_templates] = true
   c[:reload_classes] = true
   c[:reload_time] = 0.5
-  c[:ignore_tampered_cookies] = true
   c[:log_auto_flush ] = true
   c[:log_level] = :debug
   c[:log_stream] = Chef::Config[:log_location]

data/config/environments/production.rb

@@ -2,6 +2,7 @@ Merb.logger.info("Loaded PRODUCTION Environment...")
 Merb::Config.use { |c|
   c[:exception_details] = false
   c[:reload_classes] = false
+  c[:log_auto_flush] = true
   c[:log_level] = Chef::Config[:log_level]
   c[:log_stream] = Chef::Config[:log_location]
   # or redirect logger using IO handle

data/config/init-webui.rb

@@ -0,0 +1,34 @@
+# Go to http://wiki.merbivore.com/pages/init-rb
+
+require 'config/dependencies-webui.rb'
+unless defined?(Chef)
+  gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
+  require 'chef'  
+end
+
+File.umask Chef::Config[:umask]
+
+use_test :rspec
+use_template_engine :haml
+
+Merb::Config.use do |c|
+  c[:use_mutex] = false
+  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[:log_level] = Chef::Config[:log_level]
+  if Chef::Config[:log_location].kind_of?(String)
+    c[:log_file] = Chef::Config[:log_location]
+  end
+end
+ 
+Merb::BootLoader.before_app_loads do
+  # This will get executed after dependencies have been loaded but before your app's classes have loaded.
+end
+ 
+Merb::BootLoader.after_app_loads do
+  # This will get executed after your app's classes have been loaded.  
+  OpenID::Util.logger = Merb.logger
+end
+

data/config/init.rb

@@ -1,5 +1,5 @@
 # Go to http://wiki.merbivore.com/pages/init-rb
- 
+
 require 'config/dependencies.rb'
 unless defined?(Chef)
   gem "chef", "=" + CHEF_SERVER_VERSION if CHEF_SERVER_VERSION
@@ -13,13 +13,11 @@ use_template_engine :haml
 
 Merb::Config.use do |c|
   c[:use_mutex] = 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] = false
+  c[:fork_for_class_load] = false
   c[:log_level] = Chef::Config[:log_level]
-  c[:log_stream] = Chef::Config[:log_location]
+  if Chef::Config[:log_location].kind_of?(String)
+    c[:log_file] = Chef::Config[:log_location]
+  end
 end
  
 Merb::BootLoader.before_app_loads do
@@ -27,6 +25,6 @@ Merb::BootLoader.before_app_loads do
 end
  
 Merb::BootLoader.after_app_loads do
-  # This will get executed after your app's classes have been loaded.
-  OpenID::Util.logger = Merb.logger
+  # This will get executed after your app's classes have been loaded.  OpenID::Util.logger = Merb.logger
 end
+

data/config/rack.rb

@@ -1,3 +1,5 @@
+$: << File.join(File.dirname(__FILE__))
+
 # use PathPrefix Middleware if :path_prefix is set in Merb::Config
 if prefix = ::Merb::Config[:path_prefix]
   use Merb::Rack::PathPrefix, prefix

data/config/router.rb

@@ -29,16 +29,11 @@ Merb.logger.info("Compiling routes...")
 Merb::Router.prepare do
   # RESTful routes
   # resources :posts
-  
+ 
   # Adds the required routes for merb-auth using the password slice
   # slice(:merb_auth_slice_password, :name_prefix => nil, :path_prefix => "")
-  slice(:chef_server_slice)
-  # This is the default route for /:controller/:action/:id
-  # This is fine for most cases.  If you're heavily using resource-based
-  # routes, you may want to comment/remove this line to prevent
-  # clients from calling your create or destroy actions with a GET
-  default_routes
-  
-  # Change this for your home page to be available at /
-  # match('/').to(:controller => 'whatever', :action =>'index')
+
+  slice(:chef_server_api, :path_prefix => "") if defined?(ChefServerApi)
+  slice(:chef_server_webui, :path_prefix => "") if defined?(ChefServerWebui)
+
 end

data/lib/tasks/package.rake

@@ -13,14 +13,13 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
   
-  %w{stomp stompserver ferret
-    merb-core merb-haml merb-assets
-    merb-helpers mongrel haml
+  %w{ merb-core merb-haml merb-assets
+    merb-helpers thin haml
     ruby-openid json coderay}.each { |gem| s.add_dependency gem }
   
   s.bindir       = "bin"
-  s.executables  = %w( chef-server chef-indexer )  
-  s.files = %w(LICENSE README.rdoc config.ru) + Dir.glob("{app,bin,config,lib,public}/**/*")
+  s.executables  = %w( chef-server chef-server-webui )  
+  s.files = %w(LICENSE README.rdoc config.ru config-webui.ru) + Dir.glob("{app,bin,config,lib,public}/**/*")
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: chef-server
 version: !ruby/object:Gem::Version 
-  version: 0.7.16
+  prerelease: false
+  segments: 
+  - 0
+  - 8
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Opscode
@@ -9,134 +14,122 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-22 00:00:00 -08:00
+date: 2010-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: stomp
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: stompserver
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: ferret
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 - !ruby/object:Gem::Dependency 
   name: merb-core
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: merb-haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: merb-assets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: merb-helpers
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mongrel
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: thin
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-openid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: json
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: coderay
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id009
 description: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.
 email: chef@opscode.com
 executables: 
 - chef-server
-- chef-indexer
+- chef-server-webui
 extensions: []
 
 extra_rdoc_files: 
@@ -146,19 +139,22 @@ files:
 - LICENSE
 - README.rdoc
 - config.ru
+- config-webui.ru
 - app/controllers/application.rb
 - app/helpers/global_helpers.rb
 - app/views/exceptions/not_acceptable.html.erb
 - app/views/exceptions/not_found.html.erb
 - app/views/layout/application.html.erb
-- bin/chef-indexer
 - bin/chef-server
+- bin/chef-server-webui
+- config/dependencies-webui.rb
 - config/dependencies.rb
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/rake.rb
 - config/environments/staging.rb
 - config/environments/test.rb
+- config/init-webui.rb
 - config/init.rb
 - config/rack.rb
 - config/router.rb
@@ -186,18 +182,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure.

data/bin/chef-indexer

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-#
-# ./chef-indexer - Run the chef indexer
-#
-# Author:: AJ Christensen (<aj@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.
-
-$: << File.join(File.dirname(__FILE__), "..", "lib")
-
-require 'rubygems'
-require 'chef/application/indexer'
-
-Chef::Application::Indexer.new.run