ubiquo 0.2.8 → 0.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/ubiquo/template.erb +7 -7
- data/test/fixtures/template.erb +6 -6
- data/ubiquo.gemspec +2 -2
- metadata +3 -3
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.2.
|
|
1
|
+
0.2.9
|
data/lib/ubiquo/template.erb
CHANGED
|
@@ -112,7 +112,7 @@ base_config: &base_config
|
|
|
112
112
|
adapter: postgresql
|
|
113
113
|
host: localhost
|
|
114
114
|
username: #{%x{id -u -n}.strip}
|
|
115
|
-
password:
|
|
115
|
+
password:
|
|
116
116
|
|
|
117
117
|
development:
|
|
118
118
|
<<: *base_config
|
|
@@ -199,10 +199,10 @@ ActionController::Routing::Routes.draw do |map|
|
|
|
199
199
|
|
|
200
200
|
# Ubiquo plugins routes. See routes.rb from each plugin path.
|
|
201
201
|
#{ubiquo_routes}
|
|
202
|
+
<% if @opts[:template] == :edge %>
|
|
203
|
+
<%= "map.from_plugin :ubiquo_categories" %>
|
|
204
|
+
<% end %>
|
|
202
205
|
<% if opts[:gnuine] %>
|
|
203
|
-
<% if @opts[:template] == :edge %>
|
|
204
|
-
<%= "map.from_plugin :ubiquo_categories" %>
|
|
205
|
-
<% end %>
|
|
206
206
|
<%= "map.from_plugin :ubiquo_design" %>
|
|
207
207
|
<% end %>
|
|
208
208
|
############# default routes
|
|
@@ -259,10 +259,10 @@ CODE
|
|
|
259
259
|
ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %>
|
|
260
260
|
add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
|
|
261
261
|
|
|
262
|
+
<% if @opts[:template] == :edge %>
|
|
263
|
+
plugin 'ubiquo_categories', :git => 'gitosis@gandalf.gnuine.com:ubiquo_categories.git', :submodule => true, :branch => nil
|
|
264
|
+
<% end %>
|
|
262
265
|
<% if @opts[:gnuine] && opts[:profile] == :complete %>
|
|
263
|
-
<% if @opts[:template] == :edge %>
|
|
264
|
-
plugin 'ubiquo_categories', :git => 'gitosis@gandalf.gnuine.com:ubiquo_categories.git', :submodule => true, :branch => nil
|
|
265
|
-
<% end %>
|
|
266
266
|
plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch
|
|
267
267
|
<% end %>
|
|
268
268
|
|
data/test/fixtures/template.erb
CHANGED
|
@@ -199,10 +199,10 @@ ActionController::Routing::Routes.draw do |map|
|
|
|
199
199
|
|
|
200
200
|
# Ubiquo plugins routes. See routes.rb from each plugin path.
|
|
201
201
|
#{ubiquo_routes}
|
|
202
|
+
<% if @opts[:template] == :edge %>
|
|
203
|
+
<%= "map.from_plugin :ubiquo_categories" %>
|
|
204
|
+
<% end %>
|
|
202
205
|
<% if opts[:gnuine] %>
|
|
203
|
-
<% if @opts[:template] == :edge %>
|
|
204
|
-
<%= "map.from_plugin :ubiquo_categories" %>
|
|
205
|
-
<% end %>
|
|
206
206
|
<%= "map.from_plugin :ubiquo_design" %>
|
|
207
207
|
<% end %>
|
|
208
208
|
############# default routes
|
|
@@ -259,10 +259,10 @@ CODE
|
|
|
259
259
|
ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %>
|
|
260
260
|
add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
|
|
261
261
|
|
|
262
|
+
<% if @opts[:template] == :edge %>
|
|
263
|
+
plugin 'ubiquo_categories', :git => 'gitosis@gandalf.gnuine.com:ubiquo_categories.git', :submodule => true, :branch => nil
|
|
264
|
+
<% end %>
|
|
262
265
|
<% if @opts[:gnuine] && opts[:profile] == :complete %>
|
|
263
|
-
<% if @opts[:template] == :edge %>
|
|
264
|
-
plugin 'ubiquo_categories', :git => 'gitosis@gandalf.gnuine.com:ubiquo_categories.git', :submodule => true, :branch => nil
|
|
265
|
-
<% end %>
|
|
266
266
|
plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch
|
|
267
267
|
<% end %>
|
|
268
268
|
|
data/ubiquo.gemspec
CHANGED
|
@@ -5,11 +5,11 @@
|
|
|
5
5
|
|
|
6
6
|
Gem::Specification.new do |s|
|
|
7
7
|
s.name = %q{ubiquo}
|
|
8
|
-
s.version = "0.2.
|
|
8
|
+
s.version = "0.2.9"
|
|
9
9
|
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
|
11
11
|
s.authors = ["Albert Callarisa", "Bernat Foj", "Eric Garc\303\255a", "Felip Ladr\303\263n", "Antoni Reina", "Ramon Salvad\303\263", "Arnau S\303\241nchez"]
|
|
12
|
-
s.date = %q{2010-05-
|
|
12
|
+
s.date = %q{2010-05-28}
|
|
13
13
|
s.default_executable = %q{ubiquo}
|
|
14
14
|
s.description = %q{This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.}
|
|
15
15
|
s.email = %q{rsalvado@gnuine.com}
|
metadata
CHANGED
|
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
|
5
5
|
segments:
|
|
6
6
|
- 0
|
|
7
7
|
- 2
|
|
8
|
-
-
|
|
9
|
-
version: 0.2.
|
|
8
|
+
- 9
|
|
9
|
+
version: 0.2.9
|
|
10
10
|
platform: ruby
|
|
11
11
|
authors:
|
|
12
12
|
- Albert Callarisa
|
|
@@ -20,7 +20,7 @@ autorequire:
|
|
|
20
20
|
bindir: bin
|
|
21
21
|
cert_chain: []
|
|
22
22
|
|
|
23
|
-
date: 2010-05-
|
|
23
|
+
date: 2010-05-28 00:00:00 +02:00
|
|
24
24
|
default_executable: ubiquo
|
|
25
25
|
dependencies:
|
|
26
26
|
- !ruby/object:Gem::Dependency
|