capifony 2.1.3 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/CHANGELOG +6 -0
  2. data/lib/symfony1.rb +3 -1
  3. data/lib/symfony2.rb +26 -4
  4. metadata +3 -3
data/CHANGELOG CHANGED
@@ -1,3 +1,9 @@
1
+ == 2.1.4 / December 19, 2011
2
+
3
+ * vendors installation fixed
4
+ * non-existing asset paths bug fixed
5
+ * bunch of other bugfixes
6
+
1
7
  == 2.1.3 / September 27, 2011
2
8
 
3
9
  * propel support for Symfony2 (by @willdurand)
data/lib/symfony1.rb CHANGED
@@ -397,7 +397,9 @@ namespace :symfony do
397
397
 
398
398
  desc "Generate model lib form and filters classes based on your schema"
399
399
  task :build_classes do
400
- run "php #{latest_release}/symfony propel:build --all-classes --env=#{symfony_env_prod}"
400
+ run "php #{latest_release}/symfony propel:build --model --env=#{symfony_env_prod}"
401
+ run "php #{latest_release}/symfony propel:build --forms --env=#{symfony_env_prod}"
402
+ run "php #{latest_release}/symfony propel:build --filters --env=#{symfony_env_prod}"
401
403
  end
402
404
 
403
405
  desc "Generate code & database based on your schema"
data/lib/symfony2.rb CHANGED
@@ -21,6 +21,9 @@ set :dump_assetic_assets, false
21
21
  # Whether to run the bin/vendors script to update vendors
22
22
  set :update_vendors, false
23
23
 
24
+ # run bin/vendors script in mode (upgrade, install (faster if shared /vendor folder) or reinstall)
25
+ set :vendors_mode, "reinstall"
26
+
24
27
  # Whether to run cache warmup
25
28
  set :cache_warmup, true
26
29
 
@@ -68,6 +71,10 @@ namespace :deploy do
68
71
 
69
72
  share_childs
70
73
 
74
+ asset_children.each do |child|
75
+ run "if [ -d #{child} ] ; then mkdir -p #{child}; fi"
76
+ end
77
+
71
78
  if fetch(:normalize_asset_timestamps, true)
72
79
  stamp = Time.now.utc.strftime("%Y%m%d%H%M.%S")
73
80
  asset_paths = asset_children.map { |p| "#{latest_release}/#{p}" }.join(" ")
@@ -91,7 +98,7 @@ namespace :deploy do
91
98
  desc "Migrate Symfony2 Doctrine ORM database."
92
99
  task :migrate do
93
100
  currentVersion = nil
94
- run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --env=#{symfony_env_prod}" do |ch, stream, out|
101
+ run "cd #{latest_release} && #{php_bin} #{symfony_console} doctrine:migrations:status --no-ansi --env=#{symfony_env_prod}" do |ch, stream, out|
95
102
  if stream == :out and out =~ /Current Version:[^$]+\(([0-9]+)\)/
96
103
  currentVersion = Regexp.last_match(1)
97
104
  end
@@ -140,10 +147,20 @@ namespace :symfony do
140
147
  end
141
148
 
142
149
  namespace :vendors do
143
- desc "Runs the bin/vendors script to update the vendors"
144
- task :update do
150
+ desc "Runs the bin/vendors script to install the vendors (fast if already installed)"
151
+ task :install do
152
+ run "cd #{latest_release} && #{php_bin} bin/vendors install"
153
+ end
154
+
155
+ desc "Runs the bin/vendors script to reinstall the vendors"
156
+ task :reinstall do
145
157
  run "cd #{latest_release} && #{php_bin} bin/vendors install --reinstall"
146
158
  end
159
+
160
+ desc "Runs the bin/vendors script to upgrade the vendors"
161
+ task :upgrade do
162
+ run "cd #{latest_release} && #{php_bin} bin/vendors update"
163
+ end
147
164
  end
148
165
 
149
166
  namespace :cache do
@@ -295,7 +312,12 @@ after "deploy:finalize_update" do
295
312
  if update_vendors
296
313
  # share the children first (to get the vendor symlink)
297
314
  deploy.share_childs
298
- symfony.vendors.update # 1. Update vendors
315
+ vendors_mode.chomp # To remove trailing whiteline
316
+ case vendors_mode
317
+ when "upgrade" then symfony.vendors.upgrade
318
+ when "install" then symfony.vendors.install
319
+ when "reinstall" then symfony.vendors.reinstall
320
+ end
299
321
  end
300
322
 
301
323
  if assets_install
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 2
7
7
  - 1
8
- - 3
9
- version: 2.1.3
8
+ - 4
9
+ version: 2.1.4
10
10
  platform: ruby
11
11
  authors:
12
12
  - Konstantin Kudryashov
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2011-09-27 00:00:00 +03:00
17
+ date: 2011-12-19 00:00:00 +01:00
18
18
  default_executable:
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency