immosquare-capistrano 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eebe27d1ff19f881f868149c9fe82c829815358786271ee294f30a99ed16d9ed
-  data.tar.gz: a9c4a37203792db7eddb7e58e82f0cec4925e32c79b501c6513a6953d0c2844e
+  metadata.gz: d21992d6862c4412d439d94e332daa87bd4388d897968d622cbcfec44b288f55
+  data.tar.gz: d4038ca94a06375b0c01c74f09c94678cf397ac538d866b940b0968cdb9dbecd
 SHA512:
-  metadata.gz: 64db57958d1e4efd8871e001e555c8162bbb46906e6ee62f69d9c678d4fd20ec9ad1bff9abe6207c8c2e38054b300c0843f7108088dc8d77c8627bf907234bcf
-  data.tar.gz: 17736935e39783fd634cad578b0290c767dbf02b565ca803b1208ec74db75cfe1a4b244ca27c810c988f30d2e3b503a5a3410be4e356ab682ae060fac51e905d
+  metadata.gz: 76a896e2b628412f9bb2a4b1b4ade6c8def6020dbe73430c64d9c86739b723d7050fc544f9d00a2271d7110ebed1a3d6c50aacc3f61e3061a7b38e8954343313
+  data.tar.gz: dc02e35d9e183637e9ce333605b071ef3473c1c25892b8cc0bb23f14d8c2afae91f81b50f9af2696e705ca57de3a46288ab706543eedbc9c3caa15b72bb505ec

data/lib/immosquare/capistrano/defaults.rb

@@ -14,11 +14,5 @@ namespace :load do
     ## SolidQueue
     ##============================================================##
     set_if_empty :solid_queue_service_unit_name, -> { "solid_queue_#{fetch(:application)}_#{fetch(:stage)}" }
-
-    ##============================================================##
-    ## rvm
-    ##============================================================##
-    set_if_empty :rvm_ruby_version,  -> { "default" }
-    set_if_empty :rvm_map_bins,      -> { ["gem", "rake", "ruby", "bundle"] }
   end
 end

data/lib/immosquare/capistrano/rvm.rb

@@ -1,6 +1,5 @@
 require_relative "defaults"
 
-
 ##============================================================##
 ## We load rvm tasks
 ##============================================================##
@@ -13,5 +12,4 @@ load File.expand_path("tasks/rvm.rake", __dir__)
 ##============================================================##
 Capistrano::DSL.stages.each do |stage|
   after stage, "rvm:hook"
-  # after stage, "rvm:check"
 end

data/lib/immosquare/capistrano/tasks/rvm.rake

@@ -13,25 +13,55 @@ namespace :rvm do
         elsif test("[ -d #{rvm_system_path} ]")
           rvm_system_path
         else
-          raise("RVM path not found on server. Please install RVM first")
+          error("RVM path not found on server. Please install RVM first")
+          exit(1)
         end
+      info "RVM path detected: #{rvm_path}"
+      rvm_bin_path = "#{rvm_path}/bin/rvm"
 
       ##============================================================##
-      ## Log
+      ## Set the RVM command map
       ##============================================================##
-      info "RVM path detected: #{rvm_path}"
-
+      SSHKit.config.command_map[:rvm] = rvm_bin_path
 
       ##============================================================##
-      ## Set the RVM command map
+      ## Check if the RVM Ruby version is set
       ##============================================================##
-      SSHKit.config.command_map[:rvm] = "#{rvm_path}/bin/rvm"
+      rvm_ruby_version = fetch(:rvm_ruby_version)
+      if rvm_ruby_version.nil?
+        error "rvm_ruby_version not set. Please set the rvm_ruby_version in your deploy.rb file with format ruby-x.y.z@your-app-name"
+        exit 1
+      elsif rvm_ruby_version !~ /^ruby-\d+\.\d+\.\d+@[a-z0-9\-_]+$/i
+        error "rvm_ruby_version format is invalid. Please set the rvm_ruby_version in your deploy.rb file with format ruby-x.y.z@your-app-name"
+        exit 1
+      end
+      info "rvm_ruby_version set: #{rvm_ruby_version}"
 
       ##============================================================##
       ## Set the RVM prefix for the commands
       ##============================================================##
-      fetch(:rvm_map_bins).each do |command|
-        SSHKit.config.command_map.prefix[command.to_sym].unshift("#{rvm_path}/bin/rvm #{fetch(:rvm_ruby_version)} do")
+      ["gem", "rake", "ruby", "bundle"].each do |command|
+        SSHKit.config.command_map.prefix[command.to_sym].unshift("#{rvm_bin_path} #{rvm_ruby_version} do")
+      end
+
+
+      ##============================================================##
+      ## Check if ruby version is installed
+      ##============================================================##
+      ruby_version = rvm_ruby_version.split("@").first
+      unless test("#{rvm_bin_path} #{ruby_version} do ruby --version")
+        error "Ruby version #{ruby_version} is not installed on the server. Please install it first  with 'rvm install #{ruby_version}'"
+        exit 1
+      end
+      info "#{ruby_version} is installed on the server."
+
+      ##============================================================##
+      ## Check if gemset exists, if not create it
+      ##============================================================##
+      gemset_name = rvm_ruby_version.split("@").last
+      unless test("#{rvm_bin_path} #{rvm_ruby_version} do rvm gemset list | grep -wq #{gemset_name}")
+        info "Creating gemset #{gemset_name} for #{ruby_version}"
+        execute :rvm, "#{ruby_version} do rvm gemset create #{gemset_name}"
       end
     end
   end

data/lib/immosquare-capistrano/version.rb

@@ -1,3 +1,3 @@
 module ImmosquareCapistrano
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: immosquare-capistrano
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - immosquare