ubiquo 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/ubiquo/options.rb

@@ -13,6 +13,7 @@ module Ubiquo
       self[:database] = :sqlite
       self[:template] = :stable
       self[:profile]  = :complete
+      self[:locale] = :en
       self[:devel]    = false
       self[:gnuine]   = args.delete('--gnuine') || false
       
@@ -36,6 +37,12 @@ module Ubiquo
           o.on("--#{profile.to_s}", msg) { self[:profile] = profile }
         end
 
+        o.separator "\nSelects ubiquo default locale (defaults to english): "
+
+        suported_locales.each do |locale, msg|
+          o.on("--#{locale.to_s}", msg) { self[:locale] = locale }
+        end
+        
         o.separator "\nExtra options:"
 
         o.on("--devel", 'For ubiquo developers (ssh acces to github repos)') do
@@ -87,6 +94,14 @@ module Ubiquo
         :complete => "Includes all avaliable ubiquo core plugins."
       }
     end
+
+    def suported_locales
+      {
+        :ca => "Selects catalan.",
+        :es => "Selects spanish.",
+        :en => "Selects english."
+      }
+    end
     
   end
 end

data/lib/ubiquo/template.erb

@@ -13,7 +13,6 @@ rest_plugins = %w[
   ubiquo_activity
   ubiquo_versions
   ubiquo_guides
-  <%= "ubiquo_design" if @opts[:gnuine] %>
 ]
 
 choosen_plugin_set = "<%= @opts[:profile].to_s %>"
@@ -163,19 +162,19 @@ base_config: &base_config
 
 development:
   <<: *base_config  
-  dbfile: db/#{appname}_development.db
+  database: db/#{appname}_development.db
   
 test:
   <<: *base_config
-  dbfile: db/#{appname}_test.db
+  database: db/#{appname}_test.db
 
 preproduction:
   <<: *base_config
-  dbfile: db/#{appname}_preproduction.db
+  database: db/#{appname}_preproduction.db
 
 production:
   <<: *base_config
-  dbfile: db/#{appname}_production.db
+  database: db/#{appname}_production.db
 CODE
 
 choosen_adapter = "<%= @opts[:database] %>"
@@ -196,6 +195,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Ubiquo plugins routes. See routes.rb from each plugin path.
 #{ubiquo_routes}
+<%= "map.from_plugin :ubiquo_design" if opts[:gnuine] %>
   ############# default routes
   #map.connect ':controller/:action/:id'
   #map.connect ':controller/:action/:id.:format'
@@ -244,13 +244,13 @@ Rails::Initializer.run do |config|
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de  
   config.i18n.load_path += Dir.glob(File.join("config", "locales", "**","*.{rb,yml}"))
-  config.i18n.default_locale = :en
+  config.i18n.default_locale = :<%= @opts[:locale] %>
 end
 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] %>
+<% if @opts[:gnuine] && opts[:profile] == :complete %>
 plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch
 <% end %>
 

data/ubiquo.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ramon Salvad\303\263"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Ramon Salvad\xC3\xB3"