ubiquo 0.2.7 → 0.2.8

data/Rakefile

@@ -21,6 +21,7 @@ begin
                   ]
     gem.add_dependency(%q<rails>, '= 2.3.5')
 
+    gem.add_development_dependency(%q<mocha>, '>= 0.9.8')
     gem.add_development_dependency(%q<highline>, '>= 1.5.2')
     gem.add_development_dependency(%q<ya2yaml>, '>= 0.26')
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.2.8

data/lib/ubiquo/options.rb

@@ -37,6 +37,13 @@ module Ubiquo
         suported_profiles.each do |profile, msg|
           o.on("--#{profile.to_s}", msg) { self[:profile] = profile }
         end
+        o.on(
+          "--custom [PLUGINS]", 
+          "Includes minimal template, but you can add extra plugins"
+        ) do |plugins|
+          self[:profile] = :custom
+          self[:plugins] = plugins.split(",")
+        end
 
         o.separator "\nSelects ubiquo default locale (defaults to english): "
 

data/lib/ubiquo/template.erb

@@ -19,6 +19,8 @@ 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
 
@@ -197,7 +199,12 @@ 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] %>
+<% 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'
@@ -253,6 +260,9 @@ 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 %>
 

data/test/fixtures/template.erb

@@ -5,23 +5,22 @@ external_plugins = %w[
   tiny_mce
   paperclip
 ]
-minimal_plugins = %w[ ubiquo_core ubiquo_authentication ]
+minimal_plugins = %w[ ubiquo_core ubiquo_authentication ubiquo_access_control ubiquo_scaffold ]
 rest_plugins = %w[
-  ubiquo_access_control
   ubiquo_media
-  ubiquo_scaffold
   ubiquo_jobs
   ubiquo_i18n
   ubiquo_activity
   ubiquo_versions
   ubiquo_guides
-  <%= "ubiquo_design" if @opts[:gnuine] %>
 ]
 
 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
 
@@ -49,8 +48,8 @@ def add_plugins(plugin_names, options={})
 end
 # To ask needed settings when boostraping the app
 appname             = "<%= @opts[:app_name] %>"
-exception_recipient = "programadors@gnuine.com"
-sender_address      = "errors@gnuine.com"
+exception_recipient = "<%= @opts[:exception_recipient] %>"
+sender_address      = "<%= @opts[:sender_address] %>"
 # Remove rails temporary directories
 ["./tmp/pids", "./tmp/sessions", "./tmp/sockets", "./tmp/cache"].each do |f|
   run("rmdir ./#{f}")
@@ -112,11 +111,13 @@ base_config: &base_config
     encoding: unicode
     adapter:  postgresql
     host: localhost
+    username: #{%x{id -u -n}.strip}
+    password:
 
 development:
-  <<: *base_config  
+  <<: *base_config
   database: #{appname}_development
-  
+
 test:
   <<: *base_config
   database: #{appname}_test
@@ -140,9 +141,9 @@ base_config: &base_config
   socket: /var/run/mysqld/mysqld.sock
 
 development:
-  <<: *base_config  
+  <<: *base_config
   database: #{appname}_development
-  
+
 test:
   <<: *base_config
   database: #{appname}_test
@@ -164,20 +165,20 @@ base_config: &base_config
   timeout: 5000
 
 development:
-  <<: *base_config  
-  dbfile: db/#{appname}_development.db
-  
+  <<: *base_config
+  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] %>"
@@ -198,12 +199,17 @@ ActionController::Routing::Routes.draw do |map|
 
   # Ubiquo plugins routes. See routes.rb from each plugin path.
 #{ubiquo_routes}
+<% 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
-puts "here we go"
 # default rails environment.rb
 file 'config/environment.rb', <<-CODE
 # Be sure to restart your server when you modify this file
@@ -220,14 +226,14 @@ Rails::Initializer.run do |config|
   # -- all .rb files in that directory are automatically loaded.
 
   # Add additional load paths for your own custom dirs
-  
-  # Specify gems that this application depends on. 
+
+  # Specify gems that this application depends on.
   # They can then be installed with "rake gems:install" on new installations.
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "aws-s3", :lib => "aws/s3"
-  config.gem "rmagick", :lib => 'RMagick'
-  
+  # config.gem "rmagick", :lib => 'RMagick'
+
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
   config.plugins = [ :ubiquo_core, :all ]
@@ -245,22 +251,28 @@ Rails::Initializer.run do |config|
 
 # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
-  # config.i18n.default_locale = :de  
+  # config.i18n.default_locale = :de
   config.i18n.load_path += Dir.glob(File.join("config", "locales", "**","*.{rb,yml}"))
-  config.i18n.default_locale = :ca
+  config.i18n.default_locale = :<%= @opts[:locale] %>
 end
 CODE
-puts "out of here"
 ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %>
-add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:gnuine] ? true : false %>)
+add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
 
-<% if @opts[:gnuine] %>
+<% 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")
-rake("ubiquo:install")
+rake("ubiquo:install OVERWRITE=yes")
+
+<% if RUBY_PLATFORM =~ /java/ %>
+  generate(:jdbc)
+<% end %>
 
 <% if @opts[:gnuine] %>
 rake("db:create:all")
@@ -271,9 +283,5 @@ git :add => "."
 git :commit => "-a -m 'Initial #{appname} commit'"
 
 <% unless @opts[:gnuine] %>
-puts "1.- You must configure your database using config/database.yml"
-puts "2.- You must create your databases. rake db:create:all"
-puts "3.- You must initialize your database. rake ubiquo:db:init"
-puts "4.- You must create the admin user. rake ubiquo:create_user"
-puts "5.- scrip/server and point your browser to http://localhost:3000/ubiquo"
+puts "Run script/server and go to http://localhost:3000/ and follow the instructions there."
 <% end %>

data/test/ubiquo/generator_test.rb

@@ -13,4 +13,11 @@ class TestGenerator < Test::Unit::TestCase
     assert_match 'ubiquo_branch = nil', rails_template
   end
   
+  def test_should_generate_expected_template_from_custom_profile
+    skeleton = File.join(File.dirname(__FILE__), "../fixtures", "template.erb")
+    opts = Options.new(%w[ --custom ubiquo_media myapp ])
+    rails_template = Generator.build_template(opts, skeleton)
+    assert_kind_of String, rails_template
+    assert_match 'choosen_plugin_set = "custom"', rails_template
+  end
 end

data/test/ubiquo/options_test.rb

@@ -59,4 +59,10 @@ class TestOptions < Test::Unit::TestCase
     assert_equal "s@s.com", opts[:sender_address]
   end
   
+  def test_should_be_able_to_add_custom_plugins
+    opts = Options.new(%w[ --custom ubiquo_media myapp ])
+    assert_equal :custom, opts[:profile]
+    assert_equal ["ubiquo_media"].inspect, opts[:plugins].inspect
+  end
+  
 end

data/ubiquo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.2.7"
+  s.version = "0.2.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Albert Callarisa", "Bernat Foj", "Eric Garc\303\255a", "Felip Ladr\303\263n", "Antoni Reina", "Ramon Salvad\303\263", "Arnau S\303\241nchez"]
-  s.date = %q{2010-04-27}
+  s.date = %q{2010-05-08}
   s.default_executable = %q{ubiquo}
   s.description = %q{This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.}
   s.email = %q{rsalvado@gnuine.com}
@@ -53,15 +53,18 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 2.3.5"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<highline>, [">= 1.5.2"])
       s.add_development_dependency(%q<ya2yaml>, [">= 0.26"])
     else
       s.add_dependency(%q<rails>, ["= 2.3.5"])
+      s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
       s.add_dependency(%q<ya2yaml>, [">= 0.26"])
     end
   else
     s.add_dependency(%q<rails>, ["= 2.3.5"])
+    s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<highline>, [">= 1.5.2"])
     s.add_dependency(%q<ya2yaml>, [">= 0.26"])
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Albert Callarisa
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-27 00:00:00 +02:00
+date: 2010-05-08 00:00:00 +02:00
 default_executable: ubiquo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,9 +38,23 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: highline
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -50,11 +64,11 @@ dependencies:
         - 2
         version: 1.5.2
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -63,7 +77,7 @@ dependencies:
         - 26
         version: "0.26"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 description: This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.
 email: rsalvado@gnuine.com
 executables: