alcapon 0.4.15 → 0.4.16

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 4375e3cc5ebf8dcab9094ad15ebd41a49dfc25639056827f6fcf821cd307867824cf822b7c122c24bef452fafbc58a8c4bd1f569b0306ff94eec011a4eae8d38
-  metadata.gz: f20a5cad5a195de62da33b9f91f773c5f62f9f970bf8f26692b7f59a24d37d20cfda78b64c50a6cb8fa977cda6d6eadf52194f5831b471b9554df034afa7df35
-SHA1: 
-  data.tar.gz: 7629eeca6cc423a2b7be1355e31df41e6d599a82
-  metadata.gz: 1185f76ba259f58acaaba706b6e4e528d2130431
+---
+SHA1:
+  metadata.gz: a0e738df5d005a7f987058d4792b83a03e86b7a4
+  data.tar.gz: 98e79d8c973a214ff4599339d5ed2ce846475cc6
+SHA512:
+  metadata.gz: 63b88770650ac8adaba8cec4d1b1738df5ba1206afe6493701429855f5d9dd50293f7d50ef1cdb3728b2b1a5b62ca433fb17d918e0594b50f2d66a67db8ddb17
+  data.tar.gz: ce3f23f9716ee5e4e3e5c04ce38e287c47d34e675d301bb066b3c667d41a3295d90c070556be7399c595ef70562a745cdb17b60ba5f1be4942ee09502ade0d77

data/README.md

@@ -9,7 +9,9 @@ it on a preproduction environment before going further. Please also do read the
 "Known bugs" section carefully.
 
 CAPISTRANO dependency : we recommand not to use Capistrano >= 2.15 which for some
-reason broke something (see #7)
+reason broke something (see https://github.com/alafon/alcapon/issues/7 and https://github.com/alafon/capistrano/commit/e4f207b4b44e9fa5fa18ec4e85a7469d94570095)
+
+AlCapON is not fully compatible with Capistrano 3.x, we are working on it and we recommand to stay on the 2.x branch
 
 ## Changelog
 

data/bin/capezit

@@ -157,6 +157,19 @@ files = {
     # If not set, permissions remain unchanged
     #set :shared_children_group, "\#{webserver_group}"
 
+    # Which autoloads to generate. By default, regenerates extensions and
+    # kernel-override autoloads
+    # Possible values : see bin/php/ezpgenerateautoloads.php --help
+    # Feature can be disabled by using :
+    #set :autoload_list, []
+    set :autoload_list, [ "extension", "kernel-override" ]
+
+    # eZ Publish 4 only
+
+    # trigger ezpublish.cache.clear at the end of the deployment
+    # default: false
+    #set :ezp4_trigger_cache_clear, true
+
     # eZ Publish 5 only
 
     # assets configuration (default is 'web')
@@ -165,7 +178,8 @@ files = {
     # used by the console with --env=<env>
     set :ezp5_env, 'prod'
 
-    # used by ezpublish:configure to generate ezp5 configuration files based on the ezp4 ones
+    # used by ezpublish:configure to generate ezp5 configuration files based on
+    # the ezp4 ones
     #set :ezp5_siteaccess_groupname, 'ezflow_site'
     #set :ezp5_admin_siteaccess, 'ezflow_site_admin'
 
@@ -174,18 +188,19 @@ files = {
     # IMPORTANT: requires that the database is already created before it is run
     set :ezp5_regenerate_config, false
 
-    # Which autoloads to generate. By default, regenerates extensions and
-    # kernel-override autoloads
-    # Possible values : see bin/php/ezpgenerateautoloads.php --help
-    # Feature can be disabled by using :
-    #set :autoload_list, []
-    set :autoload_list, [ "extension", "kernel-override" ]
 
     # TODO : use yml files to manage database credentials securely
     # See http://www.simonecarletti.com/blog/2009/06/capistrano-and-database-yml/
+    # These settings are also use for remote database backup
+    set :database_server, "localhost"
+    set :database_name, "dbname"
     set :database_uname, "dbuname"
     set :database_passd, "dbpasswd"
-    set :database_name, "dbname"
+    # The :database_local_passd parameter can be used when importing with
+    # `cap db:import_to_local` (ie: your local db password != database_passd)
+    #set :database_local_passd, "localpassword"
+
+    # TODO : also provide backup for cluster setup (ezdbfile & co)
 
     # Check-list (used by cap setup:check)
     depend :remote, :command, "php"

data/lib/capez.rb

@@ -296,7 +296,7 @@ namespace :ezpublish do
       # creates a storage dir for elements specified by :storage_directories
       storage_directories.each{ |sd|
         print_dotted( "var/#{sd}/storage" )
-        run( "mkdir #{latest_release}/" + ezp_legacy_path( "var/#{sd}" ) )
+        run( "mkdir -p #{latest_release}/" + ezp_legacy_path( "var/#{sd}" ) )
         capez_puts_done
       }
 
@@ -369,7 +369,7 @@ namespace :ezpublish do
         exclude_string << "--exclude '#{item}' "
       }
 
-      try_sudo( "chown -R #{user}:#{webserver_user} #{shared_path}/var/*" )
+      try_sudo( "chown -R #{user}:#{webserver_group} #{shared_path}/var/*" )
       run_locally( "rsync -az #{exclude_string} #{ezp_legacy_path('var')}/* #{user}@#{shared_host}:#{shared_path}/var/ " )
       try_sudo( "chown -R #{webserver_user} #{shared_path}/var/*" )
       try_sudo( "chmod -R ug+rwx #{shared_path}/var/*" )

data/lib/db.rb

@@ -18,9 +18,10 @@ namespace :db do
       i += 1
     }
     file_to_import = Capistrano::CLI.ui.ask "Which one ?"
+    dbpasswd = fetch( :database_local_passd, "#{database_passd}" )
     if files.has_key?( file_to_import.to_i )
       filename = File.join( backup_dir, files[file_to_import.to_i] )
-      system( "gunzip < #{filename} | mysql -u#{database_uname} -p#{database_passd} #{database_name} ")
+      system( "gunzip < #{filename} | mysql -u#{database_uname} -p#{dbpasswd} #{database_name} ")
     else
       abort "Bad index"
     end
@@ -30,16 +31,24 @@ namespace :db do
   desc <<-DESC
     Creates a backup from a remote database server
   DESC
-  task :backup, :roles => :db do
-    filename = generate_backup_name
+  task :backup, :roles => :web, :only => { :primary => true } do
+    filename = generate_backup_name( database_name )
     file = File.join( "/tmp", filename )
-      on_rollback do
-        run "rm #{file}"
-      end
-    run "mysqldump -u#{database_uname} -p#{database_passd} #{database_name} | gzip > #{file}"
     backup_dir_for_this_stage = File.join( get_backup_dir, "#{stage}" )
-    create_backup_dir( backup_dir_for_this_stage )
-    get( file, File.join( backup_dir_for_this_stage, filename ), :via => :scp )
+    on_rollback do
+      run "rm #{file}"
+    end
+    dump_result = nil
+    run "mysqldump -h#{database_server} -u#{database_uname} -p #{database_name} | gzip > #{file}" do |ch, stream, out|
+      ch.send_data "#{database_passd}\n" if out =~ /^Enter password:/
+      dump_result = out
+    end
+    if dump_result =~ /.*error.*1045/i
+      puts "Access denied on '#{database_server}' with user '#{database_uname}'".red
+    else
+      create_backup_dir( backup_dir_for_this_stage )
+      get( file, File.join( backup_dir_for_this_stage, filename ), :via => :scp )
+    end
     run "rm #{file}"
   end
 
@@ -49,12 +58,12 @@ namespace :db do
   task :backup_local do
     backup_dir = File.join( get_backup_dir, 'local' )
     create_backup_dir( backup_dir )
-    filename = File.join( backup_dir, generate_backup_name )
+    filename = File.join( backup_dir, generate_backup_name( database_name ) )
     system("mysqldump -u#{database_uname} -p#{database_passd} #{database_name} | gzip -9 > #{filename}")
   end
 
-  def generate_backup_name
-    return "#{Time.now.strftime '%Y-%m%d-%H%M%S'}.sql.gz"
+  def generate_backup_name(dbname)
+    return "#{Time.now.strftime '%Y-%m%d-%H%M%S'}-#{dbname}.sql.gz"
   end
 
   def create_backup_dir( path )

data/lib/ezpublish4.rb

@@ -10,7 +10,8 @@ after "deploy:finalize_update" do
   ezpublish.var.link
   ezpublish.settings.deploy
   ezpublish.autoloads.generate
-  #ezpublish.cache.clear
+  if fetch( :ezp4_trigger_cache_clear, false )
+    ezpublish.cache.clear
 end
 
 namespace :ezpublish do

data/lib/ezpublish5/ezpublish.rb

@@ -16,7 +16,7 @@ namespace :ezpublish do
       else
       cache_list.each { |cache_tag|
         print_dotted( "#{cache_tag}" )
-        capture "cd #{latest_release}/#{ezp_legacy_path} && sudo -u #{sudo_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
+        run "cd #{latest_release}/#{ezp_legacy_path} && sudo -u #{sudo_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
         capez_puts_done
       }
       end
@@ -29,8 +29,8 @@ namespace :ezpublish do
     DESC
     task :install, :roles => :web do
       print_dotted( "\n--> Generating web assets in #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
+      run( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
+      run( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
       capez_puts_done
     end
   end
@@ -42,7 +42,7 @@ namespace :ezpublish do
     task :configure, :roles => :web do
       print_dotted( "\n--> Generating ezp5 configuration files from ezp4 ones" )
       if( fetch('ezp5_siteaccess_groupname',false) != false && fetch('ezp5_admin_siteaccess',false) != false )
-        capture( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:configure --env=#{fetch('ezp5_env','prod')} #{ezp5_siteaccess_groupname} #{ezp5_admin_siteaccess}" )
+        run( "cd #{latest_release} && sudo -u #{fetch(:php_user,user)} php ezpublish/console ezpublish:configure --env=#{fetch('ezp5_env','prod')} #{ezp5_siteaccess_groupname} #{ezp5_admin_siteaccess}" )
       else
         abort( "Since version 0.4.3, you need to set ezp5_siteaccess_groupname & ezp5_admin_siteaccess".red )
       end
@@ -51,4 +51,4 @@ namespace :ezpublish do
 
   end
 
-end
+end

metadata

@@ -1,45 +1,52 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: alcapon
-version: !ruby/object:Gem::Version 
-  version: 0.4.15
+version: !ruby/object:Gem::Version
+  version: 0.4.16
 platform: ruby
-authors: 
+authors:
 - Arnaud Lafon
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-05-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.14.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colored
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "1.2"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
-  version_requirements: *id002
-description: Capistrano is a utility and framework for executing commands in parallel on multiple remote machines, via SSH. This package gives you some tools to deploy your eZ Publish projects.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+description: Capistrano is a utility and framework for executing commands in parallel
+  on multiple remote machines, via SSH. This package gives you some tools to deploy
+  your eZ Publish projects.
 email: alcapon@arnaudlafon.com
-executables: 
+executables:
 - capezit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/capezit
 - lib/capez.rb
 - lib/db.rb
@@ -52,30 +59,27 @@ files:
 - README.md
 - LICENSE.md
 homepage: http://alafon.github.io/alcapon/
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id003 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enable Capistrano for your eZ Publish projects
 test_files: []
-