capdrupal 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c44d744004a0b49a0e7034222558aba3899026837f5b1dfcf6e994f9262e08eb
-  data.tar.gz: 95957676e7e161041ed66fd5f56af9ce7aa071077f289e3a7864273996e5e4d7
+  metadata.gz: 84051b7cfc562b0ada6947c8d24c38449319a7577fa4f569d91cb02a5bc3a511
+  data.tar.gz: 7a544994a5c5af01dd6099e0dc9af8cd7454d3f8bc34a2a511d2743a398998a9
 SHA512:
-  metadata.gz: 73243af2f5674c4f7b9b9a4421e3f377222d00630f43586c6f4d9690e9175d645821af8caa9c94d9512fd2a7aa9fc318bf9b00c629046290a4cd1457b6d0d45c
-  data.tar.gz: '08f3121798682e048c27a75cb6f0242ebcd4d4516aeed292ccaa5f1a2612a636c501bd757984d82b18c7073c2af8c726d2712fbdf38003bfbaf61bf579db95a3'
+  metadata.gz: 3512b71d331a6d6c885c715c103bd2f70c6641698cedb137ad101931ee5d7928ec620c2cd97d6c768d1f278d2b5ab55908ac4b7e206a6398de234453205679a4
+  data.tar.gz: 9ad4303413fdd2a278718b1a373f1b704c0cafb7856f77b237eddd6c7647018bd58426dd05db755d5fac69f7254a49c67ae8fa0fce491a7d9bae4ddd731bf3f7

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Capdrupal Changelog
 
+## NEXT RELEASE
+
+## 3.0.2 (2022-12-22)
+ - Allow Site directory to be configured
+ - Optimize permissions related tasks
+
 ## 3.0.1 (2020-08-07)
  - Update the command `drupal:cache:clear` to be re-runnable after invoke
 

data/capdrupal.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'capdrupal'
-  spec.version       = '3.0.1'
+  spec.version       = '3.0.2'
   spec.authors       = ['Kevin Wenger', 'Yann Lugrin', 'Gilles Doge', 'Toni Fisler', 'Simon Perdrisat', 'Robert Wohleb', 'Kim Pepper']
   spec.email         = ['hello@antistatique.net']
 

data/lib/capdrupal.rb

@@ -2,6 +2,7 @@ namespace :load do
   task :defaults do
     set :app_path, 'web'
     set :config_path, 'config/sync'
+    set :site_path, 'default'
     set :backup_path, 'backups'
     set :keep_backups, 5
     set :enable_modules, []
@@ -210,11 +211,9 @@ namespace :drupal do
     task :recommended do
       on roles(:app) do
         within release_path.join(fetch(:app_path)) do
-          execute :chmod, '-R', '555', '.'
-
           # Remove execution for files, keep execution on folder.
-          execute 'find', './ -type f -executable -exec chmod -x {} \;'
-          execute 'find', './ -type d -exec chmod +x {} \;'
+          execute :find, './', '-type f ! -perm 444 -exec chmod 444 {} \;'
+          execute :find, './', '-type d ! -perm 555 -exec chmod 555 {} \;'
         end
       end
     end
@@ -248,12 +247,10 @@ namespace :drupal do
     task :writable_shared do
       on roles(:app) do
         within shared_path do
-          # "web/sites/default/files" is a shared dir and should be writable.
-          execute :chmod, '-R', '775', "#{fetch(:app_path)}/sites/default/files"
-
           # Remove execution for files, keep execution on folder.
-          execute 'find', "#{fetch(:app_path)}/sites/default/files", '-type f -executable -exec chmod -x {} \;'
-          execute 'find', "#{fetch(:app_path)}/sites/default/files", '-type d -exec chmod +sx {} \;'
+          # "web/sites/defaults/files" is a shared dir and should be writable.
+          execute :find, './', '-type f ! -perm 664 -exec chmod 664 {} \;'
+          execute :find, './', '-type d ! -perm 2775 -exec chmod 2775 {} \;'
         end
       end
     end
@@ -266,8 +263,8 @@ namespace :drupal do
         on release_roles :app do |server|
           ask(:answer, "Do you really want to download the files on the server to your local files? Nothings will be deleted but files can be ovewrite. (y/N)");
           if fetch(:answer) == 'y' then
-            remote_files_dir = "#{shared_path}/#{(fetch(:app_path))}/sites/default/files/"
-            local_files_dir = "#{(fetch(:app_path))}/sites/default/files/"
+            remote_files_dir = "#{shared_path}/#{(fetch(:app_path))}/sites/#{fetch(:site_path)}/files/"
+            local_files_dir = "#{(fetch(:app_path))}/sites/#{fetch(:site_path)}/files/"
             system("rsync --recursive --times --rsh=ssh --human-readable --progress --exclude='.*' --exclude='css' --exclude='js' #{server.user}@#{server.hostname}:#{remote_files_dir} #{local_files_dir}")
           end
         end
@@ -279,8 +276,8 @@ namespace :drupal do
       on release_roles :app do |server|
         ask(:answer, "Do you really want to upload your local files to the server? Nothings will be deleted but files can be ovewrite. (y/N)");
         if fetch(:answer) == 'y' then
-          remote_files_dir = "#{shared_path}/#{(fetch(:app_path))}/sites/default/files/"
-          local_files_dir = "#{(fetch(:app_path))}/sites/default/files/"
+          remote_files_dir = "#{shared_path}/#{(fetch(:app_path))}/sites/#{fetch(:site_path)}/files/"
+          local_files_dir = "#{(fetch(:app_path))}/sites/#{fetch(:site_path)}/files/"
           system("rsync --recursive --times --rsh=ssh --human-readable --progress --exclude='.*' --exclude='css' --exclude='js' #{local_files_dir} #{server.user}@#{server.hostname}:#{remote_files_dir}")
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capdrupal
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Kevin Wenger
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A set of tasks for deploying and managing Drupal projects with Capistrano