capistrano-nvm202x 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3c3ed95eafa76cbfd9bb7dffed225276e3e95cb5e502537965a6f342a8a16b4
-  data.tar.gz: f7b3aebe4693e61a3c689f1f655d0b0a5403ea2c432664d72a28b6f8bc75374a
+  metadata.gz: 84158a441413724df3dc93474fb27a94e2a0b32a7782bffae0a74c1bfbe89e15
+  data.tar.gz: b46532d84ee584283fe2df10768c76fa9b065ce62fb9093519dfbc43aace422f
 SHA512:
-  metadata.gz: 4fe0dabcf9519a0bfe83586240c4e832c7e4e8543d9b3326090ec4a3194bb25d997837f3af38347341ef98ee95a056708476dfea2bd4ba7a8c40714f0b7b190b
-  data.tar.gz: 4ae1918e16334996187579a323fc33847539544e5e40268aaabd3608e66cf9f41496424f08e60d16571c3b5e25e5d4c8ab0a3a55312c05010add25282f620533
+  metadata.gz: 8e24c5915a67051525f901a2fa5fe76aafd3bafa0f69b29f05efa69a25b88207ab192e479cc9ea09c60fece8afdf7307bf7fab87f31ae052483a655209e73787
+  data.tar.gz: ece00c18118a48c98a1f6693b40046d4f122d2a6988534cb59dcc4c85e64325ba71c02df6d9ecf450812706acfdf7783858b621f2fb1176f9b7862a4350ec66f

data/README.md

@@ -6,12 +6,8 @@ This gem provides idiomatic nvm (Node Version Manager) support for Capistrano 3.
 
 **NOTE:** this gem is different from [capistrano-nvm](https://github.com/koenpunt/capistrano-nvm). Not sure why, but `capistrano-nvm` doesn't play with `capistrano-rbenv` which was the reason to create `capistrano-nvm202x`.
 
-Current limitation: should be required after rbenv or after anything that adds environment variables.
-
 And also thanks a lot to [capistrano-rbenv](https://github.com/capistrano/rbenv) for the code this repo originates from.
 
-Note: Node version is not set explicitly as an environment variable, but the existence of version is checked. Otherwise it depends on NVM picking up the correct version. Please use `.rvmrc` to specify version. Options need testing.
-
 -----------------------------------
 
 (By original maintainer) Thanks a lot to [@yyuu](https://github.com/yyuu) for merging his gem with official one.
@@ -22,7 +18,6 @@ Add this line to your application's Gemfile:
 
 ~~~ruby
   gem 'capistrano', '~> 3.19', require: false
-  gem 'capistrano-rbenv', require: false
   gem 'capistrano-nvm202x', require: false
 ~~~
 
@@ -33,13 +28,11 @@ And then execute:
 ## Usage
 
     # Capfile
-    require "capistrano/rbenv"
-    require "capistrano/nvm" # after rbenv
-
+    require "capistrano/nvm"
 
     # config/deploy.rb
     set :nvm_type, :user # or :system, depends on your nvm setup
-    set :nvm_node, 'v20.17.0'
+    set :nvm_node, 'v23.1.0'
 
     # in case you want to set nvm version from the file:
     # set :nvm_node, File.read('.nvmrc').strip
@@ -47,18 +40,14 @@ And then execute:
     # optional configuration
     set :nvm_custom_path, '$HOME/.nvm' # sets custom `nvm_path`
     set :nvm_roles, :all
-    set :nvm_prefix, "source #{fetch(:nvm_path)}/nvm.sh; " # set default command prefix
-    set :nvm_map_bins, %w{rake gem bundle yarn rails} # commands for which prefix is added
-
-
-If your nvm is located in some custom path, you can use `nvm_custom_path` to set it.
+    set :nvm_map_bins, %w{corepack node npm npx yarn yarnpkg} # commands for which prefix is added
 
 ### Defining the node version
 
 To set the Node version explicitly, add `:nvm_node` to your Capistrano configuration:
 
     # config/deploy.rb
-    set :nvm_node, 'v20.17.0'
+    set :nvm_node, 'v23.1.0'
 
 Alternatively, allow the remote host's `nvm` to determine the appropriate Node version](https://github.com/nvm-sh/nvm#usage) by omitting `:nvm_node`. This approach is useful if you have a `.nvmrc` file in your project.
 

data/capistrano-nvm202x.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = "capistrano-nvm202x"
-  gem.version       = '4.0.0'
+  gem.version       = '4.1.0'
   gem.authors       = ["Ivan Stana"]
   gem.email         = ["^_^@myrtana.sk"]
   gem.description   = %q{nvm integration for Capistrano}

data/lib/capistrano/tasks/nvm.rake

@@ -15,12 +15,18 @@ namespace :nvm do
   end
 
   task :map_bins do
-    SSHKit.config.default_env.merge!({ nvm_root: fetch(:nvm_path), node_version: fetch(:nvm_node) })
-    nvm_prefix = fetch(:nvm_prefix, proc { "source #{fetch(:nvm_path)}/nvm.sh; " })
-    SSHKit.config.command_map[:nvm] = "#{fetch(:nvm_path)}/nvm.sh"
+    nvm_binaries_path = "#{fetch(:nvm_node_dir)}/bin/"
 
+    SSHKit.config.default_env.merge!({
+      nvm_root: fetch(:nvm_path),
+      node_version: fetch(:nvm_node),
+      path: "#{nvm_binaries_path}:$PATH",
+    })
+
+    # cssbundling or anything calling yarn directly won't trigger this
+    # only running yarn via sshkit
     fetch(:nvm_map_bins).uniq.each do |command|
-      SSHKit.config.command_map.prefix[command.to_sym].unshift(nvm_prefix)
+      SSHKit.config.command_map[command.to_sym] = "#{nvm_binaries_path}/#{command}"
     end
   end
 end
@@ -45,6 +51,6 @@ namespace :load do
     set :nvm_roles, fetch(:nvm_roles, :all)
 
     set :nvm_node_dir, -> { "#{fetch(:nvm_path)}/versions/node/#{fetch(:nvm_node)}" }
-    set :nvm_map_bins, %w{rake gem bundle yarn rails}
+    set :nvm_map_bins, %w{corepack node npm npx yarn yarnpkg}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-nvm202x
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Ivan Stana
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-16 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: nvm integration for Capistrano