zena 0.16.1 → 0.16.2

data/History.txt

@@ -1,3 +1,8 @@
+== 0.16.2 2010-01-17
+
+* 1 minor enhancement
+  * fixed zena:asset task when used from 'zena' command
+
 == 0.16.1 2010-01-16
 
 * 3 minor enhancements

data/lib/tasks/zena.rake

@@ -71,7 +71,7 @@ def copy_files(from, to)
       next if f =~ /\A./
       copy_files("#{from}/#{f}", "#{to}/#{f}")
     end
-  elsif File.exist?(to)
+  elsif !ENV['OVERWRITE_ASSETS'] && File.exist?(to)
     if COPY_FILE_OVERWRITE_ALL.has_key?(base)
       if COPY_FILE_OVERWRITE_ALL[base]
         FileUtils.cp(from, base)

data/lib/zena/deploy/template.rb

@@ -32,5 +32,5 @@ inside('app/controllers') do
   end
 end
 
-rake 'zena:assets'
+rake 'zena:assets OVERWRITE_ASSETS=true'
 

data/lib/zena/info.rb

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

data/zena.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zena}
-  s.version = "0.16.1"
+  s.version = "0.16.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gaspard Bucher"]
-  s.date = %q{2010-01-16}
+  s.date = %q{2010-01-17}
   s.default_executable = %q{zena}
   s.description = %q{zena is a Ruby on Rails  CMS (content managment system) with a focus on usability, ease of customization and web 2.0 goodness (application like behaviour).}
   s.email = %q{gaspard@teti.ch}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zena
 version: !ruby/object:Gem::Version 
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors: 
 - Gaspard Bucher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 +01:00
+date: 2010-01-17 00:00:00 +01:00
 default_executable: zena
 dependencies: 
 - !ruby/object:Gem::Dependency