ubiquo 0.4.5 → 0.4.6

data/Rakefile

@@ -22,6 +22,7 @@ begin
     gem.add_dependency(%q<rails>, '= 2.3.11')
     gem.add_dependency(%q<i18n>, '< 0.5.0')
     gem.add_dependency(%q<lockfile>, '>= 1.4.3')
+    gem.add_dependency(%q<bundler>, '>= 1.0.10')
 
     gem.add_development_dependency(%q<mocha>, '>= 0.9.8')
     gem.add_development_dependency(%q<highline>, '>= 1.5.2')

data/VERSION

@@ -1 +1 @@
-0.4.5
+0.4.6

data/lib/ubiquo/template.erb

@@ -225,7 +225,6 @@ production:
   <<: *base_config
   database: db/#{appname}_production.db
 CODE
-
 choosen_adapter = "<%= @opts[:database] %>"
 case choosen_adapter
   when "mysql" then file 'config/database.yml', mysql
@@ -276,7 +275,6 @@ Rails::Initializer.run do |config|
   # 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 "lockfile"
 
   # 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
@@ -311,12 +309,92 @@ rake("rails:update")
 rake("calendardateselect:install")
 rake("ubiquo:install OVERWRITE=yes")
 
+# Bundler setup
+gsub_file 'config/boot.rb', /Rails\.boot!/ do <<-CODE
+class Rails::Boot
+  def run
+    load_initializer
+
+    Rails::Initializer.class_eval do
+      def load_gems
+        @bundler_loaded ||= Bundler.require :default, Rails.env
+      end
+    end
+
+    Rails::Initializer.run(:set_load_path)
+  end
+end
+
+Rails.boot!
+CODE
+end
+file 'config/preinitializer.rb', <<-CODE
+begin
+  require "rubygems"
+  require "bundler"
+rescue LoadError
+  raise "Could not load the bundler gem. Install it with `gem install bundler`."
+end
+
+if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.24")
+  raise RuntimeError, "Your bundler version is too old for Rails 2.3." +
+   "Run `gem install bundler` to upgrade."
+end
+
+begin
+  # Set up load paths for all bundled gems
+  ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__)
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end
+CODE
+adapter_gem = case choosen_adapter
+  when "mysql" then "mysql"
+  when "sqlite" then "sqlite3"
+  else "pg"
+end
+jruby_adapter_gem = adapter_gem == "pg" ? "postgres" : adapter_gem
+file 'Gemfile', <<-CODE
+source "http://rubygems.org"
+
+gem "rails",     "= 2.3.11"
+gem "lockfile",  ">= 1.4.3"
+gem "i18n",      "< 0.5.0"
+gem "#{adapter_gem}", :platforms => :mri_18
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter", "~> 1.1.1"
+  gem "jdbc-#{jruby_adapter_gem}"
+  gem "jruby-openssl", "~> 0.7.3"
+end
+
+group :development do
+  gem "ruby-debug"
+  gem "ya2yaml", ">= 0.2.6"
+  gem "highline", ">= 1.5.2"
+  gem "ffi-ncurses", "~> 0.3.3", :platforms => :jruby
+end
+
+group :test do
+  gem "mocha", ">= 0.9.8"
+end
+CODE
+# we  need to take care of Jruby
+<% if RUBY_PLATFORM =~ /java/ %>
+run "jruby -S bundle install"
+<% else %>
+run "bundle install --without jruby"
+<% end %>
+# End of bundler setup
+
 <% if RUBY_PLATFORM =~ /java/ %>
   generate(:jdbc)
 <% end %>
 
 <% if @opts[:gnuine] %>
-rake("db:create:all")
+   rake("db:create:all")
 rake("ubiquo:db:reset")
 <% end %>
 

data/ubiquo.gemspec

@@ -1,60 +1,58 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.4.5"
+  s.version = "0.4.6"
 
   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{2011-02-22}
+  s.date = %q{2011-04-15}
   s.default_executable = %q{ubiquo}
   s.description = %q{This gem provides a command-line interface to speed up the creation of ubiquo based apps.}
   s.email = %q{rsalvado@gnuine.com}
   s.executables = ["ubiquo"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "bin/ubiquo",
-     "lib/ubiquo.rb",
-     "lib/ubiquo/generator.rb",
-     "lib/ubiquo/options.rb",
-     "lib/ubiquo/template.erb",
-     "test/fixtures/template.erb",
-     "test/helper.rb",
-     "test/ubiquo/generator_test.rb",
-     "test/ubiquo/options_test.rb",
-     "ubiquo.gemspec"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/ubiquo",
+    "lib/ubiquo.rb",
+    "lib/ubiquo/generator.rb",
+    "lib/ubiquo/options.rb",
+    "lib/ubiquo/template.erb",
+    "test/fixtures/template.erb",
+    "test/helper.rb",
+    "test/ubiquo/generator_test.rb",
+    "test/ubiquo/options_test.rb",
+    "ubiquo.gemspec"
   ]
   s.homepage = %q{http://www.ubiquo.me}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{command line application for building ubiquo based applications.}
   s.test_files = [
     "test/helper.rb",
-     "test/ubiquo/generator_test.rb",
-     "test/ubiquo/options_test.rb"
+    "test/ubiquo/generator_test.rb",
+    "test/ubiquo/options_test.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 2.3.11"])
       s.add_runtime_dependency(%q<i18n>, ["< 0.5.0"])
       s.add_runtime_dependency(%q<lockfile>, [">= 1.4.3"])
+      s.add_runtime_dependency(%q<bundler>, [">= 1.0.10"])
       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"])
@@ -62,6 +60,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rails>, ["= 2.3.11"])
       s.add_dependency(%q<i18n>, ["< 0.5.0"])
       s.add_dependency(%q<lockfile>, [">= 1.4.3"])
+      s.add_dependency(%q<bundler>, [">= 1.0.10"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_dependency(%q<highline>, [">= 1.5.2"])
       s.add_dependency(%q<ya2yaml>, [">= 0.26"])
@@ -70,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rails>, ["= 2.3.11"])
     s.add_dependency(%q<i18n>, ["< 0.5.0"])
     s.add_dependency(%q<lockfile>, [">= 1.4.3"])
+    s.add_dependency(%q<bundler>, [">= 1.0.10"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])
     s.add_dependency(%q<highline>, [">= 1.5.2"])
     s.add_dependency(%q<ya2yaml>, [">= 0.26"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ubiquo
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Albert Callarisa
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 +01:00
+date: 2011-04-15 00:00:00 +02:00
 default_executable: ubiquo
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,9 +73,25 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: bundler
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 0
+        - 10
+        version: 1.0.10
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -87,11 +103,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: highline
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,11 +119,11 @@ dependencies:
         - 2
         version: 1.5.2
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ya2yaml
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,7 +134,7 @@ dependencies:
         - 26
         version: "0.26"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: This gem provides a command-line interface to speed up the creation of ubiquo based apps.
 email: rsalvado@gnuine.com
 executables: 
@@ -130,7 +146,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -150,8 +165,8 @@ homepage: http://www.ubiquo.me
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -175,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: command line application for building ubiquo based applications.

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-TAGS
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC