capistrano-opscomplete 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7bda13c0f33ab7e11818d801b18587bb9cd5754f114b757627296d4cb1fc338
-  data.tar.gz: 7587402cf62a88b9b7980ec1567f60552fa6fa8d8f1eb10d811c123175323bb0
+  metadata.gz: d1cf4271a72e12d2b60d9cbd229b58d64701e1b3958c7d795910f05165a2be98
+  data.tar.gz: edec14befbf173cc3e5bcfa16c6ee54feabf28eba6b8f44cdd59b0f54bbbbbf5
 SHA512:
-  metadata.gz: 76e8a0d39c56bbc84fa91d4fc52fb1c22106c6afe19f47e0dff2a27fbd81ce0c2cf76cc7d0b2d90b6aa270d71fa9d5de02a076291883bc7bbc2c1c59a1e864cb
-  data.tar.gz: a481d59f2a8e9cf719ec0e6120eebf9672c0a765bfe69ef253c262879c0d0d0f5874ad0a3508b7c7e3b93173ec8ae054090b55384f640e82773d86fb5779e2fa
+  metadata.gz: 5237d339e6abe4060590948891b34809abbbe13c6b24fad22f9bd7292a24d6c220c6f81931388d61c2cffdd3731afcd8197b611b87b5bb7227781782d633b9e7
+  data.tar.gz: b368b6403f897168a4c1d257e6b0caebfad7fa87eae9cf7369c62584fa8e45e61b91a0bbbf8010e6c8db8214f05f4460084b36afb50ed2a0253d41b9506ada63

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [1.0.1] - 2021-03-16
+
+### Fixed
+- Made it possible to use `--dry-run` ([#27](https://github.com/makandra/capistrano-opscomplete/issues/27)
+
 ## [1.0.0] - 2021-03-16
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capistrano-opscomplete (1.0.0)
+    capistrano-opscomplete (1.0.1)
       capistrano (>= 3.0, < 4.0.0)
       rake
 
@@ -10,28 +10,28 @@ GEM
   specs:
     airbrussh (1.4.0)
       sshkit (>= 1.6.1, != 1.7.0)
-    ast (2.4.0)
-    capistrano (3.11.2)
+    ast (2.4.2)
+    capistrano (3.16.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
       sshkit (>= 1.9.0)
-    concurrent-ruby (1.1.6)
-    i18n (1.8.4)
+    concurrent-ruby (1.1.9)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.4)
-    makandra-rubocop (4.2.0)
+    makandra-rubocop (4.4.0)
       rubocop (~> 0.76.0)
       rubocop-rails (~> 2.3.2)
-    net-scp (2.0.0)
-      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.2.0)
-    parallel (1.19.1)
-    parser (2.7.0.2)
-      ast (~> 2.4.0)
+    net-scp (3.0.0)
+      net-ssh (>= 2.6.5, < 7.0.0)
+    net-ssh (6.1.0)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.3)
     rubocop (0.76.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
@@ -42,11 +42,11 @@ GEM
     rubocop-rails (2.3.2)
       rack (>= 1.1)
       rubocop (>= 0.72.0)
-    ruby-progressbar (1.10.1)
-    sshkit (1.20.0)
+    ruby-progressbar (1.11.0)
+    sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/lib/capistrano/dsl/opscomplete.rb

@@ -82,11 +82,10 @@ module Capistrano
       end
 
       def managed_nodejs?
-        test("[ -f ${HOME}/.nodejs_managed_by_makandra ]")
+        test('[ -f ${HOME}/.nodejs_managed_by_makandra ]')
       end
 
       def app_nodejs_version
-
         # 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)}.")
@@ -112,6 +111,10 @@ module Capistrano
         nodejs_installed_versions = capture(:nodejs_installed_versions).split("\n")
         nodejs_installed_versions.map!(&:strip)
       end
+
+      def validation_error!(message)
+        raise Capistrano::ValidationError, message unless dry_run?
+      end
     end
   end
 end

data/lib/capistrano/opscomplete.rb

@@ -6,4 +6,4 @@ require 'rake'
 load File.expand_path('opscomplete/ruby.rake', __dir__)
 load File.expand_path('opscomplete/nodejs.rake', __dir__)
 load File.expand_path('opscomplete/supervisor.rake', __dir__)
-load File.expand_path('../opscomplete/hooks.rb', __FILE__)
+load File.expand_path('opscomplete/hooks.rb', __dir__)

data/lib/capistrano/opscomplete/nodejs.rake

@@ -14,8 +14,7 @@ namespace :opscomplete do
       on roles fetch(:nodejs_roles, :all) do |host|
         warn("#{host}: Managed Node.js environment! Won't do any changes to nodejs version.") if managed_nodejs?
         unless capture(:nodejs_get_version, release_path) == app_nodejs_version
-          raise Capistrano::ValidationError,
-                "#{host}: Node.js version is not set according to application\'s .node-version or .nvmrc file. Use cap opscomplete:nodejs:ensure."
+          validation_error!("#{host}: Node.js version is not set according to application\'s .node-version or .nvmrc file. Use cap opscomplete:nodejs:ensure.")
         end
         info("#{host}: Node.js #{app_nodejs_version} is installed.")
       end
@@ -33,7 +32,7 @@ namespace :opscomplete do
       invoke('opscomplete:nodejs:update_nodejs_build')
       on roles fetch(:nodejs_roles, :all) do |host|
         if managed_nodejs?
-          raise Capistrano::ValidationError, "#{host}: Managed Node.js environment! Won't do any changes to Node.js version."
+          validation_error!("#{host}: Managed Node.js environment! Won't do any changes to Node.js version.")
         end
         if nodejs_installed_versions.include?(app_nodejs_version)
           info("#{host}: Node.js #{app_nodejs_version} is installed.")
@@ -45,8 +44,7 @@ namespace :opscomplete do
         else
           info("#{host}: Check if the configured Node.js version is part of the installable versions")
           execute :nodejs_installable_versions
-          raise Capistrano::ValidationError,
-                "#{host}: Configured Node.js version is neither installed nor installable."
+          validation_error!("#{host}: Configured Node.js version is neither installed nor installable.")
         end
         execute(:nodejs_set_version, "'#{app_nodejs_version}'")
       end

data/lib/capistrano/opscomplete/ruby.rake

@@ -14,8 +14,7 @@ namespace :opscomplete do
       on roles fetch(:rbenv_roles, :all) do |host|
         warn("#{host}: Managed Ruby environment! Won't do any changes to ruby version.") if managed_ruby?
         unless capture(:ruby_get_current_version) == app_ruby_version
-          raise Capistrano::ValidationError,
-                "#{host}: Ruby version is not set according to application\'s .ruby-version file. Use cap opscomplete:ruby:ensure."
+          validation_error!("#{host}: Ruby version is not set according to application\'s .ruby-version file. Use cap opscomplete:ruby:ensure.")
         end
         info("#{host}: Ruby #{app_ruby_version} is installed.")
       end
@@ -82,7 +81,7 @@ namespace :opscomplete do
       invoke('opscomplete:ruby:update_ruby_build')
       on roles fetch(:rbenv_roles, :all) do |host|
         if managed_ruby?
-          raise Capistrano::ValidationError, "#{host}: Managed Ruby environment! Won't do any changes to Ruby version."
+          validation_error!("#{host}: Managed Ruby environment! Won't do any changes to Ruby version.")
         end
         if ruby_installed_versions.include?(app_ruby_version)
           info("#{host}: Ruby #{app_ruby_version} is installed.")
@@ -92,8 +91,7 @@ namespace :opscomplete do
             execute(:ruby_install_version, "'#{app_ruby_version}'")
           end
         else
-          raise Capistrano::ValidationError,
-                "#{host}: Configured Ruby version is neither installed nor installable."
+          validation_error!("#{host}: Configured Ruby version is neither installed nor installable.")
         end
         unless capture(:ruby_get_current_version) == app_ruby_version
           set :ruby_modified, true
@@ -114,16 +112,14 @@ namespace :opscomplete do
           if test("[ -f #{current_ruby_version_file_path} ]")
             execute(:rbenv, :global, capture(:cat, current_ruby_version_file_path))
           else
-            raise Capistrano::ValidationError,
-                  "#{host}: Missing .ruby-version in #{current_path}. Won't set a new global version."
+            validation_error!("#{host}: Missing .ruby-version in #{current_path}. Won't set a new global version.")
           end
           if test("[ -f '#{current_path}/.bundle/config' ]")
             debug("#{host}: Found #{current_path}/.bundle/config, running bundle pristine.")
             set :bundle_gemfile, -> { current_path.join('Gemfile') }
             execute(:bundle, :pristine)
           else
-            raise Capistrano::ValidationError,
-              "Unable to find #{current_path}/.bundle/config, won't run bundle pristine."
+            validation_error!("Unable to find #{current_path}/.bundle/config, won't run bundle pristine.")
           end
         end
       end

data/lib/capistrano/opscomplete/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Opscomplete
-    VERSION = '1.0.0'.freeze
+    VERSION = '1.0.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-opscomplete
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Makandra Operations
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-16 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: makandra-rubocop