summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@opscode.com>2012-08-07 14:59:18 -0400
committerSeth Chisamore <schisamo@opscode.com>2012-08-07 14:59:18 -0400
commit2ef450fe403428f5a9cdcd770e09db21b6c9fee7 (patch)
treec3255b154f15912bd0c1a22949aa319c7f1d9d54
parent92872c4fe201bcacfef76b281684e5164c9f935b (diff)
downloadchef-2ef450fe403428f5a9cdcd770e09db21b6c9fee7.tar.gz
re-add Gemfile improvements from CHEF-3305
* make Thin a development dependency * make the `chef` and `chef-solr` normal Rubygem.org dependencies (Bundler's default behavior), the version for each should match the current chef-server-api and chef-server-webui version respectively. * add `unicorn` as a production dependency so the improved Gemfile can be easily leveraged in some forthcoming omnibus-chef improvements.
-rw-r--r--chef-server-webui/Gemfile19
-rw-r--r--chef-server-webui/chef-server-webui.gemspec2
2 files changed, 14 insertions, 7 deletions
diff --git a/chef-server-webui/Gemfile b/chef-server-webui/Gemfile
index 64bb0180ae..1b759b7098 100644
--- a/chef-server-webui/Gemfile
+++ b/chef-server-webui/Gemfile
@@ -1,10 +1,17 @@
-source "http://rubygems.org"
+$:.push File.expand_path("../lib", __FILE__)
+require "chef-server-webui/version"
+
+source :rubygems
gemspec
-# Thin by default
-gem 'thin'
+gem "chef", ChefServerWebui::VERSION, :require => false # load individual parts as needed
+gem "chef-solr", ChefServerWebui::VERSION, :require => false
+
+group(:dev) do
+ gem 'thin'
+end
-# Templating and Assets
-gem 'haml-rails'
-gem 'jquery-rails'
+group(:prod) do
+ gem "unicorn", "~> 2.0.0"
+end
diff --git a/chef-server-webui/chef-server-webui.gemspec b/chef-server-webui/chef-server-webui.gemspec
index f76c6f90f6..d2ab214b49 100644
--- a/chef-server-webui/chef-server-webui.gemspec
+++ b/chef-server-webui/chef-server-webui.gemspec
@@ -13,13 +13,13 @@ Gem::Specification.new do |s|
s.homepage = "http://wiki.opscode.com/display/chef"
s.add_dependency "chef"
- s.add_dependency "thin"
s.add_dependency "rails", "3.2.2"
s.add_dependency "jquery-rails"
s.add_dependency "haml-rails"
s.add_dependency "ruby-openid"
s.add_dependency "coderay"
+ s.add_development_dependency "thin"
s.add_development_dependency "rspec-rails"
s.bindir = "bin"