Merge branch 'CHEF-1801'

11 files changed, 143 insertions, 143 deletions

diff --git a/.gitignore b/.gitignore
index 266aca8256..bc36c8f045 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ chef-server-api/pkg
 chef/log
 chef/rdoc
 chef-server/log
-chef-solr/chef-solr.gemspec
 log
 couchdb.stderr
 couchdb.stdout
diff --git a/chef-server-api/Rakefile b/chef-server-api/Rakefile
index c569e15e21..7a9a5f6664 100644
--- a/chef-server-api/Rakefile
+++ b/chef-server-api/Rakefile
@@ -11,42 +11,8 @@ rescue LoadError
 end
 
 GEM_NAME = "chef-server-api"
-AUTHOR = "Opscode"
-EMAIL = "chef@opscode.com"
-HOMEPAGE = "http://wiki.opscode.com/display/chef"
-SUMMARY = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = ChefServerApi::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru", "development.ru" ]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-
-  s.add_dependency "merb-core", "~> 1.1.0"
-  s.add_dependency "merb-assets", "~> 1.1.0"
-  s.add_dependency "merb-helpers", "~> 1.1.0"
-  s.add_dependency "merb-param-protection", "~> 1.1.0"
-
-  s.add_dependency "mixlib-authentication", '>= 1.1.3'
-
-  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
-
-  s.add_dependency "uuidtools", "~> 2.1.1"
-
-  s.add_dependency "thin"
-  
-  s.bindir       = "bin"
-  s.executables  = %w( chef-server )
-
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")
-end
+spec = eval(File.read("chef-server-api.gemspec"))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
diff --git a/chef-server-api/chef-server-api.gemspec b/chef-server-api/chef-server-api.gemspec
new file mode 100644
index 0000000000..09336dbbf6
--- /dev/null
+++ b/chef-server-api/chef-server-api.gemspec
@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/lib/chef-server-api/version'
+
+Gem::Specification.new do |s|
+  s.name = "chef-server-api"
+  s.version = ChefServerApi::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru", "development.ru" ]
+  s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
+  s.description = s.summary
+  s.author = "Opscode"
+  s.email = "chef@opscode.com"
+  s.homepage = "http://wiki.opscode.com/display/chef"
+
+  s.add_dependency "merb-core", "~> 1.1.0"
+  s.add_dependency "merb-assets", "~> 1.1.0"
+  s.add_dependency "merb-helpers", "~> 1.1.0"
+  s.add_dependency "merb-param-protection", "~> 1.1.0"
+
+  s.add_dependency "mixlib-authentication", '>= 1.1.3'
+
+  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
+
+  s.add_dependency "uuidtools", "~> 2.1.1"
+
+  s.add_dependency "thin"
+
+  s.bindir       = "bin"
+  s.executables  = %w( chef-server )
+
+  s.require_path = 'lib'
+  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{config,lib,spec,app,public,stubs}/**/*")
+end
diff --git a/chef-server-webui/Rakefile b/chef-server-webui/Rakefile
index d9472217b7..82971c4093 100644
--- a/chef-server-webui/Rakefile
+++ b/chef-server-webui/Rakefile
@@ -16,34 +16,7 @@ EMAIL = "chef@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/chef"
 SUMMARY = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = ChefServerWebui::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru" ]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-
-  s.add_dependency "merb-core", "~> 1.1.0"
-  s.add_dependency "merb-assets", "~> 1.1.0"
-  s.add_dependency "merb-helpers", "~> 1.1.0"
-  s.add_dependency "merb-haml", "~> 1.1.0"
-  s.add_dependency "merb-param-protection", "~> 1.1.0"
-
-  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
-
-  %w{thin haml ruby-openid coderay}.each { |g| s.add_dependency g}
-
-  s.bindir       = "bin"
-  s.executables  = %w( chef-server-webui )
-  
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc Rakefile config.ru) + Dir.glob("{bin,config,lib,spec,app,public,stubs}/**/*")
-end
+spec = eval(File.read("chef-server-webui.gemspec"))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
diff --git a/chef-server-webui/chef-server-webui.gemspec b/chef-server-webui/chef-server-webui.gemspec
new file mode 100644
index 0000000000..8cf1a74601
--- /dev/null
+++ b/chef-server-webui/chef-server-webui.gemspec
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/lib/chef-server-webui/version'
+
+Gem::Specification.new do |s|
+  s.name = "chef-server-webui"
+  s.version = ChefServerWebui::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE", "config.ru" ]
+  s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
+  s.description = s.summary
+  s.author = "Opscode"
+  s.email = "chef@opscode.com"
+  s.homepage = "http://wiki.opscode.com/display/chef"
+
+  s.add_dependency "merb-core", "~> 1.1.0"
+  s.add_dependency "merb-assets", "~> 1.1.0"
+  s.add_dependency "merb-helpers", "~> 1.1.0"
+  s.add_dependency "merb-haml", "~> 1.1.0"
+  s.add_dependency "merb-param-protection", "~> 1.1.0"
+
+  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
+
+  %w{thin haml ruby-openid coderay}.each { |g| s.add_dependency g}
+
+  s.bindir       = "bin"
+  s.executables  = %w( chef-server-webui )
+
+  s.require_path = 'lib'
+  s.files = %w(LICENSE README.rdoc Rakefile config.ru) + Dir.glob("{bin,config,lib,spec,app,public,stubs}/**/*")
+end
diff --git a/chef-server/Rakefile b/chef-server/Rakefile
index e3ae7f2dc4..fb3100269a 100644
--- a/chef-server/Rakefile
+++ b/chef-server/Rakefile
@@ -20,30 +20,8 @@ require File.dirname(__FILE__) + '/lib/chef-server/version'
 require 'rake/gempackagetask'
 
 GEM_NAME = "chef-server"
-AUTHOR   = "Opscode"
-EMAIL    = "chef@opscode.com"
-HOMEPAGE = "http://wiki.opscode.com/display/chef"
-SUMMARY  = "A meta-gem to install all server components of the Chef configuration management system"
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM_NAME
-  s.version = ChefServer::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-
-  s.add_dependency "chef-server-api",   "= #{ChefServer::VERSION}"
-  s.add_dependency "chef-server-webui", "= #{ChefServer::VERSION}"
-  s.add_dependency "chef-solr",         "= #{ChefServer::VERSION}"
-
-  s.files = %w(LICENSE README.rdoc Rakefile lib/chef-server.rb lib/chef-server/version.rb)
-  s
-end
+spec = eval(File.read("chef-server.gemspec"))
 
 desc "Install the gem"
 task :install => :package do
diff --git a/chef-server/chef-server.gemspec b/chef-server/chef-server.gemspec
new file mode 100644
index 0000000000..40dd2e2d6f
--- /dev/null
+++ b/chef-server/chef-server.gemspec
@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/lib/chef-server/version'
+
+Gem::Specification.new do |s|
+  s.name = "chef-server"
+  s.version = ChefServer::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.summary = "A meta-gem to install all server components of the Chef configuration management system"
+  s.description = s.summary
+  s.author = "Opscode"
+  s.email = "chef@opscode.com"
+  s.homepage = "http://wiki.opscode.com/display/chef"
+
+  s.add_dependency "chef-server-api",   "= #{ChefServer::VERSION}"
+  s.add_dependency "chef-server-webui", "= #{ChefServer::VERSION}"
+  s.add_dependency "chef-solr",         "= #{ChefServer::VERSION}"
+
+  s.files = %w(LICENSE README.rdoc Rakefile lib/chef-server.rb lib/chef-server/version.rb)
+  s
+end
\ No newline at end of file
diff --git a/chef-solr/Rakefile b/chef-solr/Rakefile
index aa5cbcac29..67c569c731 100644
--- a/chef-solr/Rakefile
+++ b/chef-solr/Rakefile
@@ -24,24 +24,7 @@ require 'rake/gempackagetask'
 
 GEM_NAME = "chef-solr"
 
-spec = Gem::Specification.new do |gem|
-  gem.name = "chef-solr"
-  gem.version = Chef::Solr::VERSION
-  gem.summary = %Q{Search indexing for Chef}
-  gem.email = "adam@opscode.com"
-  gem.homepage = "http://wiki.opscode.com/display/chef"
-  gem.authors = ["Adam Jacob"]
-  gem.add_dependency "libxml-ruby", ">=1.1.3"
-  gem.add_dependency "uuidtools", ">=2.0.0"
-  gem.add_dependency "chef", Chef::Solr::VERSION
-  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  gem.executables = [ 'chef-solr', 'chef-solr-indexer', 'chef-solr-rebuild' ]
-  gem.files = [
-    "README.rdoc",
-    "Rakefile"
-  ]
-  gem.files = %w{ README.rdoc Rakefile LICENSE} + Dir.glob("{bin,lib,solr,spec}/**/*")
-end
+spec = eval(File.read("chef-solr.gemspec"))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
@@ -64,8 +47,6 @@ task :gemspec do
   end
 end
 
-
-
 begin
   require 'spec/rake/spectask'
   Spec::Rake::SpecTask.new(:spec) do |spec|
diff --git a/chef-solr/chef-solr.gemspec b/chef-solr/chef-solr.gemspec
new file mode 100644
index 0000000000..6769513bc3
--- /dev/null
+++ b/chef-solr/chef-solr.gemspec
@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/lib/chef/solr/version'
+
+Gem::Specification.new do |gem|
+  gem.name = "chef-solr"
+  gem.version = Chef::Solr::VERSION
+  gem.summary = %Q{Search indexing for Chef}
+  gem.email = "adam@opscode.com"
+  gem.homepage = "http://wiki.opscode.com/display/chef"
+  gem.authors = ["Adam Jacob"]
+  gem.add_dependency "libxml-ruby", ">=1.1.3"
+  gem.add_dependency "uuidtools", ">=2.0.0"
+  gem.add_dependency "chef", Chef::Solr::VERSION
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  gem.executables = [ 'chef-solr', 'chef-solr-indexer', 'chef-solr-rebuild' ]
+  gem.files = [
+    "README.rdoc",
+    "Rakefile"
+  ]
+  gem.files = %w{ README.rdoc Rakefile LICENSE} + Dir.glob("{bin,lib,solr,spec}/**/*")
+end
diff --git a/chef/Rakefile b/chef/Rakefile
index d06c2e168e..a3a6a6efd5 100644
--- a/chef/Rakefile
+++ b/chef/Rakefile
@@ -24,40 +24,9 @@ require 'rake/gempackagetask'
 require 'rake/rdoctask'
 require './tasks/rspec.rb'
 
-GEM = "chef"
-AUTHOR = "Adam Jacob"
-EMAIL = "adam@opscode.com"
-HOMEPAGE = "http://wiki.opscode.com/display/chef"
-SUMMARY = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
+GEM_NAME = "chef"
 
-spec = Gem::Specification.new do |s|
-  s.name = GEM
-  s.version = Chef::VERSION
-  s.platform = Gem::Platform::RUBY
-  s.has_rdoc = true
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
-  s.summary = SUMMARY
-  s.description = s.summary
-  s.author = AUTHOR
-  s.email = EMAIL
-  s.homepage = HOMEPAGE
-  
-  s.add_dependency "mixlib-config", ">= 1.1.2"
-  s.add_dependency "mixlib-cli", ">= 1.1.0"
-  s.add_dependency "mixlib-log", ">= 1.2.0"
-  s.add_dependency "mixlib-authentication", ">= 1.1.0"
-  s.add_dependency "ohai", ">= 0.5.7"
-
-  s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0"
-  s.add_dependency "bunny", ">= 0.6.0"
-  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
-  %w{erubis extlib moneta highline uuidtools}.each { |gem| s.add_dependency gem }
-  
-  s.bindir       = "bin"
-  s.executables  = %w( chef-client chef-solo knife shef )
-  s.require_path = 'lib'
-  s.files = %w(LICENSE README.rdoc) + Dir.glob("{distro,lib}/**/*")
-end
+spec = eval(File.read("chef.gemspec"))
 
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec
@@ -79,16 +48,16 @@ rescue LoadError
 end
 
 task :install => :package do
-  sh %{gem install pkg/#{GEM}-#{Chef::VERSION} --no-rdoc --no-ri}
+  sh %{gem install pkg/#{GEM_NAME}-#{Chef::VERSION} --no-rdoc --no-ri}
 end
 
 task :uninstall do
-  sh %{gem uninstall #{GEM} -x -v #{Chef::VERSION} }
+  sh %{gem uninstall #{GEM_NAME} -x -v #{Chef::VERSION} }
 end
 
 desc "create a gemspec file"
 task :make_spec do
-  File.open("#{GEM}.gemspec", "w") do |file|
+  File.open("#{GEM_NAME}.gemspec", "w") do |file|
     file.puts spec.to_ruby
   end
 end
diff --git a/chef/chef.gemspec b/chef/chef.gemspec
new file mode 100644
index 0000000000..8c231e20ab
--- /dev/null
+++ b/chef/chef.gemspec
@@ -0,0 +1,30 @@
+require File.dirname(__FILE__) + '/lib/chef/version'
+
+Gem::Specification.new do |s|
+  s.name = 'chef'
+  s.version = Chef::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.has_rdoc = true
+  s.extra_rdoc_files = ["README.rdoc", "LICENSE" ]
+  s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
+  s.description = s.summary
+  s.author = "Adam Jacob"
+  s.email = "adam@opscode.com"
+  s.homepage = "http://wiki.opscode.com/display/chef"
+
+  s.add_dependency "mixlib-config", ">= 1.1.2"
+  s.add_dependency "mixlib-cli", ">= 1.1.0"
+  s.add_dependency "mixlib-log", ">= 1.2.0"
+  s.add_dependency "mixlib-authentication", ">= 1.1.0"
+  s.add_dependency "ohai", ">= 0.5.7"
+
+  s.add_dependency "rest-client", ">= 1.0.4", "< 1.7.0"
+  s.add_dependency "bunny", ">= 0.6.0"
+  s.add_dependency "json", ">= 1.4.4", "<= 1.4.6"
+  %w{erubis extlib moneta highline uuidtools}.each { |gem| s.add_dependency gem }
+
+  s.bindir       = "bin"
+  s.executables  = %w( chef-client chef-solo knife shef )
+  s.require_path = 'lib'
+  s.files = %w(LICENSE README.rdoc) + Dir.glob("{distro,lib}/**/*")
+end