zena 0.16.5 → 0.16.6

Sign up to get free protection for your applications and to get access to all the features.
data/History.txt CHANGED
@@ -1,3 +1,8 @@
1
+ == 0.16.6 2010-04-23
2
+
3
+ * 1 minor enhancement
4
+ * fixed gem loading when brick is deactivated
5
+
1
6
  == 0.16.5 2010-04-15
2
7
 
3
8
  * 2 major enhancements
data/config/bricks.yml CHANGED
@@ -8,14 +8,14 @@ development:
8
8
  tags: ON
9
9
  captcha: ON
10
10
  sphinx:
11
- switch: ON
11
+ switch: OFF
12
12
  activate_if:
13
13
  gem: 'thinking_sphinx'
14
14
  adapter: 'mysql,postgresql'
15
15
  run_if:
16
16
  file: 'log/searchd.development.pid'
17
17
  worker:
18
- switch: ON
18
+ switch: OFF
19
19
  activate_if:
20
20
  gem: 'delayed_job'
21
21
 
@@ -23,13 +23,13 @@ production:
23
23
  tags: ON
24
24
  captcha: ON
25
25
  sphinx:
26
- switch: ON
26
+ switch: OFF
27
27
  activate_if:
28
28
  gem: 'thinking_sphinx'
29
29
  adapter: 'mysql,postgresql'
30
30
  run_if:
31
31
  file: 'log/searchd.production.pid'
32
32
  worker:
33
- switch: ON
33
+ switch: OFF
34
34
  activate_if:
35
35
  gem: 'delayed_job'
data/config/gems.yml CHANGED
@@ -39,4 +39,5 @@ ts-delayed-delta:
39
39
 
40
40
  delayed_job:
41
41
  optional: yes
42
+ brick: worker
42
43
  version: '>= 1.8.4'
data/lib/zena.rb CHANGED
@@ -113,10 +113,16 @@ module Zena
113
113
  conf = gem_config.symbolize_keys
114
114
  conf[:version].gsub!(/\A=\s*/,'')
115
115
  if conf[:optional]
116
- begin
117
- config.gem gem_name, conf
118
- rescue LoadError
119
- # ignore
116
+ if brick = conf[:brick]
117
+ if Bricks::CONFIG[brick]
118
+ config.gem gem_name, conf
119
+ end
120
+ else
121
+ begin
122
+ config.gem gem_name, conf
123
+ rescue LoadError
124
+ # ignore
125
+ end
120
126
  end
121
127
  else
122
128
  config.gem gem_name, conf
data/lib/zena/info.rb CHANGED
@@ -9,7 +9,7 @@ ZENA_CALENDAR_LANGS = ["en", "fr", "de"] # FIXME: build this dynamically from ex
9
9
  ENABLE_XSENDFILE = false
10
10
 
11
11
  module Zena
12
- VERSION = '0.16.5'
12
+ VERSION = '0.16.6'
13
13
  REVISION = 1336
14
14
  ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
15
15
  end
data/zena.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{zena}
8
- s.version = "0.16.5"
8
+ s.version = "0.16.6"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Gaspard Bucher"]
12
- s.date = %q{2010-04-15}
12
+ s.date = %q{2010-04-23}
13
13
  s.default_executable = %q{zena}
14
14
  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).}
15
15
  s.email = %q{gaspard@teti.ch}
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 16
8
- - 5
9
- version: 0.16.5
8
+ - 6
9
+ version: 0.16.6
10
10
  platform: ruby
11
11
  authors:
12
12
  - Gaspard Bucher
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-04-15 00:00:00 +02:00
17
+ date: 2010-04-23 00:00:00 +02:00
18
18
  default_executable: zena
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency