capifony 2.2.10 → 2.3.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 2.3.0 / July 26, 2013
+
+* Use `symfony_env_*` variables to tail
+* Allow more Capistrano version
+* Allow custom backup path
+* chown deployment is recursive now
+
 ### 2.2.10 / June 9, 2013
 
 * "interactive_mode" should also affect composer

data/bin/capifony

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

data/lib/capifony_symfony2.rb

@@ -64,7 +64,7 @@ module Capifony
         set :composer_bin,          false
 
         # Options to pass to composer when installing/updating
-        set :composer_options,      "--no-scripts --no-dev --verbose --prefer-dist --optimize-autoloader --no-progress"
+        set :composer_options,      "--no-dev --verbose --prefer-dist --optimize-autoloader --no-progress"
 
         # Whether to update vendors using the configured dependency manager (composer or bin/vendors)
         set :update_vendors,        false
@@ -82,7 +82,6 @@ module Capifony
         set :dump_assetic_assets,   false
 
         # Assets install
-        set :assets_install,        true
         set :assets_symlinks,       false
         set :assets_relative,       false
         set :assets_install_path,   web_path
@@ -123,6 +122,9 @@ module Capifony
         # Doctrine custom entity manager
         set :doctrine_em,           false
 
+        # Database backup folder
+        set :backup_path,           "backups"
+
         # Use --flush option in doctrine:clear_* task
         set :doctrine_clear_use_flush_option, false
 
@@ -287,8 +289,6 @@ module Capifony
             end
           end
 
-          symfony.bootstrap.build
-
           if use_set_permissions
             symfony.deploy.set_permissions
           end
@@ -305,10 +305,6 @@ module Capifony
             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/database.rb

@@ -19,12 +19,12 @@ namespace :database do
       logger.level = saved_log_level
 
       require "fileutils"
-      FileUtils.mkdir_p("backups")
-      get file, "backups/#{filename}"
+      FileUtils.mkdir_p("#{backup_path}")
+      get file, "#{backup_path}/#{filename}"
       begin
-        FileUtils.ln_sf(filename, "backups/#{application}.remote_dump.latest.sql.gz")
+        FileUtils.ln_sf(filename, "#{backup_path}/#{application}.remote_dump.latest.sql.gz")
       rescue Exception # fallback for file systems that don't support symlinks
-        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.remote_dump.latest.sql.gz")
+        FileUtils.cp_r("#{backup_path}/#{filename}", "#{backup_path}/#{application}.remote_dump.latest.sql.gz")
       end
       run "#{try_sudo} rm #{file}"
     end
@@ -32,13 +32,13 @@ namespace :database do
     desc "Dump local database"
     task :local do
       filename  = "#{application}.local_dump.#{Time.now.strftime("%Y-%m-%d_%H-%M-%S")}.sql.gz"
-      tmpfile   = "backups/#{application}_dump_tmp.sql"
-      file      = "backups/#{filename}"
+      tmpfile   = "#{backup_path}/#{application}_dump_tmp.sql"
+      file      = "#{backup_path}/#{filename}"
       config    = load_database_config IO.read('config/databases.yml'), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
       require "fileutils"
-      FileUtils::mkdir_p("backups")
+      FileUtils::mkdir_p("#{backup_path}")
 
       sql_dump_cmd = generate_sql_command('dump', config)
       run_locally "#{sql_dump_cmd} > #{tmpfile}"
@@ -53,9 +53,9 @@ namespace :database do
       end
 
       begin
-        FileUtils.ln_sf(filename, "backups/#{application}.local_dump.latest.sql.gz")
+        FileUtils.ln_sf(filename, "#{backup_path}/#{application}.local_dump.latest.sql.gz")
       rescue Exception # fallback for file systems that don't support symlinks
-        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.local_dump.latest.sql.gz")
+        FileUtils.cp_r("#{backup_path}/#{filename}", "#{backup_path}/#{application}.local_dump.latest.sql.gz")
       end
       FileUtils.rm(tmpfile)
     end
@@ -68,11 +68,11 @@ namespace :database do
       database.dump.remote
 
       begin
-        zipped_file_path  = `readlink -f backups/#{application}.remote_dump.latest.sql.gz`.chop  # gunzip does not work with a symlink
+        zipped_file_path  = `readlink -f #{backup_path}/#{application}.remote_dump.latest.sql.gz`.chop  # gunzip does not work with a symlink
       rescue Exception # fallback for file systems that don't support symlinks
-        zipped_file_path  = "backups/#{application}.remote_dump.latest.sql.gz"
+        zipped_file_path  = "#{backup_path}/#{application}.remote_dump.latest.sql.gz"
       end
-      unzipped_file_path   = "backups/#{application}_dump.sql"
+      unzipped_file_path   = "#{backup_path}/#{application}_dump.sql"
 
       run_locally "gunzip -c #{zipped_file_path} > #{unzipped_file_path}"
 
@@ -91,7 +91,7 @@ namespace :database do
     task :to_remote, :roles => :db, :only => { :primary => true } do
 
       filename  = "#{application}.local_dump.latest.sql.gz"
-      file      = "backups/#{filename}"
+      file      = "#{backup_path}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 

data/lib/symfony2/database.rb

@@ -23,17 +23,17 @@ namespace :database do
         puts data
       end
 
-      FileUtils.mkdir_p("backups")
+      FileUtils.mkdir_p("#{backup_path}")
 
       capifony_progress_start
-      get(file, "backups/#{filename}", :via => :scp) do |channel, name, sent, total|
+      get(file, "#{backup_path}/#{filename}", :via => :scp) do |channel, name, sent, total|
         capifony_progress_update(sent, total)
       end
 
       begin
-        FileUtils.ln_sf(filename, "backups/#{application}.#{env}_dump.latest.sql.gz")
+        FileUtils.ln_sf(filename, "#{backup_path}/#{application}.#{env}_dump.latest.sql.gz")
       rescue Exception # fallback for file systems that don't support symlinks
-        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_dump.latest.sql.gz")
+        FileUtils.cp_r("#{backup_path}/#{filename}", "#{backup_path}/#{application}.#{env}_dump.latest.sql.gz")
       end
       run "#{try_sudo} rm -f #{file}"
     end
@@ -41,12 +41,12 @@ namespace :database do
     desc "Dumps local database"
     task :local do
       filename  = "#{application}.local_dump.#{Time.now.to_i}.sql.gz"
-      tmpfile   = "backups/#{application}_dump_tmp.sql"
-      file      = "backups/#{filename}"
+      tmpfile   = "#{backup_path}/#{application}_dump_tmp.sql"
+      file      = "#{backup_path}/#{filename}"
       config    = load_database_config IO.read("#{app_config_path}/#{app_config_file}"), symfony_env_local
       sqlfile   = "#{application}_dump.sql"
 
-      FileUtils::mkdir_p("backups")
+      FileUtils::mkdir_p("#{backup_path}")
       case config['database_driver']
       when "pdo_mysql", "mysql"
         `mysqldump -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} > #{tmpfile}`
@@ -64,9 +64,9 @@ namespace :database do
       end
 
       begin
-        FileUtils.ln_sf(filename, "backups/#{application}.local_dump.latest.sql.gz")
+        FileUtils.ln_sf(filename, "#{backup_path}/#{application}.local_dump.latest.sql.gz")
       rescue Exception # fallback for file systems that don't support symlinks
-        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.local_dump.latest.sql.gz")
+        FileUtils.cp_r("#{backup_path}/#{filename}", "#{backup_path}/#{application}.local_dump.latest.sql.gz")
       end
       FileUtils.rm(tmpfile)
     end
@@ -82,24 +82,24 @@ namespace :database do
 
       database.dump.remote
 
-      f = File.new("backups/#{sqlfile}", "a+")
-      gz = Zlib::GzipReader.new(File.open("backups/#{filename}", "r"))
+      f = File.new("#{backup_path}/#{sqlfile}", "a+")
+      gz = Zlib::GzipReader.new(File.open("#{backup_path}/#{filename}", "r"))
       f << gz.read
       f.close
 
       case config['database_driver']
       when "pdo_mysql", "mysql"
-        `mysql -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} < backups/#{sqlfile}`
+        `mysql -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} < #{backup_path}/#{sqlfile}`
       when "pdo_pgsql", "pgsql"
-        `PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} < backups/#{sqlfile}`
+        `PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} < #{backup_path}/#{sqlfile}`
       end
-      FileUtils.rm("backups/#{sqlfile}")
+      FileUtils.rm("#{backup_path}/#{sqlfile}")
     end
 
     desc "Dumps local database, loads it to remote, and populates there"
     task :to_remote, :roles => :db, :only => { :primary => true } do
       filename  = "#{application}.local_dump.latest.sql.gz"
-      file      = "backups/#{filename}"
+      file      = "#{backup_path}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
 

data/lib/symfony2/deploy.rb

@@ -27,7 +27,7 @@ namespace :deploy do
           "setfacl -R -m u:#{user}:rwX -m u:#{webserver_user}:rwX %s",
           "setfacl -dR -m u:#{user}:rwx -m u:#{webserver_user}:rwx %s"
         ],
-        :chown => ["chown #{webserver_user} %s"]
+        :chown => ["chown -R #{webserver_user} %s"]
       }
 
       if methods[permission_method]

data/lib/symfony2/symfony.rb

@@ -13,6 +13,7 @@ namespace :symfony do
       log   = action.to_s == 'tail' ? 'prod.log' : 'dev.log'
       desc "Tail #{log}"
       task action, :roles => :app, :except => { :no_release => true } do
+        log   = action.to_s == 'tail' ? "#{symfony_env_prod}.log" : "#{symfony_env_local}.log"
         run "#{try_sudo} tail -n #{lines} -f #{shared_path}/#{log_path}/#{log}" do |channel, stream, data|
           trap("INT") { puts 'Interupted'; exit 0; }
           puts
@@ -28,7 +29,7 @@ namespace :symfony do
     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"
+      run "#{try_sudo} sed -i 's/\\(assets_version:[ ]*\\)\\([a-zA-Z0-9_]*\\)\\(.*\\)$/\\1#{real_revision.to_s[0,7]}\\3/g' #{latest_release}/#{app_config_path}/config.yml"
       capifony_puts_ok
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.2.10
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-09 00:00:00.000000000 Z
+date: 2013-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -22,7 +22,7 @@ dependencies:
         version: 2.13.5
     - - <=
       - !ruby/object:Gem::Version
-        version: 2.15.4
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -33,7 +33,7 @@ dependencies:
         version: 2.13.5
     - - <=
       - !ruby/object:Gem::Version
-        version: 2.15.4
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement