capistrano-opscomplete 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc8672500d3727450f6cd8c1f9c5147075eaca449a70d98c80bd9e62d4d2d6c
-  data.tar.gz: 169c87773b79febd6c15ab73a0273684f415827d44ebe5316abc4dd42b5f8971
+  metadata.gz: 41def2299510940af3ecf7d7400f1ffdedd794bbc75ff1b76f02925daec96b0e
+  data.tar.gz: 3c817b17846045ab58c6a0c8fe6a8b31752de7844ffd1edd1fca4c89dc29df25
 SHA512:
-  metadata.gz: d70ce60b0bfd31c95d8fa145a1c7c9a9e00f96be9757eb8b8c025a7fc86a5dff79eefa0a1e79aafbc1bca106239d0c1e94f869d7091e80343f5b55f2ba893de1
-  data.tar.gz: 8d8d31c2445212faf6bdc05b83a299bbb3bf7eec9ab3360f0b6abad77c7628cbbb1773e31eddff3baa5e5a6f823bab9b9cd6d57740e6ea4e30f835adf29c738a
+  metadata.gz: ec6794d100216b3fc49673a4e8e2a10f70ef434c2669ca88f563d206f63a41db4adedfb10a0bbbf655af4ef176bd68bb8c8a420d02bcf85fd438095eba394346
+  data.tar.gz: 1c0df6d6780d8141557894d56bad781b0125fbf82a7c7d41585c651871c0d1f2e48f3c3c9fc8af31750fe99c64c0421f3c4f1de3a7d976e84894134f951f7972

data/.github/workflows/tests.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.4.0] - 2025-11-11
+### Added
+- Extended `opscomplete:nodejs:ensure` task with option to manage and install `corepack`
+- Fixed Node.js version missing error message
+
+## [1.3.1] - 2025-03-07
+### Fixed
+- Fix error with nvm: "Configured Node.js version: X.Y.Z is not installable"
+
+## [1.3.0] - 2025-02-18
+### Added
+- Add new capistrano task (`opscomplete:supervisor:disable`) which disables supervisor on non-procfile servers
+
 ## [1.2.0] - 2024-08-23
 ### Changed
 - Added a feature to restart Puma

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-opscomplete (1.2.0)
+    capistrano-opscomplete (1.4.0)
       capistrano (>= 3.0, < 4.0.0)
       rake
 
@@ -32,7 +32,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
-    rack (3.0.9.1)
+    rack (3.1.18)
     rainbow (3.0.0)
     rake (13.0.6)
     rubocop (0.76.0)
@@ -63,4 +63,4 @@ DEPENDENCIES
   rake (~> 13)
 
 BUNDLED WITH
-   2.3.10
+   2.4.22

data/README.md

@@ -52,8 +52,11 @@ And in case you enabled [`Procfile support`](https://makandracards.com/opscomple
 e.g. like this:
 
 ```ruby
-# Update and Restart supervisor config
+# Update supervisor config
 after 'deploy:updating', 'opscomplete:supervisor:gen_config'
+# Stop processes and remove config on non :procfile_role servers
+after 'deploy:published', 'opscomplete:supervisor:disable'
+# Restart supervisor processes
 after 'deploy:published', 'opscomplete:supervisor:restart_procs'
 ```
 
@@ -179,6 +182,18 @@ after 'deploy:published', 'opscomplete:puma:reload'
 
 The version for the NodeJS installation has to be a specific version and not a floating version like, e.g. lts/gallium.
 
+### Using Corepack
+
+You may use Corepack to control your project's package manager, e.g. to use a modern version of Yarn or pnpm.
+
+`capistrano-opscomplete` can install and enable Corepack for you during deployment. To do so, set the version with `:opscomplete_corepack_version` in your capistrano configuration. Then, add a [hook](#using-capistrano-hooks) in your capistrano configuration (e.g. `deploy.rb`), for example:
+
+```ruby
+set :opscomplete_corepack_version, 'latest'
+
+after 'deploy:updating', 'opscomplete:nodejs:ensure'
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome. Don't hesitate to [open a new issue](https://github.com/makandra/capistrano-opscomplete/issues/new).

data/lib/capistrano/dsl/opscomplete.rb

@@ -89,32 +89,60 @@ module Capistrano
         # 1) Get version from capistrano configuration (highest precedence, 'override')
         if fetch(:opscomplete_nodejs_version)
           debug("Using version from :opscomplete_nodejs_version setting: #{fetch(:opscomplete_nodejs_version)}.")
-          fetch(:opscomplete_nodejs_version)
+          app_version = fetch(:opscomplete_nodejs_version)
 
         # 2) Get version from version file in release dir (after deploy:updating, before deploy:updated)
         elsif capture(:nodejs_get_version, release_path)
           debug("Using version from server's release_dir/.nvmrc, .node-version or .tool-versions file: #{capture(:nodejs_get_version, release_path)}")
-          capture(:nodejs_get_version, release_path)
+          app_version = capture(:nodejs_get_version, release_path)
 
         else
-          raise Capistrano::ValidationError, 'Could not find application\'s Node.js version. Consider setting opscomplete_ruby_version.'
+          raise Capistrano::ValidationError, 'Could not find application\'s Node.js version. Consider setting opscomplete_nodejs_version.'
         end
+
+        normalize_nodejs_version(app_version)
       end
 
       def nodejs_installable_versions
         nodejs_installable_versions = capture(:nodejs_installable_versions).split("\n")
-        nodejs_installable_versions.map!(&:strip)
-        nodejs_installable_versions
+        nodejs_installable_versions.map { |version| normalize_nodejs_version(version) }
       end
 
       def nodejs_installed_versions
         nodejs_installed_versions = capture(:nodejs_installed_versions).split("\n")
-        nodejs_installed_versions.map!(&:strip)
+        nodejs_installed_versions.map { |version| normalize_nodejs_version(version) }
       end
 
       def validation_error!(message)
         raise Capistrano::ValidationError, message unless dry_run?
       end
+
+      def app_corepack_version
+        if fetch(:opscomplete_corepack_version)
+          debug("Using version from :opscomplete_corepack_version setting: #{fetch(:opscomplete_corepack_version)}.")
+          corepack_version = fetch(:opscomplete_corepack_version)
+
+        else
+          corepack_version = nil
+        end
+
+        corepack_version
+      end
+
+      private
+
+      def normalize_nodejs_version(version)
+        version = version.strip
+        # Make sure the versions returned by our Node version manager have the same format
+        # as the one in our .nvmrc or .tools-versions:
+        #
+        # - In .nvmrc, we often document node versions as "1.2.3". But some people use "v1.2.3".
+        # - When asking NVM for Node versions, it gives us "v1.2.3".
+        # - When asking asdf for Node versions, it gives us "1.2.3" (without the leading "v").
+        version = version.sub(/\A[vV]/, '') # remove leading "v" or "V"
+        version
+      end
+
     end
   end
 end

data/lib/capistrano/opscomplete/nodejs.rake

@@ -49,6 +49,9 @@ namespace :opscomplete do
           validation_error!("#{host}: Configured Node.js version: #{app_nodejs_version} is not installable.")
         end
         execute(:nodejs_set_version, "'#{app_nodejs_version}'")
+        unless app_corepack_version.nil?
+          execute(:nodejs_install_corepack_version, "'#{app_corepack_version}'")
+        end
       end
     end
   end

data/lib/capistrano/opscomplete/supervisor.rake

@@ -10,6 +10,15 @@ namespace :opscomplete do
       end
     end
 
+    desc 'Remove supervisor configuration and stop all Procfile processes on non :procfile_role servers.'
+    task :disable do
+      on roles(:all) - roles(fetch(:procfile_role, :app)) do
+        within release_path do
+          execute :supervisor_disable
+        end
+      end
+    end
+
     desc 'Reread the supervisor configuration and (re)start all Procfile processes'
     task :restart_procs do
       on roles fetch(:procfile_role, :app) do

data/lib/capistrano/opscomplete/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Opscomplete
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-opscomplete
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Makandra Operations
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,7 +86,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
-description: 
+description:
 email:
 - ops@makandra.de
 executables: []
@@ -122,7 +122,7 @@ metadata:
   bug_tracker_uri: https://github.com/makandra/capistrano-opscomplete/issues
   changelog_uri: https://github.com/makandra/capistrano-opscomplete/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/makandra/capistrano-opscomplete
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,8 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.1
 requirements: []
-rubygems_version: 3.4.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Capistrano tasks for easy deployment to a makandra opscomplete environment.
 test_files: []