capdrupal 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '042712619fa7d2d53940074bc660a4d7694d5fe35cbb1485a4cfddee98985ba9'
-  data.tar.gz: 36af6488a30d9d1614148a2db60ed2b3af2db7b1eb508d09b9d405fa86c8ba30
+  metadata.gz: 84051b7cfc562b0ada6947c8d24c38449319a7577fa4f569d91cb02a5bc3a511
+  data.tar.gz: 7a544994a5c5af01dd6099e0dc9af8cd7454d3f8bc34a2a511d2743a398998a9
 SHA512:
-  metadata.gz: 36b40858994b05c1a630a6eb6395e238b0ab714a642e7e4f569ddf5792e7629d89b855d13606523f435628e2ca0c97c47be8b0e14eb59070cd732ab32689684c
-  data.tar.gz: a3bd3657a97322ed2e235db1b6aed11efb573e6a396352e53ecb24a8350c2bc9c0cef94af2faee177283ba791f23f3f8a80bab4f8b98011eab50262fb684fff1
+  metadata.gz: 3512b71d331a6d6c885c715c103bd2f70c6641698cedb137ad101931ee5d7928ec620c2cd97d6c768d1f278d2b5ab55908ac4b7e206a6398de234453205679a4
+  data.tar.gz: 9ad4303413fdd2a278718b1a373f1b704c0cafb7856f77b237eddd6c7647018bd58426dd05db755d5fac69f7254a49c67ae8fa0fce491a7d9bae4ddd731bf3f7

data/.gitignore

@@ -17,3 +17,6 @@ Gemfile.lock
 .DS_Store
 .AppleDouble
 .LSOverride
+
+## Generated gem by gem build capdrupal.gemspec
+capdrupal-*.gem

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # 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
+
 ## 3.0.0 (2020-08-07)
  - Support for Drupal 8 & Drupal 9
  - Complete code refactoring

data/README.md

@@ -2,6 +2,9 @@
 
 This gem provides a number of tasks which are useful for deploying & managing Drupal projects with [Capistrano](https://github.com/capistrano/capistrano).
 
+[![Gem Version](https://badge.fury.io/rb/capdrupal.svg)](https://badge.fury.io/rb/capdrupal)
+[![Maintainability](https://api.codeclimate.com/v1/badges/e5db5a7f49d86ce5e418/maintainability)](https://codeclimate.com/github/antistatique/capdrupal/maintainability)
+
 # Capdrupal version
 
 Capdrupal Gem Version | Branch | Capistrano Version | Drupal Version
@@ -22,7 +25,7 @@ You may add Drush as a dependency using `composer require drush/drush` in your D
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'capdrupal', '~>8.0'
+gem 'capdrupal', '~>3.0'
 ```
 
 And then execute:
@@ -75,7 +78,7 @@ require 'capistrano/deploy'
 require 'capistrano/composer'
 
 # Drupal Tasks.
-require 'capdrupal/capistrano'
+require 'capdrupal'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined.
 Dir.glob('config/capistrano/tasks/*.rake').each { |r| import r }

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.0'
+  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/docs/maintainers.md

@@ -9,6 +9,7 @@ Checklist for making a release:
 
 - Write changelog 
 - Update version number in `capdrupal.gemspec`
+- Commit those 2 changes and create a new tag with the version number
 - Make a [new release with GitHub](https://github.com/antistatique/capdrupal/releases/new)
 - Build the gem with `gem build capdrupal.gemspec`
 - Push the gem to rubygems.org: `gem push capdrupal-X.X.X.gem` 

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, []
@@ -110,6 +111,7 @@ namespace :drupal do
           execute :drush, 'cr'
         end
       end
+      Rake::Task['drupal:cache:clear'].reenable
     end
   end
 
@@ -209,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
@@ -247,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
@@ -265,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
@@ -278,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.0
+  version: 3.0.2
 platform: ruby
 authors:
 - Kevin Wenger
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 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