ubiquo 0.1.12 → 0.2.7

data/Rakefile

@@ -20,8 +20,9 @@ begin
                    "Arnau Sánchez"
                   ]
     gem.add_dependency(%q<rails>, '= 2.3.5')
-    gem.add_dependency(%q<rmagick>, '>= 1.15.9')
-    gem.add_dependency(%q<highline>)
+
+    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
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.12
+0.2.7

data/bin/ubiquo

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-#require File.join('lib', 'ubiquo.rb')
 require 'ubiquo'
+
 Ubiquo::App.run!(ARGV)

data/lib/ubiquo/options.rb

@@ -8,19 +8,19 @@ module Ubiquo
     def initialize(args)
       @orig_args = args.clone
       
-      self[:database] = :sqlite
       self[:template] = :stable
       self[:profile]  = :complete
       self[:locale] = :en
       self[:devel]    = false
       self[:gnuine]   = args.delete('--gnuine') || false
+      self[:database] = self[:gnuine] ? :postgresql : :sqlite
       self[:exception_recipient] = "chan@ge.me"
       self[:sender_address] = "chan@ge.me"
       
       
       @opts = OptionParser.new do |o|
         o.banner = """Usage: #{File.basename($0)} [options] application_name"        
-        o.separator "\nSelect a database (defaults to postgresql if not specified):"
+        o.separator "\nSelect a database (defaults to sqlite if not specified):"
         
         suported_databases.each do |db,msg|
           o.on("--#{db.to_s}", msg) { self[:database] = db }
@@ -108,9 +108,9 @@ module Ubiquo
 
     def suported_locales
       {
-        :ca => "Selects catalan.",
-        :es => "Selects spanish.",
-        :en => "Selects english."
+        :ca => "Selects Catalan.",
+        :es => "Selects Spanish.",
+        :en => "Selects English."
       }
     end
     

data/lib/ubiquo/template.erb

@@ -109,11 +109,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
@@ -137,9 +139,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
@@ -161,9 +163,9 @@ base_config: &base_config
   timeout: 5000
 
 development:
-  <<: *base_config  
+  <<: *base_config
   database: db/#{appname}_development.db
-  
+
 test:
   <<: *base_config
   database: db/#{appname}_test.db
@@ -217,14 +219,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 ]
@@ -242,7 +244,7 @@ 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 = :<%= @opts[:locale] %>
 end
@@ -256,7 +258,11 @@ plugin 'ubiquo_design', :git => 'gitosis@gandalf.gnuine.com:ubiquo_design.git',
 
 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")
@@ -267,9 +273,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/ubiquo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.1.12"
+  s.version = "0.2.7"
 
   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-07}
+  s.date = %q{2010-04-27}
   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}
@@ -42,9 +42,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{command line application for building ubiquo based applications.}
   s.test_files = [
-    "test/ubiquo/generator_test.rb",
+    "test/helper.rb",
      "test/ubiquo/options_test.rb",
-     "test/helper.rb"
+     "test/ubiquo/generator_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -53,17 +53,17 @@ 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_runtime_dependency(%q<rmagick>, [">= 1.15.9"])
-      s.add_runtime_dependency(%q<highline>, [">= 0"])
+      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<rmagick>, [">= 1.15.9"])
-      s.add_dependency(%q<highline>, [">= 0"])
+      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<rmagick>, [">= 1.15.9"])
-    s.add_dependency(%q<highline>, [">= 0"])
+    s.add_dependency(%q<highline>, [">= 1.5.2"])
+    s.add_dependency(%q<ya2yaml>, [">= 0.26"])
   end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 12
-  version: 0.1.12
+  - 2
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Albert Callarisa
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +02:00
+date: 2010-04-27 00:00:00 +02:00
 default_executable: ubiquo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,7 +38,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: highline
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
@@ -46,13 +46,13 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 15
-        - 9
-        version: 1.15.9
-  type: :runtime
+        - 5
+        - 2
+        version: 1.5.2
+  type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: highline
+  name: ya2yaml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
@@ -60,8 +60,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
-  type: :runtime
+        - 26
+        version: "0.26"
+  type: :development
   version_requirements: *id003
 description: This gem provides a command-line application to make the creation of ubiquo based applications fast and easy.
 email: rsalvado@gnuine.com
@@ -120,6 +121,6 @@ signing_key:
 specification_version: 3
 summary: command line application for building ubiquo based applications.
 test_files: 
-- test/ubiquo/generator_test.rb
-- test/ubiquo/options_test.rb
 - test/helper.rb
+- test/ubiquo/options_test.rb
+- test/ubiquo/generator_test.rb