capistrano-opscomplete 1.2.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc8672500d3727450f6cd8c1f9c5147075eaca449a70d98c80bd9e62d4d2d6c
-  data.tar.gz: 169c87773b79febd6c15ab73a0273684f415827d44ebe5316abc4dd42b5f8971
+  metadata.gz: a20eef8ec0a80982b18b4ce9f01d0b1596b56ae46f49ef1c8fcaf90d0172e7f0
+  data.tar.gz: b01fc372be74a269ff2d31e8e5f004624b45f1e42b247a8b1435c7c2ab17ec18
 SHA512:
-  metadata.gz: d70ce60b0bfd31c95d8fa145a1c7c9a9e00f96be9757eb8b8c025a7fc86a5dff79eefa0a1e79aafbc1bca106239d0c1e94f869d7091e80343f5b55f2ba893de1
-  data.tar.gz: 8d8d31c2445212faf6bdc05b83a299bbb3bf7eec9ab3360f0b6abad77c7628cbbb1773e31eddff3baa5e5a6f823bab9b9cd6d57740e6ea4e30f835adf29c738a
+  metadata.gz: 23d4853424d027318d5054fde4e024a849b2575b75a07ee754177a7eb43a14262bee6bcb8cb956236bccf9ea7d625d4bb42b23ec20b895499346f8c2b50b8bb7
+  data.tar.gz: 07ef3b9da3ec41136d4a2698e649b3413ebe035d294cb59546411a0111f571a45b9c2b64b8e542c299b7db1c033a47d1681dfcee9326db89b70389d773aa7e8b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [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.3.1)
       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.0.12)
     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'
 ```
 

data/lib/capistrano/dsl/opscomplete.rb

@@ -89,32 +89,48 @@ 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.'
         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
+
+      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/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.3.1'.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.3.1
 platform: ruby
 authors:
 - Makandra Operations
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -137,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.1
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Capistrano tasks for easy deployment to a makandra opscomplete environment.