capifony 2.2.7 → 2.2.8

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 2.2.8 / March 5, 2013
+
+* Remove the ability to copy of Composer
+* Use composer optimize autoloader
+* BugFix running cap deploy with user_sudo = true
+* replace run block for data capturing with capture method + make try_sudo work
+* Update assets_version before installing assets
+* Add pretty printing to symfony:assets:update_version
+* Update capifony.gemspec
+
 ### 2.2.7 / February 3, 2013
 
 * Implemented :doctrine_em configuration option (#321)

data/bin/capifony

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

data/lib/capifony_symfony2.rb

@@ -57,7 +57,7 @@ module Capifony
         set :composer_bin,          false
 
         # Options to pass to composer when installing/updating
-        set :composer_options,      "--no-scripts --verbose --prefer-dist"
+        set :composer_options,      "--no-scripts --verbose --prefer-dist --optimize-autoloader"
 
         # Whether to update vendors using the configured dependency manager (composer or bin/vendors)
         set :update_vendors,        false
@@ -250,14 +250,14 @@ module Capifony
             symfony.composer.dump_autoload
           end
 
-          if assets_install
-            symfony.assets.install          # Publish bundle assets
-          end
-
           if update_assets_version
             symfony.assets.update_version   # Update `assets_version`
           end
 
+          if assets_install
+            symfony.assets.install          # Publish bundle assets
+          end
+
           if cache_warmup
             symfony.cache.warmup            # Warmup clean cache
           end

data/lib/symfony1/symfony.rb

@@ -17,7 +17,7 @@ namespace :symfony do
 
   desc "Clears the cache"
   task :cc do
-    run "#{try_sudo} sh -c 'cd #{latest_release} && #{try_sudo} #{php_bin} ./symfony cache:clear'"
+    run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} ./symfony cache:clear'"
     run "#{try_sudo} chmod -R g+w #{latest_release}/cache"
   end
 

data/lib/symfony2/database.rb

@@ -11,19 +11,16 @@ namespace :database do
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 
-      run "#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}" do |ch, st, data|
-        config = load_database_config data, symfony_env_prod
-      end
+      data = capture("#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}")
+      config = load_database_config data, symfony_env_prod
 
       case config['database_driver']
       when "pdo_mysql", "mysql"
-        run "#{try_sudo} mysqldump -u#{config['database_user']} --host='#{config['database_host']}' --password='#{config['database_password']}' #{config['database_name']} | gzip -c > #{file}" do |ch, stream, data|
-          puts data
-        end
+        data = capture("#{try_sudo} sh -c 'mysqldump -u#{config['database_user']} --host='#{config['database_host']}' --password='#{config['database_password']}' #{config['database_name']} | gzip -c > #{file}'")
+        puts data
       when "pdo_pgsql", "pgsql"
-        run "#{try_sudo} pg_dump -U #{config['database_user']} #{config['database_name']} --clean | gzip -c > #{file}" do |ch, stream, data|
-          puts data
-        end
+        data = capture("#{try_sudo} sh -c 'pg_dump -U #{config['database_user']} #{config['database_name']} --clean | gzip -c > #{file}'")
+        puts data
       end
 
       FileUtils.mkdir_p("backups")
@@ -33,7 +30,7 @@ namespace :database do
       rescue Exception # fallback for file systems that don't support symlinks
         FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_dump.latest.sql.gz")
       end
-      run "#{try_sudo} rm #{file}"
+      run "#{try_sudo} rm -f #{file}"
     end
 
     desc "Dumps local database"
@@ -106,23 +103,20 @@ namespace :database do
       upload(file, "#{remote_tmp_dir}/#{filename}", :via => :scp)
       run "#{try_sudo} gunzip -c #{remote_tmp_dir}/#{filename} > #{remote_tmp_dir}/#{sqlfile}"
 
-      run "#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}" do |ch, st, data|
-        config = load_database_config data, symfony_env_prod
-      end
+      data = capture("#{try_sudo} cat #{current_path}/#{app_config_path}/#{app_config_file}")
+      config = load_database_config data, symfony_env_prod
 
       case config['database_driver']
       when "pdo_mysql", "mysql"
-        run "#{try_sudo} mysql -u#{config['database_user']} --host='#{config['database_host']}' --password='#{config['database_password']}' #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}" do |ch, stream, data|
-          puts data
-        end
+        data = capture("#{try_sudo} mysql -u#{config['database_user']} --host='#{config['database_host']}' --password='#{config['database_password']}' #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}")
+        puts data
       when "pdo_pgsql", "pgsql"
-        run "#{try_sudo} psql -U #{config['database_user']} #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}" do |ch, stream, data|
-          puts data
-        end
+        data = capture("#{try_sudo} psql -U #{config['database_user']} #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}")
+        puts data
       end
 
-      run "#{try_sudo} rm #{remote_tmp_dir}/#{filename}"
-      run "#{try_sudo} rm #{remote_tmp_dir}/#{sqlfile}"
+      run "#{try_sudo} rm -f #{remote_tmp_dir}/#{filename}"
+      run "#{try_sudo} rm -f #{remote_tmp_dir}/#{sqlfile}"
     end
   end
 end

data/lib/symfony2/symfony.rb

@@ -26,7 +26,10 @@ namespace :symfony do
   namespace :assets do
     desc "Updates assets version (in config.yml)"
     task :update_version, :roles => :app, :except => { :no_release => true } do
+      capifony_pretty_print "--> Updating assets version (in config.yml)"
+
       run "#{try_sudo} sed -i 's/\\(assets_version:[ ]*\\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1#{real_revision[0,7]}\\3/g' #{latest_release}/#{app_config_path}/config.yml"
+      capifony_puts_ok
     end
 
     desc "Installs bundle's assets"
@@ -97,12 +100,6 @@ namespace :symfony do
   namespace :composer do
     desc "Gets composer and installs it"
     task :get, :roles => :app, :except => { :no_release => true } do
-      if remote_file_exists?("#{previous_release}/composer.phar")
-        capifony_pretty_print "--> Copying Composer from previous release"
-        run "#{try_sudo} sh -c 'cp #{previous_release}/composer.phar #{latest_release}/'"
-        capifony_puts_ok
-      end
-
       if !remote_file_exists?("#{latest_release}/composer.phar")
         capifony_pretty_print "--> Downloading Composer"
 

metadata

@@ -1,106 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: capifony
-version: !ruby/object:Gem::Version 
-  hash: 9
+version: !ruby/object:Gem::Version
+  version: 2.2.8
   prerelease: 
-  segments: 
-  - 2
-  - 2
-  - 7
-  version: 2.2.7
 platform: ruby
-authors: 
+authors:
 - Konstantin Kudryashov
 - William Durand
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 2
-        - 13
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.13.5
-    - - <=
-      - !ruby/object:Gem::Version 
-        hash: 53
-        segments: 
-        - 2
-        - 14
-        - 1
-        version: 2.14.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.15'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.13.5
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.15'
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: inifile
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: inifile
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 0
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: capistrano-maintenance
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: capistrano-maintenance
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 0
-        - 2
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
-  version_requirements: *id004
-description: "    Capistrano is an open source tool for running scripts on multiple servers. It\xE2\x80\x99s primary use is for easily deploying applications. While it was built specifically for deploying Rails apps, it\xE2\x80\x99s pretty simple to customize it to deploy other types of applications. This package is a deployment \"recipe\" to work with symfony (both 1 and 2) applications.\n"
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+description: ! '    Capistrano is an open source tool for running scripts on multiple
+  servers. It’s primary use is for easily deploying applications. While it was built
+  specifically for deploying Rails apps, it’s pretty simple to customize it to deploy
+  other types of applications. This package is a deployment "recipe" to work with
+  symfony (both 1 and 2) applications.
+
+'
+email:
 - ever.zet@gmail.com
 - william.durand1@gmail.com
-executables: 
+executables:
 - capifony
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/capifony
 - lib/capifony.rb
 - lib/capifony_symfony1.rb
@@ -124,36 +120,26 @@ files:
 - UPGRADE.md
 homepage: http://capifony.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: capifony
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Deploying symfony PHP applications with Capistrano.
 test_files: []
-