alcapon 0.4.5 → 0.4.6

data/bin/capezit

@@ -3,8 +3,8 @@
 require 'optparse'
 require 'fileutils'
 
-alcapon_path  = 'extension/alcapon'
-FileUtils.mkdir_p(File.join(alcapon_path,'config/deploy'))
+ezpublish_version  = nil
+alcapon_version = "0.4.6"
 
 OptionParser.new do |opts|
   opts.banner = "Usage: #{File.basename($0)} [path]"
@@ -14,6 +14,11 @@ OptionParser.new do |opts|
     exit 0
   end
 
+  opts.on("-v", "--version", "") do
+    puts "alcapon v#{alcapon_version}"
+    exit 0
+  end
+
   begin
     opts.parse!(ARGV)
   rescue OptionParser::ParseError => e
@@ -38,10 +43,21 @@ def unindent(string)
   string.strip.gsub(/^#{indentation}/, "")
 end
 
+base = ARGV.shift
+ezpublish_version = ezpublish_version || ((File.directory? File.join(base, 'ezpublish')) ? 5 : 4)
+
+if ezpublish_version == 5
+    alcapon_path = 'ezpublish_legacy/extension/alcapon'
+else
+    alcapon_path = 'extension/alcapon'
+end
+
+FileUtils.mkdir_p(File.join(alcapon_path,'config/deploy'))
+
 files = {
   "Capfile" => unindent(<<-FILE),
     set :alcapon_path, \"#{alcapon_path}\"
-    set :ezpublish_version, 4
+    set :ezpublish_version, #{ezpublish_version}
 
     load 'deploy' if respond_to?(:namespace) # cap2 differentiator
     Dir['vendor/gems/*/recipes/*.rb','vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
@@ -94,6 +110,7 @@ files = {
     # Prevents you from cloning the whole rep. each deploy but your remote servers
     # must be able to get connected to your scm server
     set :deploy_via, :remote_cache
+    set :copy_exclude, [ '.git' ]
 
     # Your Primary HTTP server
     # (Use config/deploy/*.rb files instead if you need a multisage setup)
@@ -170,7 +187,7 @@ files = {
 
     # Check-list (used by cap setup:check)
     depend :remote, :command, "php"
-    depend :remote, :match, "php -r \\"echo(version_compare(PHP_VERSION,'5.2.14')?'ok':'ko');\\"", "ok"
+    depend :remote, :match, "php -r \\"echo(version_compare(PHP_VERSION,'5.3.3')?'ok':'ko');\\"", "ok"
     depend :remote, :match, "php -m | grep curl", "curl"
 
     # TODO
@@ -183,6 +200,9 @@ files = {
   "#{alcapon_path}/config/deploy/devel.rb" => unindent(<<-FILE),
     # There you can override default settings for this specific environment
 
+    # Triggers local modification, based on the vcs used (only git supported)
+    set :enable_local_check, true
+
     set :branch, "dev"
     #role :web, "myapp.devserv", :primary => true           # Your Primary HTTP server
 
@@ -219,8 +239,6 @@ files = {
   FILE
   }
 
-base = ARGV.shift
-
 files.each do |file, content|
   file = File.join(base, file)
   if File.exists?(file)

data/lib/capez.rb

@@ -37,7 +37,7 @@ after "deploy:setup", :roles => :web do
   print_dotted( "--> Fixing permissions on deployment directory" )
   try_sudo( "chown -R #{user} #{deploy_to}" ) # if not code checkout cannot be done :/
   capez_puts_done
-  capez.var.init_shared
+  ezpublish.var.init_shared
 end
 
 before "deploy:update_code" do
@@ -63,7 +63,9 @@ before "deploy:finalize_update" do
 end
 
 before "deploy", :roles => :web do
-  capez.dev.local_check
+  if fetch( :enable_local_check, false )
+    ezpublish.dev.local_check
+  end
   deploy.web.disable
 end
 
@@ -84,8 +86,7 @@ namespace :deploy do
 
   namespace :web do
     desc <<-DESC
-      Puts a html file somewhere in the documentroot
-      This file is displayed by a RewriteRule if it exists
+      Puts a html file somewhere in the documentroot. This file is displayed by a RewriteRule if it exists
     DESC
     task :disable do
     end
@@ -109,7 +110,7 @@ namespace :deploy do
 end
 
 
-namespace :capez do
+namespace :ezpublish do
   namespace :settings do
 
     def make_file_changes( options={} )
@@ -242,7 +243,7 @@ namespace :capez do
         capez_puts_done
       }
       run( "chmod -R g+w #{shared_path}/var")
-      run( "chown -R #{fetch(:webserver_group,user)} #{shared_path}/var")
+      try_sudo( "chown -R #{fetch(:webserver_group,user)} #{shared_path}/var")
     end
 
 
@@ -258,7 +259,7 @@ namespace :capez do
         folders_path.each{ |fp|
           print_dotted( "#{fp}" )
           run( "mkdir -p #{latest_release}/#{fp}")
-          run( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{latest_release}/#{fp}" )
+          try_sudo( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{latest_release}/#{fp}" )
           run( "chmod -R g+wx #{latest_release}/#{fp}" )
           capez_puts_done
         }
@@ -273,7 +274,7 @@ namespace :capez do
 
       # makes sure the webserver can write into var/
       run( "chmod -R g+w #{latest_release}/" + ezp_legacy_path( "var" ) )
-      run( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{latest_release}/" + ezp_legacy_path( "var" ) )
+      try_sudo( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{latest_release}/" + ezp_legacy_path( "var" ) )
 
       # needed even if we just want to run 'bin/php/ezpgenerateautoloads.php' with --extension
       # autoload seems to be mandatory for "old" version such as 4.0, 4.1, ...
@@ -281,7 +282,7 @@ namespace :capez do
       autoload_path = File.join( latest_release, ezp_legacy_path( 'autoload' ) )
       run( "if [ ! -d #{autoload_path} ]; then mkdir -p #{autoload_path}; fi;" )
       capez_puts_done
-      run( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{autoload_path}" )
+      try_sudo( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{autoload_path}" )
     end
 
     desc <<-DESC
@@ -291,18 +292,18 @@ namespace :capez do
       puts( "\n--> Symlinks" )
 
       print_dotted( "var/storage" )
-      run( "ln -s #{shared_path}/var/storage #{latest_release}/" + ezp_legacy_path( "var/storage" ) )
+      try_sudo( "ln -s #{shared_path}/var/storage #{latest_release}/" + ezp_legacy_path( "var/storage" ) )
       capez_puts_done
 
       storage_directories.each{ |sd|
         print_dotted( "var/#{sd}/storage" )
-        run( "ln -s #{shared_path}/var/#{sd}/storage #{latest_release}/" + ezp_legacy_path( "var/#{sd}/storage" ), :as => webserver_user )
+        try_sudo( "ln -s #{shared_path}/var/#{sd}/storage #{latest_release}/" + ezp_legacy_path( "var/#{sd}/storage" ), :as => webserver_user )
         #run( "chmod -h g+w #{latest_release}/var/#{sd}/storage")
         capez_puts_done
       }
 
-      run( "chmod -R g+w #{latest_release}/" + ezp_legacy_path( "var" ) )
-      run( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{shared_path}/var")
+      try_sudo( "chmod -R g+w #{latest_release}/" + ezp_legacy_path( "var" ) )
+      try_sudo( "chown -R #{fetch(:webserver_user,user)}:#{fetch(:webserver_group,user)} #{shared_path}/var")
     end
 
     desc <<-DESC
@@ -349,7 +350,7 @@ namespace :capez do
     end
 
   end
-  # End of namespace :capez:var
+  # End of namespace ezpublish:var
 
   # TODO : cache management must be aware of cluster setup  namespace :autoloads do
   namespace :autoloads do
@@ -370,14 +371,14 @@ namespace :capez do
       end
     end
   end
-  # End of namespace :capez:autoloads
+  # End of namespace ezpublish:autoloads
 
   # Should be transformed in a simple function (not aimed to be called as a Cap task...)
+  # Considers that your main git repo is at the top of your eZ Publish install
+  # If changes are detected, then ask the user to continue or not
   namespace :dev do
     desc <<-DESC
-      Checks changes on your local installation
-      Considers that your main git repo is at the top of your eZ Publish install
-      If changes are detected, then ask the user to continue or not
+      Check if there are any changes on your local installation based on what your scm knows
     DESC
     task :local_check do
       if "#{scm}" != "git" then

data/lib/db.rb

@@ -62,6 +62,6 @@ namespace :db do
   end
 
   def get_backup_dir
-    return "extension/alcapon/backups/database"
+    return "#{ezp_legacy_path('extension/alcapon/backups/database')}"
   end
 end

data/lib/ezpublish4.rb

@@ -6,14 +6,14 @@ after "deploy:finalize_update" do
   if fetch( :shared_children_group, false )
     shared_children.map { |d| run( "chgrp -R #{shared_children_group} #{shared_path}/#{d.split('/').last}") }
   end
-  capez.var.init_release
-  capez.var.link
-  capez.settings.deploy
-  capez.autoloads.generate
-  #capez.cache.clear
+  ezpublish.var.init_release
+  ezpublish.var.link
+  ezpublish.settings.deploy
+  ezpublish.autoloads.generate
+  #ezpublish.cache.clear
 end
 
-namespace :capez do
+namespace :ezpublish do
 
   namespace :cache do
     desc <<-DESC

data/lib/ezpublish5.rb

@@ -3,66 +3,20 @@ puts "Running AlCapON for eZ Publish 5"
 set :ezp_legacy, "ezpublish_legacy"
 set :ezp_app, "ezpublish"
 
+load 'ezpublish5/deploy'
+load 'ezpublish5/ezpublish'
+
 after "deploy:finalize_update" do
   if fetch( :shared_children_group, false )
     shared_children.map { |d| run( "chgrp -R #{shared_children_group} #{shared_path}/#{d.split('/').last}") }
   end
-  capez.var.init_release
-  capez.var.link
-  capez.autoloads.generate
-  capez.settings.deploy
+  ezpublish.var.init_release
+  ezpublish.var.link
+  ezpublish.autoloads.generate
+  ezpublish.settings.deploy
   if ( fetch( :ezp5_regenerate_config, false ) )
-    capez.settings.configure
+    ezpublish.settings.configure
   end
-  capez.assets.install
+  ezpublish.assets.install
 end
 
-namespace :capez do
-
-  namespace :cache do
-    desc <<-DESC
-      Clear caches the way it is configured in ezpublish.rb
-    DESC
-    # Caches are just cleared for the primary server
-    # Multiple server platform are supposed to use a cluster configuration (eZDFS/eZDBFS)
-    # and cache management is done via expiry.php which is managed by the cluster API
-    # TODO : make it ezp5 aware
-    task :clear, :roles => :web, :only => { :primary => true } do
-      puts( "\n--> Clearing caches #{'with --purge'.red if cache_purge}" )
-      cache_list.each { |cache_tag|
-        print_dotted( "#{cache_tag}" )
-        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
-        capez_puts_done
-      }
-    end
-  end
-
-  namespace :assets do
-    desc <<-DESC
-      Install assets (ezp5 only)
-    DESC
-    task :install do
-      print_dotted( "\n--> Generating web assets in #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
-      capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
-      capez_puts_done
-    end
-  end
-
-  namespace :settings do
-    desc <<-DESC
-      Generate yml (ezp5) based on ini (ezp4)
-    DESC
-    task :configure 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 #{webserver_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
-      capez_puts_done
-    end
-
-  end
-
-end

data/lib/ezpublish5/ezpublish.rb

@@ -0,0 +1,49 @@
+namespace :ezpublish do
+
+  namespace :cache do
+    desc <<-DESC
+      Clear caches the way it is configured in ezpublish.rb
+    DESC
+    # Caches are just cleared for the primary server
+    # Multiple server platform are supposed to use a cluster configuration (eZDFS/eZDBFS)
+    # and cache management is done via expiry.php which is managed by the cluster API
+    # TODO : make it ezp5 aware
+    task :clear, :roles => :web, :only => { :primary => true } do
+      puts( "\n--> Clearing caches #{'with --purge'.red if cache_purge}" )
+      cache_list.each { |cache_tag|
+        print_dotted( "#{cache_tag}" )
+        capture "cd #{current_path}/#{ezp_legacy_path} && sudo -u #{webserver_user} php bin/php/ezcache.php --clear-tag=#{cache_tag}#{' --purge' if cache_purge}"
+        capez_puts_done
+      }
+    end
+  end
+
+  namespace :assets do
+    desc <<-DESC
+      Install assets (ezp5 only)
+    DESC
+    task :install do
+      print_dotted( "\n--> Generating web assets in #{fetch('ezp5_assets_path','web')}" )
+      capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console assets:install --symlink #{fetch('ezp5_assets_path','web')}" )
+      capture( "cd #{latest_release} && sudo -u #{webserver_user} php ezpublish/console ezpublish:legacy:assets_install --symlink #{fetch('ezp5_assets_path','web')}" )
+      capez_puts_done
+    end
+  end
+
+  namespace :settings do
+    desc <<-DESC
+      Generate yml (ezp5) based on ini (ezp4)
+    DESC
+    task :configure 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 #{webserver_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
+      capez_puts_done
+    end
+
+  end
+
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 5
-  version: 0.4.5
+  - 6
+  version: 0.4.6
 platform: ruby
 authors: 
 - Arnaud Lafon
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-14 00:00:00 +01:00
+date: 2013-03-12 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,6 +58,8 @@ files:
 - lib/db.rb
 - lib/ext/spinner.rb
 - lib/ezpublish4.rb
+- lib/ezpublish5/deploy.rb
+- lib/ezpublish5/ezpublish.rb
 - lib/ezpublish5.rb
 - lib/utils.rb
 - README.md