lib/ubiquo/template.erb in ubiquo-0.2.7 vs lib/ubiquo/template.erb in ubiquo-0.2.8
- old
+ new
@@ -17,10 +17,12 @@
choosen_plugin_set = "<%= @opts[:profile].to_s %>"
case choosen_plugin_set
when "minimal" then selected_plugins = minimal_plugins
+ when "custom"
+ selected_plugins = (minimal_plugins + <%= @opts[:plugins].inspect %>).uniq
else selected_plugins = minimal_plugins + rest_plugins
end
# File railties/lib/rails_generator/generators/applications/app/template_runner.rb, line 69
def plugin(name, options)
@@ -195,11 +197,16 @@
map.namespace :ubiquo do |ubiquo|
end
# Ubiquo plugins routes. See routes.rb from each plugin path.
#{ubiquo_routes}
-<%= "map.from_plugin :ubiquo_design" if opts[:gnuine] %>
+<% if opts[:gnuine] %>
+ <% if @opts[:template] == :edge %>
+ <%= "map.from_plugin :ubiquo_categories" %>
+ <% end %>
+ <%= "map.from_plugin :ubiquo_design" %>
+<% end %>
############# default routes
#map.connect ':controller/:action/:id'
#map.connect ':controller/:action/:id.:format'
end
CODE
@@ -251,9 +258,12 @@
CODE
ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %>
add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
<% if @opts[:gnuine] && opts[:profile] == :complete %>
+ <% if @opts[:template] == :edge %>
+ plugin 'ubiquo_categories', :git => 'gitosis@gandalf.gnuine.com:ubiquo_categories.git', :submodule => true, :branch => nil
+ <% end %>
plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch
<% end %>
rake("rails:update")
rake("calendardateselect:install")