ubiquo 0.9.0.b3 → 0.9.0.b4

data/VERSION

@@ -1 +1 @@
-0.9.0.b3
+0.9.0.b4

data/lib/ubiquo.rb

@@ -13,7 +13,7 @@ module Ubiquo
         options = options.merge(env_opts) if env_opts
 
         # We need this because sometimes we upgrade edge but no stable
-        options[:rails] = options[:template] == :edge ? '3.2.0.rc1' : '2.3.14'
+        options[:rails] = options[:template] == :edge ? '3.2.0.rc2' : '2.3.14'
 
         unless Gem.available?('rails', options[:rails])
           $stderr.puts "Sorry ubiquo needs rails #{options[:rails]} to work properly."

data/lib/ubiquo/options.rb

@@ -10,8 +10,11 @@ module Ubiquo
 
       self[:template] = :stable
       self[:profile]  = :complete
-      self[:locale] = :en
+      self[:locale]   = :en
       self[:devel]    = false
+      self[:rvm]      = false
+      self[:gem_path] = false
+      self[:clone_gems] = false
       self[:database] = :sqlite
       self[:exception_recipient] = "chan@ge.me"
       self[:sender_address] = "chan@ge.me"
@@ -66,6 +69,14 @@ module Ubiquo
           self[:rvm] = true
         end
 
+        o.on("--gem-path [PATH]", 'Use ubiquo gems that are placed in this path') do |gem_path|
+          self[:gem_path] = gem_path
+        end
+
+        o.on("--clone-gems", 'Do a git clone of the ubiquo gems in the specified --gem-path') do
+          self[:clone_gems] = true
+        end
+
         o.on("--devel", 'For ubiquo developers (ssh acces to github repos)') do
           self[:devel] = true
         end
@@ -112,7 +123,7 @@ module Ubiquo
     def suported_profiles
       {
         :minimal  => "Includes minimal set of ubiquo plugins.",
-        :complete => "Includes all avaliable ubiquo core plugins."
+        :complete => "Includes all available ubiquo core plugins."
       }
     end
 

data/lib/ubiquo/template.erb

@@ -27,6 +27,9 @@ case choosen_plugin_set
   else selected_plugins = minimal_plugins + rest_plugins
 end
 
+# temporally overriden to the gemified set of plugins
+selected_plugins = %w[ubiquo_core ubiquo_authentication ubiquo_access_control]
+
 # File railties/lib/rails/generators/rails/app/app_generator.rb, line 238
 def file(*args, &block)
   config = args.last.is_a?(Hash) ? args.pop : {}
@@ -47,6 +50,12 @@ def add_plugins(plugin_names, options={})
   git_root = options[:devel] ? 'git@github.com:gnuine' : 'git://github.com/gnuine'
   plugin_names.each { |name| plugin name, :git => "#{git_root}/#{name}.git", :branch => options[:branch], :submodule => true }
 end
+
+def plugin_repo(name, options={})
+  git_root = options[:devel] ? 'git@github.com:gnuine' : 'git://github.com/gnuine'
+  "#{git_root}/#{name}.git"
+end
+
 # To ask needed settings when boostraping the app
 appname             = "<%= @opts[:app_name] %>"
 exception_recipient = "<%= @opts[:exception_recipient] %>"
@@ -247,7 +256,12 @@ end
 CODE
 # default rails environment.rb
 ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.8-stable'" %>
-add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
+#add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
+<% if @opts[:clone_gems] %>
+  (selected_plugins).each do |plugin_name|
+    run "git clone #{plugin_repo(plugin_name)} <%= @opts[:gem_path] %>/#{plugin_name}"
+  end
+<% end %>
 
 adapter_gem = case choosen_adapter
   when "mysql" then "mysql"
@@ -255,10 +269,19 @@ adapter_gem = case choosen_adapter
   else "pg"
 end
 jruby_adapter_gem = adapter_gem == "pg" ? "postgres" : adapter_gem
+
+ubiquo_gems = (selected_plugins).map do |plugin|
+  <% if @opts[:gem_path] %>
+    "  gem \"#{plugin}\""
+  <% else %>>
+    "  gem \"#{plugin}\", :git => #{plugin_repo(plugin)}"
+  <% end %>
+end.join("\n")
+
 file 'Gemfile', <<-CODE
 source "https://rubygems.org"
 
-gem "rails",     "= 3.2.0.rc1"
+gem "rails",     "~> 3.2.0.rc2"
 
 platforms :mri_19 do
   gem "#{adapter_gem}"
@@ -280,6 +303,16 @@ gem 'jquery-rails'
 group :test do
   gem "mocha", ">= 0.9.8", :require => false
 end
+
+<% if @opts[:gem_path] %>
+path "<%= @opts[:gem_path] %>" do
+#{ubiquo_gems}
+end
+<% else %>
+#{ubiquo_gems}
+<% end %>
+
+
 <% if @opts[:profile] == :complete # used in i18n %>
 #gem 'routing-filter', '~> 0.2.4', :require => false
 <% end %>

data/ubiquo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ubiquo"
-  s.version = "0.9.0.b3"
+  s.version = "0.9.0.b4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Albert Callarisa", "Jordi Beltran", "Bernat Foj", "Eric Garc\303\255a", "Felip Ladr\303\263n", "David Lozano", "Antoni Reina", "Ramon Salvad\303\263", "Arnau S\303\241nchez"]
-  s.date = "2012-01-05"
+  s.date = "2012-01-11"
   s.description = "This gem provides a command-line interface to speed up the creation of ubiquo based apps."
   s.email = "rsalvado@gnuine.com"
   s.executables = ["ubiquo"]

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ubiquo
 version: !ruby/object:Gem::Version 
-  hash: 225
+  hash: 239
   prerelease: 6
   segments: 
   - 0
   - 9
   - 0
   - b
-  - 3
-  version: 0.9.0.b3
+  - 4
+  version: 0.9.0.b4
 platform: ruby
 authors: 
 - Albert Callarisa
@@ -25,7 +25,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-05 00:00:00 Z
+date: 2012-01-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: journey