capifony 2.3.0 → 2.4.0

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 2.4.0 / September 17, 2013
+
+* Fixed: copy vendor dir to latest_release, not to latest_release/vendor
+* Added: -h option with host into postgresql dump tasks
+* Fixed: assets install step disappeared ??
+* Added: variable to set options of dump-autoload action
+* Added: missing backup_path definition for symfony 1
+* Added: new gem dependency on fakefs (specs)
+* Added: backup task for the shared folder
+* Fixed: changed database backup filename to be human readable
+* Added: license to gemspec
+* Added: web_path variable
+* Fixed: set symfony environment prior calling composer install
+
 ### 2.3.0 / July 26, 2013
 
 * Use `symfony_env_*` variables to tail

data/bin/capifony

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

data/lib/capifony_symfony1.rb

@@ -20,6 +20,9 @@ set :shared_files,      %w(config/databases.yml)
 # Asset folders (that need to be timestamped)
 set :asset_children,    %w(web/css web/images web/js)
 
+# Database backup folder
+set :backup_path,           "backups"
+
 # Use ORM
 set :use_orm,           true
 

data/lib/capifony_symfony2.rb

@@ -21,6 +21,7 @@ module Capifony
         load 'symfony2/doctrine'
         load 'symfony2/propel'
         load 'symfony2/web'
+        load 'symfony2/shared'
 
         # Symfony application path
         set :app_path,              "app"
@@ -66,6 +67,9 @@ module Capifony
         # Options to pass to composer when installing/updating
         set :composer_options,      "--no-dev --verbose --prefer-dist --optimize-autoloader --no-progress"
 
+        # Options to pass to composer when dumping the autoloader (dump-autoloader)
+        set :composer_dump_autoload_options, "--optimize"
+
         # Whether to update vendors using the configured dependency manager (composer or bin/vendors)
         set :update_vendors,        false
 
@@ -82,6 +86,7 @@ module Capifony
         set :dump_assetic_assets,   false
 
         # Assets install
+        set :assets_install,        false
         set :assets_symlinks,       false
         set :assets_relative,       false
         set :assets_install_path,   web_path
@@ -309,6 +314,10 @@ module Capifony
             symfony.cache.warmup            # Warmup clean cache
           end
 
+          if assets_install
+            symfony.assets.install          # Install assets
+          end
+
           if dump_assetic_assets
             symfony.assetic.dump            # Dump assetic assets
           end

data/lib/symfony1/shared.rb

@@ -26,12 +26,12 @@ namespace :shared do
   namespace :uploads do
     desc "Download all files from remote web/uploads folder to local one"
     task :to_local do
-      download("#{shared_path}/web/uploads", "web", :via => :scp, :recursive => true)
+      download("#{shared_path}/#{web_path}/uploads", "#{web_path}", :via => :scp, :recursive => true)
     end
 
     desc "Upload all files from local web/uploads folder to remote one"
     task :to_remote do
-      upload("web/uploads", "#{shared_path}/web", :via => :scp, :recursive => true)
+      upload("#{web_path}/uploads", "#{shared_path}/#{web_path}", :via => :scp, :recursive => true)
     end
   end
 

data/lib/symfony1/symfony.rb

@@ -95,12 +95,12 @@ namespace :symfony do
 
         # First application listed becomes index.php
         if app = apps.shift
-          cmd << "cp #{release_path}/web/#{app}_#{env}.php #{release_path}/web/index.php"
+          cmd << "cp #{release_path}/#{web_path}/#{app}_#{env}.php #{release_path}/#{web_path}/index.php"
         end
 
         # All other apps are copied to their default controllers
         for app in apps
-          cmd << "cp #{release_path}/web/#{app}_#{env}.php #{release_path}/web/#{app}.php"
+          cmd << "cp #{release_path}/#{web_path}/#{app}_#{env}.php #{release_path}/#{web_path}/#{app}.php"
         end
 
         run "#{try_sudo} sh -c '#{cmd.join(';')}'" if cmd.join(';')

data/lib/symfony2/database.rb

@@ -6,7 +6,7 @@ namespace :database do
     desc "Dumps remote database"
     task :remote, :roles => :db, :only => { :primary => true } do
       env       = fetch(:deploy_env, "remote")
-      filename  = "#{application}.#{env}_dump.#{Time.now.to_i}.sql.gz"
+      filename  = "#{application}.#{env}_dump.#{Time.now.utc.strftime("%Y%m%d%H%M%S")}.sql.gz"
       file      = "#{remote_tmp_dir}/#{filename}"
       sqlfile   = "#{application}_dump.sql"
       config    = ""
@@ -19,7 +19,7 @@ namespace :database do
         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"
-        data = capture("#{try_sudo} sh -c 'PGPASSWORD=\"#{config['database_password']}\" pg_dump -U #{config['database_user']} #{config['database_name']} --clean | gzip -c > #{file}'")
+        data = capture("#{try_sudo} sh -c 'PGPASSWORD=\"#{config['database_password']}\" pg_dump -U #{config['database_user']} #{config['database_name']} -h#{config['database_host']} --clean | gzip -c > #{file}'")
         puts data
       end
 
@@ -40,7 +40,7 @@ namespace :database do
 
     desc "Dumps local database"
     task :local do
-      filename  = "#{application}.local_dump.#{Time.now.to_i}.sql.gz"
+      filename  = "#{application}.local_dump.#{Time.now.utc.strftime("%Y%m%d%H%M%S")}.sql.gz"
       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
@@ -116,7 +116,7 @@ namespace :database do
         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"
-        data = capture("#{try_sudo} PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} < #{remote_tmp_dir}/#{sqlfile}")
+        data = capture("#{try_sudo} PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} -h#{config['database_host']} < #{remote_tmp_dir}/#{sqlfile}")
         puts data
       end
 

data/lib/symfony2/shared.rb

@@ -0,0 +1,32 @@
+require 'fileutils'
+
+namespace :shared do
+  namespace :folder do
+    desc "Downloads a backup of the shared folder"
+    task :download do
+      env       = fetch(:deploy_env, "remote")
+      filename  = "#{application}.#{env}_shared.#{Time.now.utc.strftime("%Y%m%d%H%M%S")}.tar.gz"
+      file      = "#{remote_tmp_dir}/#{filename}"
+
+      capifony_pretty_print "--> Making a temporary archive of the shared directory"
+      run "#{try_sudo} sh -c 'cd #{shared_path}; tar -zcvf #{file} --exclude='cached-copy' .'"
+      capifony_puts_ok
+
+      FileUtils.mkdir_p("backups/")
+
+      capifony_progress_start
+      get(file, "backups/#{filename}", :via => :scp) do |channel, name, sent, total|
+        capifony_progress_update(sent, total)
+      end
+
+      capifony_pretty_print "--> Cleaning up"
+      begin
+        FileUtils.ln_sf(filename, "backups/#{application}.#{env}_shared.latest.tar.gz")
+      rescue Exception # fallback for file systems that don't support symlinks
+        FileUtils.cp_r("backups/#{filename}", "backups/#{application}.#{env}_shared.latest.tar.gz")
+      end
+      run "#{try_sudo} rm -f #{file}"
+      capifony_puts_ok
+    end
+  end
+end

data/lib/symfony2/symfony.rb

@@ -149,11 +149,11 @@ namespace :symfony do
       if use_composer_tmp
         logger.debug "Installing composer dependencies to #{$temp_destination}"
         capifony_pretty_print "--> Installing Composer dependencies in temp location"
-        run_locally "cd #{$temp_destination} && #{composer_bin} install #{options}"
+        run_locally "cd #{$temp_destination} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{options}"
         capifony_puts_ok
       else
         capifony_pretty_print "--> Installing Composer dependencies"
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} install #{options}'"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && SYMFONY_ENV=#{symfony_env_prod} #{composer_bin} install #{options}'"
         capifony_puts_ok
       end
     end
@@ -183,14 +183,14 @@ namespace :symfony do
       end
 
       capifony_pretty_print "--> Dumping an optimized autoloader"
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} dump-autoload --optimize'"
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} dump-autoload #{composer_dump_autoload_options}'"
       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;"
+      run "vendorDir=#{current_path}/vendor; if [ -d $vendorDir ] || [ -h $vendorDir ]; then cp -a $vendorDir #{latest_release}; fi;"
       capifony_puts_ok
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -129,6 +129,7 @@ files:
 - lib/symfony2/deploy.rb
 - lib/symfony2/doctrine.rb
 - lib/symfony2/propel.rb
+- lib/symfony2/shared.rb
 - lib/symfony2/symfony.rb
 - lib/symfony2/web.rb
 - README.md
@@ -136,7 +137,8 @@ files:
 - CHANGELOG.md
 - UPGRADE.md
 homepage: http://capifony.org
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: