diff options
| author | Daniel DeLeo <dan@opscode.com> | 2010-06-25 17:08:50 -0700 |
|---|---|---|
| committer | Daniel DeLeo <dan@opscode.com> | 2010-06-25 17:08:50 -0700 |
| commit | 5992220f4259e9c9148dd0d0b00d765f153d5b32 (patch) | |
| tree | 8f066f31e80fea4371b95dd2faaa9f52f60f5d04 | |
| parent | d3384855a0f1e0492ec86ed20ab79073d2dd9999 (diff) | |
| download | chef-5992220f4259e9c9148dd0d0b00d765f153d5b32.tar.gz | |
require merb 1.1.x in the webui gemspec
bonus: allow the rakefile to run when merb is not installed, so it's
easier to install from source checkout on a bare system
| -rw-r--r-- | chef-server-api/Rakefile | 8 | ||||
| -rw-r--r-- | chef-server-webui/Rakefile | 20 |
2 files changed, 18 insertions, 10 deletions
diff --git a/chef-server-api/Rakefile b/chef-server-api/Rakefile index 05b7866a1f..de0d7fd487 100644 --- a/chef-server-api/Rakefile +++ b/chef-server-api/Rakefile @@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/lib/chef-server-api/version' require 'rubygems' require 'rake/gempackagetask' -require 'merb-core' -require 'merb-core/tasks/merb' +begin + require 'merb-core' + require 'merb-core/tasks/merb' +rescue LoadError + STDERR.puts "merb is not installed, merb rake tasks will not be available." +end GEM_NAME = "chef-server-api" AUTHOR = "Opscode" diff --git a/chef-server-webui/Rakefile b/chef-server-webui/Rakefile index 57878e7b2b..930065e3bf 100644 --- a/chef-server-webui/Rakefile +++ b/chef-server-webui/Rakefile @@ -3,8 +3,12 @@ require File.dirname(__FILE__) + '/lib/chef-server-webui/version' require 'rubygems' require 'rake/gempackagetask' -require 'merb-core' -require 'merb-core/tasks/merb' +begin + require 'merb-core' + require 'merb-core/tasks/merb' +rescue LoadError + STDERR.puts "merb is not installed, merb rake tasks will not be available." +end GEM_NAME = "chef-server-webui" AUTHOR = "Opscode" @@ -24,12 +28,12 @@ spec = Gem::Specification.new do |s| s.email = EMAIL s.homepage = HOMEPAGE - s.add_dependency "merb-core", "~> 1.0" - s.add_dependency "merb-slices", "~> 1.0" - s.add_dependency "merb-assets", "~> 1.0" - s.add_dependency "merb-helpers", "~> 1.0" - s.add_dependency "merb-haml", "~> 1.0" - s.add_dependency "merb-param-protection", "~> 1.0" + s.add_dependency "merb-core", "~> 1.1.0" + s.add_dependency "merb-slices", "~> 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.2" |