capistrano-opscomplete 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fbb4c106ea61f218ac2ed13cab91256b12d76e6d064343d36a9b78c941bba2af
-  data.tar.gz: 4c849d23d37b0abfab117914d29edfd9425bf6ddbb12baed15586474fd33bcb1
+SHA1:
+  metadata.gz: 0743d3bbb02bac9362a1729bf5821a4d4a0bd59e
+  data.tar.gz: b045d4e90dd46e866c4b4647ebefff9a74e69d35
 SHA512:
-  metadata.gz: 529b9dd12ad04f4cfd707704505c57f69276b01c53a9ed944e5bfa13eb8537dca8cc21c3a25eed03b8049810df11f78b23ca87a9050a66bb868901d7531ea2f0
-  data.tar.gz: 37d3ceb10b4d99ab89ee12730dfda034cb26d482e8b11545e49a3fd71e88a4e26ae74ae0168d7bda6d608e53843d2d33e666464a16d82bd74ec95c76d0382771
+  metadata.gz: 287c4b000c0de702f2055bd29cf94a37d4578ea730cf2676c8f2f42b12dd77be6edcee232b33b0a0fc2f5716c36e3b4393199d444ea49898f2b526db91e7f93b
+  data.tar.gz: 823a06e3d2f3f533e3a9d70f1ee84eea7719d10a8eb90dcd89fa86156776dee71d265809ae50ac15ab8b97645d6c281966c8b2dc03373cd0155e0465eca5ea70

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [0.4.0] - 2019-09-23
+### Added
+- ruby-build now honors the :tmp_dir setting
+
+### Changed
+- Allow using --force when installing a gem e.g. overwrite binaries
+- Quote some shell arguments
+
+
 ## [0.3.0] - 2019-04-05
 ### Added
 - You can now specify the rubygems and bundler version to be installed. (#4)
@@ -26,5 +35,6 @@
 ### Added
 - Initial release.
 
+[0.4.0]: https://github.com/makandra/capistrano-opscomplete/compare/v0.3.0...v0.4.0
 [0.3.0]: https://github.com/makandra/capistrano-opscomplete/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/makandra/capistrano-opscomplete/compare/v0.1.0...v0.2.0

data/README.md

@@ -92,7 +92,7 @@ set :rbenv_roles, :web
 set :rbenv_roles, [:web, :worker]
 ```
 
-**Optional:** By default, the most recent version of bundler will be installed. If you want a specific bundler version available for your release, set it in your `deploy.rb`:
+**Optional:** If you want a specific bundler version available for your release, set it in your `deploy.rb`, e.g '~>2' if you need bundler version 2.x:
 
 ```ruby
 set :bundler_version, '<VERSION>'

data/lib/capistrano/dsl/opscomplete.rb

@@ -69,22 +69,22 @@ module Capistrano
 
       def gem_installed?(name, version = nil)
         if version
-          test(:rbenv, :exec, "gem query --quiet --installed --version #{version} --name-matches ^#{name}$")
+          test(:rbenv, :exec, "gem query --quiet --installed --version '#{version}' --name-matches '^#{name}$'")
         else
           test(:rbenv, :exec, :gem, :query, "--quiet --installed --name-matches ^#{name}$")
         end
       end
 
-      def gem_install(name, version = nil)
+      def gem_install(name, version = nil, force = false)
         if version
-          rbenv_exec('gem install', name, '--no-document', '--version', version)
+          rbenv_exec('gem install', name, '--no-document', '--version', "'#{version}'", force ? '--force' : '')
         else
           rbenv_exec('gem install', name, '--no-document')
         end
       end
 
       def rubygems_install(version)
-        rbenv_exec('gem update --no-document --system', version)
+        rbenv_exec("gem update --no-document --system '#{version}'")
       end
     end
   end

data/lib/capistrano/opscomplete/tasks.rake

@@ -53,7 +53,8 @@ namespace :opscomplete do
     task :install_bundler do
       on roles fetch(:rbenv_roles, :all) do
         if fetch(:bundler_version, false)
-          gem_install('bundler', fetch(:bundler_version)) unless gem_installed?('bundler', fetch(:bundler_version))
+          # We have to set force = true to overwrite the binary
+          gem_install('bundler', fetch(:bundler_version), true) unless gem_installed?('bundler', fetch(:bundler_version))
         else
           gem_install('bundler') unless gem_installed?('bundler')
         end
@@ -77,7 +78,7 @@ namespace :opscomplete do
           info("Ensuring requested RubyGems version #{fetch(:rubygems_version)}")
           next if current_rubygems_version == fetch(:rubygems_version)
           info("Previously installed RubyGems version was #{current_rubygems_version}")
-          rbenv_exec(:gem, :update, '--no-document', '--system', fetch(:rubygems_version))
+          rbenv_exec(:gem, :update, '--no-document', '--system', "'#{fetch(:rubygems_version)}'")
           set :rbenv_needs_rehash, true
         end
       end
@@ -94,13 +95,15 @@ namespace :opscomplete do
           info("#{host}: Required ruby version '#{app_ruby_version}' is installed.")
         elsif rbenv_installable_rubies.include?(app_ruby_version)
           info("#{host}: Required ruby version is not installed, but available for installation.")
-          execute(:rbenv, :install, app_ruby_version)
+          with tmpdir: fetch(:tmp_dir) do
+            execute(:rbenv, :install, "'#{app_ruby_version}'")
+          end
           set :rbenv_needs_rehash, true
         else
           raise Capistrano::ValidationError,
                 "#{host}: Ruby version required by application is neither installed nor installable using ruby-install."
         end
-        execute(:rbenv, :global, app_ruby_version) unless capture(:rbenv, :global) == app_ruby_version
+        execute(:rbenv, :global, "'#{app_ruby_version}'") unless capture(:rbenv, :global) == app_ruby_version
       end
       invoke('opscomplete:ruby:install_rubygems')
       invoke('opscomplete:ruby:install_bundler')

data/lib/capistrano/opscomplete/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Opscomplete
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-opscomplete
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Makandra Operations
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-05 00:00:00.000000000 Z
+date: 2019-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: makandra-rubocop
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Capistrano tasks for easy deployment to a makandra opscomplete environment.