capifony 2.1.9 → 2.1.10

data/CHANGELOG

@@ -1,3 +1,23 @@
+== 2.1.10 / July 16, 2012
+
+* Fix CS
+* Add ownership check before changing permissions
+* Add pretty output
+* Fix normalizing assets
+* Fix build bootstrap
+* Added set_permissions task
+* Fix PR #158
+* fix for remote check of composer.phar, File.exist? only checks local files
+* Fix capifony script
+* Use `--no-scripts` during `composer install/update` to avoid useless/duplicate processing.
+* Fixed database tasks for postgresql
+* Better pretty output if error raised
+* Add task for updating `assets_version` in `config.yml`
+* Avoid the use of try_sudo
+* More `:no_release`...
+*  Since `:roles` isn't used in Capifony, these need `:no_release` *at least*.
+* Fixing missing `pretty_print`.
+
 == 2.1.9 / July 3, 2012
 
 * fixed regression

data/bin/capifony

@@ -53,7 +53,7 @@ if symfony_version == 2
   files = {
     "Capfile" => unindent(<<-FILE),
       load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-      Dir['vendor/bundles/*/*/recipes/*.rb'].each { |bundle| load(bundle) }
+      Dir['vendor/**/Resources/recipes/*.rb'].each { |bundle| load(bundle) }
       load Gem.find_files('symfony2.rb').last.to_s
       load '#{symfony_app_path}/config/deploy'
     FILE
@@ -73,7 +73,7 @@ if symfony_version == 2
 
       role :web,        domain                         # Your HTTP server, Apache/etc
       role :app,        domain                         # This may be the same as your `Web` server
-      role :db,         domain, :primary => true       # This is where Rails migrations will run
+      role :db,         domain, :primary => true       # This is where Symfony2 migrations will run
 
       set  :keep_releases,  3
 
@@ -100,7 +100,7 @@ set :scm,         :git
 
 role :web,        domain                         # Your HTTP server, Apache/etc
 role :app,        domain                         # This may be the same as your `Web` server
-role :db,         domain, :primary => true       # This is where Rails migrations will run
+role :db,         domain, :primary => true       # This is where symfony migrations will run
 
 set  :keep_releases,  3'
   }
@@ -122,4 +122,4 @@ files.each do |file, content|
   end
 end
 
-puts "[done] Symfony#{symfony_version.to_s} project capifonied!"
+puts "[done] symfony #{symfony_version.to_s} project capifonied!"

data/lib/capifony.rb

@@ -48,7 +48,7 @@ namespace :deploy do
   DESC
   task :setup, :except => { :no_release => true } do
     dirs = [deploy_to, releases_path, shared_path]
-    run "#{try_sudo} mkdir -p #{dirs.join(' ')}"
-    run "#{try_sudo} chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
+    run "mkdir -p #{dirs.join(' ')}"
+    run "chmod g+w #{dirs.join(' ')}" if fetch(:group_writable, true)
   end
 end

data/lib/symfony2.rb

@@ -51,6 +51,9 @@ set :dump_assetic_assets,   false
 # Assets install
 set :assets_install,        true
 
+# Whether to update `assets_version` in `config.yml`
+set :update_assets_version, false
+
 # Files that need to remain the same between deploys
 set :shared_files,          false
 
@@ -60,6 +63,15 @@ set :shared_children,       [log_path, web_path + "/uploads"]
 # Asset folders (that need to be timestamped)
 set :asset_children,        [web_path + "/css", web_path + "/images", web_path + "/js"]
 
+# Dirs that need to be writable by the HTTP Server (i.e. cache, log dirs)
+set :writable_dirs,         [log_path, cache_path]
+
+# Name used by the Web Server (i.e. www-data for Apache)
+set :webserver_user,        "www-data"
+
+# Method used to set permissions (:chmod, :acl, or :chown)
+set :permission_method,     false
+
 # Model manager: (doctrine, propel)
 set :model_manager,         "doctrine"
 
@@ -77,7 +89,11 @@ def load_database_config(data, env)
 end
 
 def guess_symfony_version
-  capture("cd #{latest_release} && #{php_bin} #{symfony_console} --version |cut -d \" \" -f 3")
+  capture("cd #{latest_release} && #{php_bin} #{symfony_console} --version |cut -d \" \" -f 3")
+end
+
+def remote_file_exists?(full_path)
+  'true' ==  capture("if [ -e #{full_path} ]; then echo 'true'; fi").strip
 end
 
 after "deploy:finalize_update" do
@@ -95,25 +111,29 @@ after "deploy:finalize_update" do
         when "install" then symfony.vendors.install
         when "reinstall" then symfony.vendors.reinstall
       end
-    else
-      symfony.bootstrap.build
     end
   end
 
+  symfony.bootstrap.build
+
   if model_manager == "propel"
     symfony.propel.build.model
   end
 
   if assets_install
-    symfony.assets.install  # 2. Publish bundle assets
+    symfony.assets.install          # 2. Publish bundle assets
   end
 
   if cache_warmup
-    symfony.cache.warmup    # 3. Warmup clean cache
+    symfony.cache.warmup            # 3. Warmup clean cache
+  end
+
+  if update_assets_version
+    symfony.assets.update_version   # 4. Update `assets_version`
   end
 
   if dump_assetic_assets
-    symfony.assetic.dump    # 4. Dump assetic assets
+    symfony.assetic.dump            # 5. Dump assetic assets
   end
 end
 

data/lib/symfony2/database.rb

@@ -20,7 +20,7 @@ namespace :database do
           puts data
         end
       when "pdo_pgsql", "pgsql"
-        run "pg_dump -U #{config['database_user']} #{config['database_name']} | gzip -c > #{file}" do |ch, stream, data|
+        run "pg_dump -U #{config['database_user']} #{config['database_name']} --clean | gzip -c > #{file}" do |ch, stream, data|
           puts data
         end
       end
@@ -49,7 +49,7 @@ namespace :database do
       when "pdo_mysql", "mysql"
         `mysqldump -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} > #{tmpfile}`
       when "pdo_pgsql", "pgsql"
-        `pg_dump -U #{config['database_user']} #{config['database_name']} > #{tmpfile}`
+        `pg_dump -U #{config['database_user']} #{config['database_name']} --clean > #{tmpfile}`
       end
 
       File.open(tmpfile, "r+") do |f|
@@ -88,7 +88,7 @@ namespace :database do
       when "pdo_mysql", "mysql"
         `mysql -u#{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} < backups/#{sqlfile}`
       when "pdo_pgsql", "pgsql"
-        `psql -U #{config['database_user']} --password=\"#{config['database_password']}\" #{config['database_name']} < backups/#{sqlfile}`
+        `psql -U #{config['database_user']} #{config['database_name']} < backups/#{sqlfile}`
       end
       FileUtils.rm("backups/#{sqlfile}")
     end
@@ -115,7 +115,7 @@ namespace :database do
           puts data
         end
       when "pdo_pgsql", "pgsql"
-        run "psql -U #{config['database_user']} --password='#{config['database_password']}' #{config['database_name']} < /tmp/#{sqlfile}" do |ch, stream, data|
+        run "psql -U #{config['database_user']} #{config['database_name']} < /tmp/#{sqlfile}" do |ch, stream, data|
           puts data
         end
       end

data/lib/symfony2/deploy.rb

@@ -1,7 +1,55 @@
 # Overrided Capistrano tasks
 namespace :deploy do
+  desc <<-DESC
+    Sets permissions for writable_dirs folders as described in the Symfony documentation
+    (http://symfony.com/doc/master/book/installation.html#configuration-and-setup)
+  DESC
+  task :set_permissions, :roles => :app do
+    if writable_dirs && permission_method
+      dirs = []
+
+      writable_dirs.each do |link|
+        if shared_children && shared_children.include?(link)
+          absolute_link = shared_path + "/" + link
+        else
+          absolute_link = latest_release + "/" + link
+        end
+
+        dirs << absolute_link
+      end
+
+      methods = {
+        :chmod => "#{try_sudo} chmod +a \"#{webserver_user} allow delete,write,append,file_inherit,directory_inherit\" %s",
+        :acl   => "#{try_sudo} setfacl -dR -m u:#{webserver_user}:rwx %s",
+        :chown => "#{try_sudo} chown #{webserver_user} %s"
+      }
+
+      if methods[permission_method]
+        pretty_print "--> Setting permissions"
+
+        if use_sudo
+          run sprintf(methods[permission_method], dirs.join(' '))
+        else if permission_method == :chown
+          puts "    You can't use chown method without sudoing"
+        else
+          dirs.each do |dir|
+            is_owner = (capture "`echo stat #{dir} -c %U`").chomp == user
+            if is_owner && permission_method != :chown
+              run sprintf(methods[permission_method], dir)
+            else
+              puts "    #{dir} is not owned by #{user} or you are using 'chown' method without 'use_sudo'"
+            end
+          end
+        end
+        puts_ok
+      else
+        puts "    Permission method '#{permission_method}' does not exist.".yellow
+      end
+    end
+  end
+
   desc "Symlinks static directories and static files that need to remain between deployments"
-  task :share_childs do
+  task :share_childs, :except => { :no_release => true } do
     if shared_children
       pretty_print "--> Creating symlinks for shared directories"
 
@@ -51,7 +99,7 @@ namespace :deploy do
       else
         pretty_print "--> Normalizing asset timestamps"
 
-        run "find #{asset_paths} -exec touch -t #{stamp} {} ';'; true", :env => { "TZ" => "UTC" }
+        run "find #{asset_paths} -exec touch -t #{stamp} {} ';' >& /dev/null || true", :env => { "TZ" => "UTC" }
         puts_ok
       end
     end
@@ -67,7 +115,7 @@ namespace :deploy do
   end
 
   desc "Deploys the application and runs the test suite"
-  task :testall do
+  task :testall, :except => { :no_release => true } do
     update_code
     create_symlink
     run "cd #{latest_release} && phpunit -c #{app_path} src"

data/lib/symfony2/output.rb

@@ -1,9 +1,12 @@
 require 'colored'
 
+STDOUT.sync
+$error = false
+$pretty_errors_defined = false
+
 # Be less verbose by default
 logger.level = Logger::IMPORTANT
 
-STDOUT.sync
 def pretty_print(msg)
   if logger.level == Logger::IMPORTANT
     pretty_errors
@@ -16,12 +19,12 @@ def pretty_print(msg)
 end
 
 def puts_ok
-  if logger.level == Logger::IMPORTANT
+  if logger.level == Logger::IMPORTANT && !$error
     puts '✔'.green
   end
-end
 
-$pretty_errors_defined = false
+  $error = false
+end
 
 def pretty_errors
   if !$pretty_errors_defined
@@ -38,6 +41,7 @@ def pretty_errors
         end
 
         _write(s.red)
+        $error = true
       end
     end
   end

data/lib/symfony2/symfony.rb

@@ -7,8 +7,13 @@ namespace :symfony do
   end
 
   namespace :assets do
+    desc "Updates assets version (in config.yml)"
+    task :update_version, :except => { :no_release => true } do
+       run "sed -i 's/\\(assets_version: \\)\\(.*\\)$/\\1 #{real_revision}/g' #{latest_release}/app/config/config.yml"
+    end
+
     desc "Installs bundle's assets"
-    task :install do
+    task :install, :except => { :no_release => true } do
       pretty_print "--> Installing bundle's assets"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} assets:install #{web_path} --env=#{symfony_env_prod}"
@@ -18,8 +23,8 @@ namespace :symfony do
 
   namespace :assetic do
     desc "Dumps all assets to the filesystem"
-    task :dump do
-      puts "--> Dumping all assets to the filesystem"
+    task :dump, :except => { :no_release => true } do
+      pretty_print "--> Dumping all assets to the filesystem"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} assetic:dump --env=#{symfony_env_prod} --no-debug"
       puts_ok
@@ -28,7 +33,7 @@ namespace :symfony do
 
   namespace :vendors do
     desc "Runs the bin/vendors script to install the vendors (fast if already installed)"
-    task :install do
+    task :install, :except => { :no_release => true } do
       pretty_print "--> Installing vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} install"
@@ -36,7 +41,7 @@ namespace :symfony do
     end
 
     desc "Runs the bin/vendors script to reinstall the vendors"
-    task :reinstall do
+    task :reinstall, :except => { :no_release => true } do
       pretty_print "--> Reinstalling vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} install --reinstall"
@@ -44,7 +49,7 @@ namespace :symfony do
     end
 
     desc "Runs the bin/vendors script to upgrade the vendors"
-    task :upgrade do
+    task :upgrade, :except => { :no_release => true } do
       pretty_print "--> Upgrading vendors"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_vendors} update"
@@ -54,17 +59,23 @@ namespace :symfony do
 
   namespace :bootstrap do
     desc "Runs the bin/build_bootstrap script"
-    task :build do
+    task :build, :except => { :no_release => true } do
       pretty_print "--> Building bootstrap file"
 
-      run "cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped'"
+      if !remote_file_exists?("#{latest_release}/#{build_bootstrap}") && true == use_composer then
+        build_bootstrap = "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
+        run "cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} #{app_path} || echo '#{build_bootstrap} not found, skipped'"
+      else
+        run "cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped'"
+      end
+
       puts_ok
     end
   end
 
   namespace :composer do
     desc "Gets composer and installs it"
-    task :get do
+    task :get, :except => { :no_release => true } do
         pretty_print "--> Downloading Composer"
 
         run "cd #{latest_release} && curl -s http://getcomposer.org/installer | #{php_bin}"
@@ -72,33 +83,33 @@ namespace :symfony do
     end
 
     desc "Runs composer to install vendors from composer.lock file"
-    task :install do
-      if !File.exist?("#{latest_release}/composer.phar")
+    task :install, :except => { :no_release => true } do
+      if !remote_file_exists?("#{latest_release}/composer.phar")
         symfony.composer.get
       end
 
       pretty_print "--> Installing Composer dependencies"
 
-      run "cd #{latest_release} && #{php_bin} composer.phar install -v"
+      run "cd #{latest_release} && #{php_bin} composer.phar install --no-scripts --verbose"
       puts_ok
     end
 
     desc "Runs composer to update vendors, and composer.lock file"
-    task :update do
-      if !File.exist?("#{latest_release}/composer.phar")
+    task :update, :except => { :no_release => true } do
+      if !remote_file_exists?("#{latest_release}/composer.phar")
         symfony.composer.get
       end
 
       pretty_print "--> Updating Composer dependencies"
 
-      run "cd #{latest_release} && #{php_bin} composer.phar update -v"
+      run "cd #{latest_release} && #{php_bin} composer.phar update --no-scripts --verbose"
       puts_ok
     end
   end
 
   namespace :cache do
     desc "Clears cache"
-    task :clear do
+    task :clear, :except => { :no_release => true } do
       pretty_print "--> Clearing cache"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} cache:clear --env=#{symfony_env_prod}"
@@ -107,7 +118,7 @@ namespace :symfony do
     end
 
     desc "Warms up an empty cache"
-    task :warmup do
+    task :warmup, :except => { :no_release => true } do
       pretty_print "--> Warming up cache"
 
       run "cd #{latest_release} && #{php_bin} #{symfony_console} cache:warmup --env=#{symfony_env_prod}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capifony
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 2
   - 1
-  - 9
-  version: 2.1.9
+  - 10
+  version: 2.1.10
 platform: ruby
 authors: 
 - Konstantin Kudryashov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-02 00:00:00 Z
+date: 2012-07-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capistrano