zena 0.15.1 → 0.15.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.15.2 2010-01-06
+
+* 1 minor enhancement
+  * fixed app generation when rails >= 2.3.4 is installed
+
 == 0.15.1 2009-10-27
 
 * 2 major enhancements:
@@ -10,7 +15,7 @@
   * better versions list and diff select
   * internal 'js_data' hook to insert javascript at end of page
   * custom queries are loaded from bricks (bricks/brick_name/queries/test.host.yml)
-  * Fixed skin importation from zipped xhtml template
+  * fixed skin importation from zipped xhtml template
 
 == 0.15.0 2009-10-16
 

data/bin/zena

@@ -1,5 +1,17 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'zena/info'
+require 'rails/version'
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
 
-exec "rails -m #{File.join(Zena::ROOT, 'lib', 'zena', 'deploy', 'template.rb').inspect} #{ARGV.first}"
+template_path = File.join(Zena::ROOT, 'lib', 'zena', 'deploy', 'template.rb')
+args = ["-m", template_path]
+args << ARGV.first
+
+puts "Generating zena application from template #{template_path}"
+Rails::Generator::Base.use_application_sources!
+Rails::Generator::Scripts::Generate.new.run(
+  args,
+  :generator => 'app'
+)

data/lib/zena/info.rb

@@ -7,7 +7,7 @@ ZENA_CALENDAR_LANGS = ["en", "fr"] # FIXME: build this dynamically from existing
 ENABLE_XSENDFILE = false
 
 module Zena
-  VERSION = '0.15.1'
+  VERSION = '0.15.2'
   REVISION = 1336
   ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/test/fixtures/nodes.yml

@@ -1615,7 +1615,7 @@ zena_lake:
   type:            Contact
   kpath:           NRC
   zip:             23
-  publish_from:    Tue Oct 27 13:14:13 +0000 2009
+  publish_from:    Wed Jan 06 11:21:14 +0000 2010
   vhash:           '{"w":{"en":1833724126},"r":{"en":618648829}}'
   inherit:         yes
   skin:            default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-27 00:00:00 +01:00
+date: 2010-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency