ubiquo 0.3.2 → 0.3.3

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.3.3

data/lib/ubiquo.rb

@@ -4,7 +4,7 @@ $:.unshift File.dirname(__FILE__)
 module Ubiquo
   autoload :Options, 'ubiquo/options'
   autoload :Generator, 'ubiquo/generator'
-  
+
   class App
     class << self
       def run!(arguments)
@@ -12,11 +12,14 @@ module Ubiquo
         options = Options.new(arguments)
         options = options.merge(env_opts) if env_opts
 
-        unless Gem.available?('rails', '2.3.8')
-          $stderr.puts "Sorry ubiquo needs rails 2.3.8 to work properly."
+        # We need this because edge has been upgraded to use Rails 2.3.9
+        options[:rails] = options[:template] == :edge ? '2.3.9' : '2.3.8'
+
+        unless Gem.available?('rails', options[:rails])
+          $stderr.puts "Sorry ubiquo needs rails #{options[:rails]} to work properly."
           options[:show_help] = true
         end
-        
+
         if `which git` == ''
           $stderr.puts "Sorry you need to install git (> 1.5.3). See http://git-scm.com/"
           options[:show_help] = true
@@ -26,7 +29,7 @@ module Ubiquo
           $stdout.puts options[:version]
           return 0
         end
-        
+
         if options[:invalid_argument]
           $stderr.puts options[:invalid_argument]
           options[:show_help] = true
@@ -36,20 +39,19 @@ module Ubiquo
           $stderr.puts options.opts
           return 1
         end
-        
+
         if options[:app_name].nil? || options[:app_name].squeeze.strip == ""
           $stderr.puts options.opts
           return 1
         end
 
-        
         skeleton = File.dirname(__FILE__) + "/ubiquo/template.erb"
         tpl = Tempfile.new('tmp')
         File.open(tpl.path, 'w') do |file|
-          file.write Generator.build_template(options, skeleton) 
+          file.write Generator.build_template(options, skeleton)
         end
         tpl.sync=true
-        system("rails _2.3.8_ -m #{tpl.path} #{options[:app_name]}")
+        system("rails _#{options[:rails]}_ -m #{tpl.path} #{options[:app_name]}")
       end
     end
   end

data/lib/ubiquo/template.erb

@@ -214,7 +214,7 @@ file 'config/environment.rb', <<-CODE
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.8' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '<%= @opts[:rails] %>' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/ubiquo.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ubiquo}
-  s.version = "0.3.2"
+  s.version = "0.3.3"
 
   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-08-04}
+  s.date = %q{2010-09-25}
   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}
@@ -39,19 +39,19 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.ubiquo.me}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{command line application for building ubiquo based applications.}
   s.test_files = [
     "test/helper.rb",
-     "test/ubiquo/options_test.rb",
-     "test/ubiquo/generator_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::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["= 2.3.8"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
       s.add_development_dependency(%q<highline>, [">= 1.5.2"])

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ubiquo
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 3
-  - 2
-  version: 0.3.2
+  - 3
+  version: 0.3.3
 platform: ruby
 authors: 
 - Albert Callarisa
@@ -20,16 +21,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-04 00:00:00 +02:00
+date: 2010-09-25 00:00:00 +02:00
 default_executable: ubiquo
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 2
         - 3
@@ -41,9 +44,11 @@ dependencies:
   name: mocha
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
         - 9
@@ -55,9 +60,11 @@ dependencies:
   name: highline
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
@@ -69,9 +76,11 @@ dependencies:
   name: ya2yaml
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 26
@@ -114,27 +123,31 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: command line application for building ubiquo based applications.
 test_files: 
 - test/helper.rb
-- test/ubiquo/options_test.rb
 - test/ubiquo/generator_test.rb
+- test/ubiquo/options_test.rb