alcapon 0.4.17 → 0.4.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3148c24452e76ce1db9f8a101ee6e379d7d41d48
-  data.tar.gz: a4f7e37ce1f4f4bdf440195dff751437e978db4c
+  metadata.gz: 8ad2a04b0b969ddcdd084c811fca9eded8b1c501
+  data.tar.gz: c657ccd1631591f313ecfc06940ca6297cad240e
 SHA512:
-  metadata.gz: d897a288b7e14f4b0ed2ffd0d7f4c7e59fe85419e928c71505704abdb6c7bef7ad769a1893ca636a9dfe6a13e5b24d7cc0f824101e76ceb992bd969bfd5eb78e
-  data.tar.gz: 37ccc3da0db90a6d8e6a2b09c39d7c349c98a44b4ffeb621857b4e5a16ed4c9711875b6515fa896c1992af86d44c5f746d21fe5f610c129fc5a2cfd78c1fc1c5
+  metadata.gz: e0c27c326b6358b238912fab48f0555d9c8899ff7176c8c37252239172472ca48de9d78746a6db000c960468634f783f41a8f52148242ec7333155991b734744
+  data.tar.gz: e12957da18393dac9dbc6ba3d6e089ce0755b410195a1d989ed09c4c1868ac9127db060e4d90e36e2c5034dc03125adfb14f1e49fbe4d4716e63f4e4c60493fa

data/bin/capezit

@@ -188,6 +188,13 @@ files = {
     # IMPORTANT: requires that the database is already created before it is run
     set :ezp5_regenerate_config, false
 
+    # Parameters when ezdfs is used
+    #set :ezdfs_mount_path, "/path/to/your/(NFS|GlusterFS|Samba) mount"
+    #set :ezdfs_database_server, "localhost"
+    #set :ezdfs_database_name, "dbname"
+    #set :ezdfs_database_uname, "dbuname"
+    #set :ezdfs_database_passd, "dbpasswd"
+
 
     # TODO : use yml files to manage database credentials securely
     # See http://www.simonecarletti.com/blog/2009/06/capistrano-and-database-yml/

data/lib/alcapon/utils.rb

@@ -0,0 +1,54 @@
+def unindent(string)
+  indentation = string[/\A\s*/]
+  string.strip.gsub(/^#{indentation}/, "")
+end
+
+def capez_puts_done
+  puts '✔'.green
+end
+
+def print_dotted( message, options={} )
+  defaults_options = { :eol => false,
+                       :sol => false,
+                       :max_length => 40,
+                       :eol_msg => false }
+
+  options = defaults_options.merge( options )
+  message = "#{message} " + "." * [0,options[:max_length]-message.length-1].max
+
+  if options[:sol]
+    message = "\n#{message}"
+  end
+
+  if options[:eol_msg]
+    message += " #{options[:eol_msg]}"
+  end
+
+  if options[:eol]
+    puts message
+  else
+    print message
+  end
+end
+
+def ezp5?
+  return ( fetch( :ezpublish_version, nil ) == 5 )
+end
+
+def ezp_legacy_path(path='')
+  elements = Array.new
+
+  if( fetch( :ezp_legacy, "" ) != "" )
+    elements += [ "#{ezp_legacy}" ]
+  end
+
+  if( path != '' )
+    elements += [ "#{path}" ]
+  end
+
+  return File.join( elements )
+end
+
+def alcapon_message(string)
+  puts( "[alcapon]".green+" #{string}" )
+end

data/lib/capez.rb

@@ -336,26 +336,38 @@ namespace :ezpublish do
       Sync your var directory with a remote one
     DESC
     task :sync_to_local, :roles => :web, :only => { :primary => true } do
-      confirmation = Capistrano::CLI.ui.ask "You're about to sync your local var/ directory FROM a remote one (current stage = #{stage}). Are you sure (y/N) ?"
+      puts "Cluster mode : " + (fetch( :ezdfs_mount_path, nil ) == nil ? "no".red : "yes".green )
+      confirmation = Capistrano::CLI.ui.ask "You're about to sync your local storage directory FROM a remote one (current stage = #{stage}). Are you sure (y/N) ?"
       abort "Aborted" unless confirmation.downcase == 'y'
 
       shared_host = fetch( :shared_host, nil )
       abort "Please set 'shared_host'" if shared_host == nil
 
-      # TODO : make it configurable
-      exclude_string = ""
-      exclude_paths = [ "/cache", "/log", "/*/cache", "/*/log", "/autoload" ]
-      exclude_paths.each{ |item|
-        exclude_string << "--exclude '#{item}' "
-      }
-
-      run_locally( "rsync -az #{exclude_string} #{user}@#{shared_host}:#{shared_path}/var/* " + ezp_legacy_path( "var/" ) )
+      if fetch( :ezdfs_mount_path, nil ) == nil
+        # TODO : make it configurable
+        exclude_string = ""
+        exclude_paths = [ "/cache", "/log", "/*/cache", "/*/log", "/autoload" ]
+        exclude_paths.each{ |item|
+          exclude_string << "--exclude '#{item}' "
+        }
+        run_locally( "rsync -az #{exclude_string} #{user}@#{shared_host}:#{shared_path}/var/* " + ezp_legacy_path( "var/" ) )
+      else
+        puts "Syncing remote mount path (path = #{ezdfs_mount_path} on both side)".green
+        storage_directories.each{ |sd|
+          print_dotted( "var/#{sd}/storage" )
+          fullpath = "#{ezdfs_mount_path}/var/#{sd}/storage"
+          run_locally( "if [ ! -d #{fullpath} ]; then mkdir -p #{fullpath}; fi;" )
+          run_locally( "rsync -az #{user}@#{shared_host}:#{fullpath}/* #{fullpath}/" )
+          capez_puts_done
+        }
+      end
     end
 
     desc <<-DESC
       Sync your a remote var folder with local datas
     DESC
     task :sync_to_remote, :roles => :web, :only => { :primary => true } do
+      puts "Please note that this task is not eZDFS compliant...".red
       confirmation = Capistrano::CLI.ui.ask "You're about to sync your local var/ directory TO a remote one (current stage = #{stage}). Are you sure (y/N) ?"
       abort "Aborted" unless confirmation.downcase == 'y'
 

data/lib/db.rb

@@ -32,24 +32,12 @@ namespace :db do
     Creates a backup from a remote database server
   DESC
   task :backup, :roles => :web, :only => { :primary => true } do
-    filename = generate_backup_name( database_name )
-    file = File.join( "/tmp", filename )
-    backup_dir_for_this_stage = File.join( get_backup_dir, "#{stage}" )
-    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 )
+
+    do_and_retrieve_backup( "#{database_server}", "#{database_name}", "#{database_uname}", "#{database_passd}" )
+    if fetch( :ezdfs_database_server, nil ) != nil
+      do_and_retrieve_backup( "#{ezdfs_database_server}", "#{ezdfs_database_name}", "#{ezdfs_database_uname}", "#{ezdfs_database_passd}" )
     end
-    run "rm #{file}"
+
   end
 
   desc <<-DESC
@@ -73,4 +61,26 @@ namespace :db do
   def get_backup_dir
     return "#{ezp_legacy_path('extension/alcapon/backups/database')}"
   end
+
+  def do_and_retrieve_backup( thisdbserver, thisdbname, thisdbuser, thisdbpass )
+    filename = generate_backup_name( thisdbname )
+    file = File.join( "/tmp", filename )
+    backup_dir_for_this_stage = File.join( get_backup_dir, "#{stage}" )
+    on_rollback do
+      run "rm #{file}"
+    end
+
+    dump_result = nil
+    run "mysqldump -h#{thisdbserver} -u#{thisdbuser} -p #{thisdbname} | gzip > #{file}" do |ch, stream, out|
+      ch.send_data "#{thisdbpass}\n" if out =~ /^Enter password:/
+      dump_result = out
+    end
+    if dump_result =~ /.*error.*1045/i
+      puts "Access denied on '#{thisdbserver}' with user '#{thisdbuser}'".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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alcapon
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Arnaud Lafon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -48,6 +48,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/capezit
+- lib/alcapon/utils.rb
 - lib/capez.rb
 - lib/db.rb
 - lib/ext/spinner.rb