capistrano-wearerequired 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d90f1081fc7aaec443723334fcf71297ad403006
-  data.tar.gz: e2e7b12e93bc91f0603a96919dd6ff40fa0d77c5
+SHA256:
+  metadata.gz: d8850e56ca3a348ee82454e4c8f6b6b74f856fff5050e2ab52ceab5e1ad49712
+  data.tar.gz: 500a81e6f113dffef245b77bf517cde57de2a63a80dbf65c8b36823ca25b02e9
 SHA512:
-  metadata.gz: 34da2852badf17ab982022675137d38a8b8435994392a2d142a3ea89e07db9776f8bc2b1e6c830589d891dec086c142f2b65081bdc0821b6ea8c8b9741e3dd23
-  data.tar.gz: fcd6f5d290fd9f9f26b443de0d0785edbc88457d5aff054d23b6c67e0fd0e50569827023e8ef250b7371bd0f680961cf19e0d1a321aded6b2881200ac8ccb125
+  metadata.gz: 277436b1262a674a3d750885d47778b89b050f43a4935f05f517d65e075da2ad77f11c3150b16ef2240c467887335588834a7642afef0cb74e7aa6beed0a0b45
+  data.tar.gz: 0cf7dd9078e0337f6ad489fa757102ccd0d2b126b6133e3aeb106c5e67e22ae33cd8252ea13a7566b72b5f0db915d98a066ee7e47772f2c8a86c9f30ee5cfffb

data/.editorconfig

@@ -9,3 +9,6 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 indent_style = space
+
+[{*.md}]
+trim_trailing_whitespace = false

data/CHANGELOG.md

@@ -0,0 +1,54 @@
+# Changelog
+
+## 2.0.1
+* Update dependencies (slackistrano, bundler & rake)
+* Skip Yoast SEO plugin when installing language packages as it caused issues with translated rewrite rules
+* Correct author icon path
+
+## 2.0.0
+* Requires WP-CLI 2.1.0 and newer
+  WP-CLI 2.1.0 introduced the `--all` flag for installing translations for all installed plugins/themes.
+* Changed event from `deploy:finishing` to `deploy:updated` to install and update translations before publishing a new release without translations.
+
+## 1.3.1
+
+* Correct Slackistrano defaults tasks hook.
+
+## 1.3.0
+
+* Improve defaults for Slackistrano
+  Prevents warnings when not using Slack notifications at all.
+* Improve WP-CLI error handling
+  Prevents clutter and early deployment fails when WP-CLI language commands error.
+
+## 1.2.0
+
+* Support WP-CLI 2.0.0 and newer
+  In WP-CLI 2.0.0 the `wp language plugin` and `wp language theme` commands were introduced.
+
+## 1.1.0
+
+* Support WP-CLI 1.2.0 and newer
+  In WP-CLI v1.2.0 the  `wp core language` command was changed to `wp language core`.
+* Get deployer's name from Git config in `SlackistranoMessagingElements`
+
+## 1.0.0
+
+* Renamed to `Capistrano::Wearerequired` and published on [rubygems.org](https://rubygems.org/gems/capistrano-wearerequired).
+* Added `wordpress:clear_opcache` task.
+* Added new messaging classes for Slackistrano for more informative notifications.
+  * Moved support for custom icon (via `icon_url` or `icon_emoji`) and bot name (via `username`) to its own class `SlackistranoMessagingElements`.
+  * `SlackistranoExpandedGitMessaging` extends `SlackistranoMessagingColors` which extends `SlackistranoMessagingElements`.
+
+## 0.3.0
+
+* Added `deploy:cleanup_all` task.
+* Added `wordpress:install_translations` and `wordpress:update_translations` tasks.
+
+## 0.2.0
+
+* Added `composer:clear_cache` task.
+
+## 0.1.0
+
+* Initial version.

data/CONTRIBUTING.md

@@ -0,0 +1,12 @@
+# Contributing
+
+## Release Checklist
+
+To build and ship a new version of this gem, you need to follow these steps:
+
+1. Update changelog.
+2. Change version in `lib/capistrano/wearerequired/version.rb`.
+3. Build new gem using `gem build capistrano-wearerequired.gemspec`.
+4. Publish gem using `gem push capistrano-wearerequired-<version>.gem`, e.g. `gem push capistrano-wearerequired-1.3.0.gem`.
+5. Tag latest commit with `v<version>`, e,g. `v1.3.0`.
+6. Merge `master` branch into `stable`

data/README.md

@@ -8,7 +8,7 @@ Capistrano::Wearerequired is a collection of recipes and tasks specialized on Wo
 1. Add this line to your application's Gemfile to install the latest stable version:
 
    ```ruby
-   gem 'capistrano-wearerequired', '~> 1.0'
+   gem 'capistrano-wearerequired', '~> 2.0'
    ```
 
 2. Execute:
@@ -112,32 +112,3 @@ cap staging wordpress:clear_opcache
 
 (Requires the [WP-CLI Clear OPcache](https://packagist.org/packages/wearerequired/wp-cli-clear-opcache) plugin.)
 
-
-## Changelog
-
-### 1.1.0
-
-* Support WP-CLI 1.2.0 and newer
-  In WP-CLI v1.2.0 the  `wp core language` command was changed to `wp language core`.
-* Get deployer's name from Git config in `SlackistranoMessagingElements`
-
-### 1.0.0
-
-* Renamed to `Capistrano::Wearerequired` and published on [rubygems.org](https://rubygems.org/gems/capistrano-wearerequired).
-* Added `wordpress:clear_opcache` task.
-* Added new messaging classes for Slackistrano for more informative notifications.
-  * Moved support for custom icon (via `icon_url` or `icon_emoji`) and bot name (via `username`) to its own class `SlackistranoMessagingElements`.
-  * `SlackistranoExpandedGitMessaging` extends `SlackistranoMessagingColors` which extends `SlackistranoMessagingElements`.
-
-### 0.3.0
-
-* Added `deploy:cleanup_all` task.
-* Added `wordpress:install_translations` and `wordpress:update_translations` tasks.
-
-### 0.2.0
-
-* Added `composer:clear_cache` task.
-
-### 0.1.0
-
-* Initial version.

data/capistrano-wearerequired.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.0"
   spec.add_dependency "capistrano", "~> 3.6"
-  spec.add_dependency "slackistrano", "~> 3.1"
+  spec.add_dependency "slackistrano", "~> 3.8"
   spec.add_dependency "capistrano-composer", "~> 0.0.6"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 11.0"
+  spec.add_development_dependency "bundler", "~> 2.0"
+  spec.add_development_dependency "rake", "~> 12.3.3"
 end

data/lib/capistrano/wearerequired.rb

@@ -5,6 +5,7 @@ module Capistrano
   end
 end
 
+require "capistrano/wearerequired/slackistrano.rb"
 require "capistrano/wearerequired/slackistrano_messaging_elements"
 require "capistrano/wearerequired/slackistrano_messaging_colors"
 require "capistrano/wearerequired/slackistrano_extended_git_messaging"

data/lib/capistrano/wearerequired/slackistrano.rb

@@ -0,0 +1 @@
+load File.expand_path('../tasks/slackistrano.rake', __FILE__)

data/lib/capistrano/wearerequired/slackistrano_extended_git_messaging.rb

@@ -63,7 +63,7 @@ module Capistrano
       end
 
       def author_icon
-        "https://required.com/content/themes/required-valencia/img/character-%{name}-300x300.png" % { name: deployer.downcase }
+        "https://required.com/content/themes/required-valencia/assets/img/character-%{name}-300x300.png" % { name: deployer.downcase }
       end
 
       def author_link

data/lib/capistrano/wearerequired/slackistrano_messaging_elements.rb

@@ -4,31 +4,8 @@ module Capistrano
   module Wearerequired
     class SlackistranoMessagingElements < Slackistrano::Messaging::Base
 
-      def initialize(env: nil, team: nil, channel: nil, token: nil, webhook: nil, icon_url: nil, icon_emoji: nil, username: nil)
-        super(env: env, team: team, channel: channel, token: token, webhook: webhook)
-        @icon_url = icon_url
-        @icon_emoji = icon_emoji
-        @username = username
-      end
-
-      def icon_url
-        if @icon_url.nil?
-          super
-        else
-          @icon_url
-        end
-      end
-
-      def icon_emoji
-        @icon_emoji
-      end
-
-      def username
-       if @username.nil?
-         super
-       else
-         @username
-       end
+      def initialize(options = {})
+        super(options)
       end
 
       # Override the deployer helper to pull the best name available (git, password file, env vars).

data/lib/capistrano/wearerequired/tasks/slackistrano.rake

@@ -0,0 +1,10 @@
+namespace :slackistrano do
+
+  desc <<-DESC
+    Sets some defaults for Slackistrano to not cause warnings when not using Slack notifications.
+  DESC
+  task :defaults do
+    set_if_empty :slackistrano, false
+  end
+  before 'deploy', 'slackistrano:defaults'
+end

data/lib/capistrano/wearerequired/tasks/wordpress.rake

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 namespace :wordpress do
 
   desc <<-DESC
@@ -5,12 +7,13 @@ namespace :wordpress do
   DESC
   task :install_translations do
     next unless fetch(:wp_languages).any?
+    languages = fetch(:wp_languages).shelljoin
 
     on roles(:app) do
       within release_path do
-        fetch(:wp_languages).each do |language|
-          execute :wp, "language core install #{language}"
-        end
+        execute :wp, "language core install #{languages} --skip-plugins=wordpress-seo"
+        execute :wp, "language plugin install --all #{languages} --format=csv --skip-plugins=wordpress-seo"
+        execute :wp, "language theme install --all #{languages} --format=csv --skip-plugins=wordpress-seo"
       end
     end
   end
@@ -23,7 +26,9 @@ namespace :wordpress do
 
     on roles(:app) do
       within release_path do
-        execute :wp, "language core update"
+        execute :wp, "language core update --quiet"
+        execute :wp, "language plugin update --all --quiet"
+        execute :wp, "language theme update --all --quiet"
       end
     end
   end
@@ -42,8 +47,8 @@ namespace :wordpress do
     end
   end
 
-  after 'deploy:finishing', 'wordpress:install_translations'
-  after 'deploy:finishing', 'wordpress:update_translations'
+  after 'deploy:updated', 'wordpress:install_translations'
+  after 'deploy:updated', 'wordpress:update_translations'
   after 'deploy:finishing', 'wordpress:clear_opcache'
 end
 

data/lib/capistrano/wearerequired/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Wearerequired
-    VERSION = "1.1.0"
+    VERSION = "2.0.1"
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-wearerequired
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.1
 platform: ruby
 authors:
 - wearerequired
 - Pascal Birchler
 - Ulrich Pogson
 - Dominik Schilling
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2020-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -33,14 +33,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: capistrano-composer
   requirement: !ruby/object:Gem::Requirement
@@ -61,28 +61,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: 12.3.3
 description: Capistrano::Wearerequired is a collection of recipes and tasks specialized
   on WordPress deployment.
 email: info@required.ch
@@ -92,6 +92,8 @@ extra_rdoc_files: []
 files:
 - ".editorconfig"
 - ".gitignore"
+- CHANGELOG.md
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,11 +102,13 @@ files:
 - lib/capistrano/wearerequired.rb
 - lib/capistrano/wearerequired/capistrano.rb
 - lib/capistrano/wearerequired/composer.rb
+- lib/capistrano/wearerequired/slackistrano.rb
 - lib/capistrano/wearerequired/slackistrano_extended_git_messaging.rb
 - lib/capistrano/wearerequired/slackistrano_messaging_colors.rb
 - lib/capistrano/wearerequired/slackistrano_messaging_elements.rb
 - lib/capistrano/wearerequired/tasks/capistrano.rake
 - lib/capistrano/wearerequired/tasks/composer.rake
+- lib/capistrano/wearerequired/tasks/slackistrano.rake
 - lib/capistrano/wearerequired/tasks/wordpress.rake
 - lib/capistrano/wearerequired/version.rb
 - lib/capistrano/wearerequired/wordpress.rb
@@ -112,7 +116,7 @@ homepage: https://github.com/wearerequired/capistrano-wearerequired
 licenses:
 - GPL-2.0+
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,9 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Recipes for Capistrano used by required gmbh
 test_files: []