capifony 2.2.1 → 2.2.2

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.2.2 / November 13, 2012
+
+* test when running symfony:composer:{install,update} with enabled copy_vendors
+* Fix missing #{php_bin} variables
+* Added optional symfony:composer:copy_vendors
+
 ### 2.2.1 / November 2, 2012
 
 * Move warn message to the description. Fix #201

data/bin/capifony

@@ -5,7 +5,7 @@ require 'fileutils'
 
 symfony_version  = nil
 symfony_app_path = 'app'
-capifony_version = '2.2.1'
+capifony_version = '2.2.2'
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"

data/lib/capifony_symfony2.rb

@@ -65,6 +65,9 @@ module Capifony
         # run bin/vendors script in mode (upgrade, install (faster if shared /vendor folder) or reinstall)
         set :vendors_mode,          "reinstall"
 
+        # Copy vendors from previous release
+        set :copy_vendors,          false
+
         # Whether to run cache warmup
         set :cache_warmup,          true
 
@@ -182,6 +185,14 @@ module Capifony
           end
         end
 
+        ["symfony:composer:install", "symfony:composer:update"].each do |action|
+          before action do
+            if copy_vendors
+              symfony.composer.copy_vendors
+            end
+          end
+        end
+
         after "deploy:finalize_update" do
           if use_composer
             if update_vendors

data/lib/symfony1/propel.rb

@@ -21,9 +21,9 @@ namespace :symfony do
 
     desc "Generate model lib form and filters classes based on your schema"
     task :build_classes do
-      run "#{try_sudo} php #{latest_release}/symfony propel:build --model --env=#{symfony_env_prod}"
-      run "#{try_sudo} php #{latest_release}/symfony propel:build --forms --env=#{symfony_env_prod}"
-      run "#{try_sudo} php #{latest_release}/symfony propel:build --filters --env=#{symfony_env_prod}"
+      run "#{try_sudo} #{php_bin} #{latest_release}/symfony propel:build --model --env=#{symfony_env_prod}"
+      run "#{try_sudo} #{php_bin} #{latest_release}/symfony propel:build --forms --env=#{symfony_env_prod}"
+      run "#{try_sudo} #{php_bin} #{latest_release}/symfony propel:build --filters --env=#{symfony_env_prod}"
     end
 
     desc "Generate code & database based on your schema"
@@ -54,4 +54,4 @@ namespace :symfony do
       end
     end
   end
-end
+end

data/lib/symfony2/symfony.rb

@@ -162,6 +162,13 @@ namespace :symfony do
       run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} dump-autoload --optimize'"
       capifony_puts_ok
     end
+
+    task :copy_vendors, :except => { :no_release => true } do
+      capifony_pretty_print "--> Copying vendors from previous release"
+
+      run "vendorDir=#{current_path}/vendor; if [ -d $vendorDir ] || [ -h $vendorDir ]; then cp -a $vendorDir #{latest_release}/vendor; fi;"
+      capifony_puts_ok
+    end
   end
 
   namespace :cache do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-02 00:00:00 Z
+date: 2012-11-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano