capifony 2.2.9 → 2.2.10

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+### 2.2.10 / June 9, 2013
+
+* "interactive_mode" should also affect composer
+* Override copy strategy to allow vendors to be installed locally.
+* Add "--no-progress" to composers default options
+* Improved #112 password is passed to pg_dump and psql
+* Implemented progress bar on "database:dump:remote"
+* Implemented wrapper around "ruby-progressbar" gem
+* also copy vendors for vendors:install and vendors:upgrade
+* Updated composer_options for the upcoming changes in composer.
+
 ### 2.2.9 / May 6, 2013
 
 * Change setfacl call to match Symfony2 permission granting instructions

data/bin/capifony

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

data/lib/capifony_symfony2.rb

@@ -6,6 +6,7 @@ require 'fileutils'
 require 'inifile'
 require 'yaml'
 require 'zlib'
+require 'ruby-progressbar'
 
 module Capifony
   module Symfony2
@@ -29,7 +30,7 @@ module Capifony
 
         # Symfony console bin
         set :symfony_console,       app_path + "/console"
-        
+
         # Symfony debug flag for console commands
         set :symfony_debug,         false
 
@@ -55,12 +56,15 @@ module Capifony
         # If set to false, it will use the bin/vendors script
         set :use_composer,          false
 
+        # Whether to use composer to install vendors to a local temp directory.
+        set :use_composer_tmp,     false
+
         # Path to composer binary
         # If set to false, Capifony will download/install composer
         set :composer_bin,          false
 
         # Options to pass to composer when installing/updating
-        set :composer_options,      "--no-scripts --verbose --prefer-dist --optimize-autoloader"
+        set :composer_options,      "--no-scripts --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
@@ -118,8 +122,8 @@ module Capifony
 
         # Doctrine custom entity manager
         set :doctrine_em,           false
-        
-        # Use --flush option in doctrine:clear_* task 
+
+        # Use --flush option in doctrine:clear_* task
         set :doctrine_clear_use_flush_option, false
 
         # Symfony2 version
@@ -152,14 +156,14 @@ module Capifony
         def remote_command_exists?(command)
           'true' == capture("if [ -x \"$(which #{command})\" ]; then echo 'true'; fi").strip
         end
-        
+
         def console_options
           console_options = "--env=#{symfony_env_prod}"
-          
+
           if !symfony_debug
              console_options += " --no-debug"
           end
-          
+
           return console_options
         end
 
@@ -211,6 +215,36 @@ module Capifony
           end
         end
 
+        $progress_bar = nil
+        $download_msg_padding = nil
+
+        def capifony_progress_start(msg = "--> Working")
+          $download_msg_padding = '.' * (60 - msg.size)
+          # Format is equivalent to "Title............82% ETA: 00:00:12"
+          $progress_bar = ProgressBar.create(
+            :title => msg,
+            :format => "%t%B %p%% %e",
+            :length => 60,
+            :progress_mark => "."
+          )
+        end
+
+        def capifony_progress_update(current, total)
+          unless $progress_bar
+            raise "Please create a progress bar using capifony_progress_start"
+          end
+
+          percent = (current.to_f / total.to_f * 100).floor
+
+          if percent > 99
+            green_tick = '✔'.green
+            # Format is equivalent to "Title.............✔"
+            $progress_bar.format("%t#{$download_msg_padding}#{green_tick}")
+          end
+
+          $progress_bar.progress = percent
+        end
+
         [
           "symfony:doctrine:cache:clear_metadata",
           "symfony:doctrine:cache:clear_query",
@@ -227,7 +261,7 @@ module Capifony
           end
         end
 
-        ["symfony:composer:install", "symfony:composer:update"].each do |action|
+        ["symfony:composer:install", "symfony:composer:update", "symfony:vendors:install", "symfony:vendors:upgrade"].each do |action|
           before action do
             if copy_vendors
               symfony.composer.copy_vendors
@@ -236,7 +270,7 @@ module Capifony
         end
 
         after "deploy:finalize_update" do
-          if use_composer
+          if use_composer && !use_composer_tmp
             if update_vendors
               symfony.composer.update
             else
@@ -263,7 +297,7 @@ module Capifony
             symfony.propel.build.model
           end
 
-          if use_composer
+          if use_composer && !use_composer_tmp
             symfony.composer.dump_autoload
           end
 

data/lib/capistrano/recipes/deploy/strategy/capifony_copy_local.rb

@@ -0,0 +1,25 @@
+require 'capistrano/recipes/deploy/strategy/copy'
+require 'fileutils'
+require 'capifony_symfony2'
+
+module Capistrano
+  module Deploy
+    module Strategy
+      class CapifonyCopyLocal < Copy
+        print "--> Using Copy Local Strategy\n"
+        # Deploy
+        def deploy!
+          copy_cache ? run_copy_cache_strategy : run_copy_strategy
+          create_revision_file
+          $temp_destination = destination  # Make temp location avaliable globally.
+          symfony.composer.install
+          symfony.bootstrap.build
+          compress_repository
+          distribute!
+        ensure
+          rollback_changes
+        end
+      end
+    end
+  end
+end

data/lib/symfony2/database.rb

@@ -19,12 +19,17 @@ 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 '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']} --clean | gzip -c > #{file}'")
         puts data
       end
 
       FileUtils.mkdir_p("backups")
-      get file, "backups/#{filename}"
+
+      capifony_progress_start
+      get(file, "backups/#{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")
       rescue Exception # fallback for file systems that don't support symlinks
@@ -46,7 +51,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']} --clean > #{tmpfile}`
+        `PGPASSWORD=\"#{config['database_password']}\" pg_dump -U #{config['database_user']} #{config['database_name']} --clean > #{tmpfile}`
       end
 
       File.open(tmpfile, "r+") do |f|
@@ -86,7 +91,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']} #{config['database_name']} < backups/#{sqlfile}`
+        `PGPASSWORD=\"#{config['database_password']}\" psql -U #{config['database_user']} #{config['database_name']} < backups/#{sqlfile}`
       end
       FileUtils.rm("backups/#{sqlfile}")
     end
@@ -111,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} 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']} < #{remote_tmp_dir}/#{sqlfile}")
         puts data
       end
 

data/lib/symfony2/symfony.rb

@@ -84,15 +84,26 @@ namespace :symfony do
   namespace :bootstrap do
     desc "Runs the bin/build_bootstrap script"
     task :build, :roles => :app, :except => { :no_release => true } do
-      capifony_pretty_print "--> Building bootstrap file"
-
-      if !remote_file_exists?("#{latest_release}/#{build_bootstrap}") && true == use_composer then
-        set :build_bootstrap, "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
-        run "#{try_sudo} sh -c 'cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} #{app_path} || echo '#{build_bootstrap} not found, skipped''"
+      if use_composer_tmp
+        logger.debug "Building bootstrap file in #{$temp_destination}"
+        capifony_pretty_print "--> Building bootstrap file in temp location"
+
+        if !File.exists?("#{$temp_destination}/#{build_bootstrap}") && true == use_composer then
+          set :build_bootstrap, "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
+          run_locally "cd #{$temp_destination} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} #{app_path} || echo '#{build_bootstrap} not found, skipped'"
+        else
+          run_locally "cd #{$temp_destination} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped'"
+        end
       else
-        run "#{try_sudo} sh -c 'cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped''"
-      end
+        capifony_pretty_print "--> Building bootstrap file"
 
+        if !remote_file_exists?("#{latest_release}/#{build_bootstrap}") && true == use_composer then
+          set :build_bootstrap, "vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/bin/build_bootstrap.php"
+          run "#{try_sudo} sh -c 'cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} #{app_path} || echo '#{build_bootstrap} not found, skipped''"
+        else
+          run "#{try_sudo} sh -c 'cd #{latest_release} && test -f #{build_bootstrap} && #{php_bin} #{build_bootstrap} || echo '#{build_bootstrap} not found, skipped''"
+        end
+      end
       capifony_puts_ok
     end
   end
@@ -100,14 +111,21 @@ 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?("#{latest_release}/composer.phar")
-        capifony_pretty_print "--> Downloading Composer"
-
-        run "#{try_sudo} sh -c 'cd #{latest_release} && curl -s http://getcomposer.org/installer | #{php_bin}'"
+      if use_composer_tmp
+        # Because we always install to temp location we assume that we download composer every time.
+        logger.debug "Downloading composer to #{$temp_destination}"
+        capifony_pretty_print "--> Downloading Composer to temp location"
+        run_locally "cd #{$temp_destination} && curl -s http://getcomposer.org/installer | #{php_bin}"
       else
-        capifony_pretty_print "--> Updating Composer"
+        if !remote_file_exists?("#{latest_release}/composer.phar")
+          capifony_pretty_print "--> Downloading Composer"
+
+          run "#{try_sudo} sh -c 'cd #{latest_release} && curl -s http://getcomposer.org/installer | #{php_bin}'"
+        else
+          capifony_pretty_print "--> Updating Composer"
 
-        run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} composer.phar self-update'"
+          run "#{try_sudo} sh -c 'cd #{latest_release} && #{php_bin} composer.phar self-update'"
+        end
       end
       capifony_puts_ok
     end
@@ -116,14 +134,27 @@ namespace :symfony do
 
     desc "Runs composer to install vendors from composer.lock file"
     task :install, :roles => :app, :except => { :no_release => true } do
+
       if !composer_bin
         symfony.composer.get
         set :composer_bin, "#{php_bin} composer.phar"
       end
 
-      capifony_pretty_print "--> Installing Composer dependencies"
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} install #{composer_options}'"
-      capifony_puts_ok
+      options = "#{composer_options}"
+      if !interactive_mode
+        options += " --no-interaction"
+      end
+
+      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}"
+        capifony_puts_ok
+      else
+        capifony_pretty_print "--> Installing Composer dependencies"
+        run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} install #{options}'"
+        capifony_puts_ok
+      end
     end
 
     desc "Runs composer to update vendors, and composer.lock file"
@@ -133,8 +164,13 @@ namespace :symfony do
         set :composer_bin, "#{php_bin} composer.phar"
       end
 
+      options = "#{composer_options}"
+      if !interactive_mode
+        options += " --no-interaction"
+      end
+
       capifony_pretty_print "--> Updating Composer dependencies"
-      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} update #{composer_options}'"
+      run "#{try_sudo} sh -c 'cd #{latest_release} && #{composer_bin} update #{options}'"
       capifony_puts_ok
     end
 
@@ -156,6 +192,22 @@ namespace :symfony do
       run "vendorDir=#{current_path}/vendor; if [ -d $vendorDir ] || [ -h $vendorDir ]; then cp -a $vendorDir #{latest_release}/vendor; fi;"
       capifony_puts_ok
     end
+
+    # Install composer to temp directory.
+    # Not sure if this is required yet.
+    desc "Dumps an optimized autoloader"
+    task :dump_autoload_temp, :roles => :app, :except => { :no_release => true } do
+      if !composer_bin
+        symfony.composer.get_temp
+        set :composer_bin, "#{php_bin} composer.phar"
+      end
+
+      logger.debug "Dumping an optimised autoloader to #{$temp_destination}"
+      capifony_pretty_print "--> Dumping an optimized autoloader to temp location"
+      run_locally cd "#{$temp_destination} && #{composer_bin} dump-autoload --optimize"
+      capifony_puts_ok
+    end
+
   end
 
   namespace :cache do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capifony
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -20,9 +20,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
-    - - <
+    - - <=
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 2.15.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -31,9 +31,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.13.5
-    - - <
+    - - <=
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 2.15.4
 - !ruby/object:Gem::Dependency
   name: colored
   requirement: !ruby/object:Gem::Requirement
@@ -82,6 +82,22 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.3
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.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
@@ -101,6 +117,7 @@ files:
 - lib/capifony.rb
 - lib/capifony_symfony1.rb
 - lib/capifony_symfony2.rb
+- lib/capistrano/recipes/deploy/strategy/capifony_copy_local.rb
 - lib/symfony1/database.rb
 - lib/symfony1/deploy.rb
 - lib/symfony1/doctrine.rb