capistrano-opscomplete 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0743d3bbb02bac9362a1729bf5821a4d4a0bd59e
-  data.tar.gz: b045d4e90dd46e866c4b4647ebefff9a74e69d35
+SHA256:
+  metadata.gz: a111086da8ada5ac2feb628dde0145658192aab86de0c3ff4ce18645b49ded6e
+  data.tar.gz: 9d264bca1f519365f7fd16cfab80e1351ef39f26e5ed1b8fac146fb648580b06
 SHA512:
-  metadata.gz: 287c4b000c0de702f2055bd29cf94a37d4578ea730cf2676c8f2f42b12dd77be6edcee232b33b0a0fc2f5716c36e3b4393199d444ea49898f2b526db91e7f93b
-  data.tar.gz: 823a06e3d2f3f533e3a9d70f1ee84eea7719d10a8eb90dcd89fa86156776dee71d265809ae50ac15ab8b97645d6c281966c8b2dc03373cd0155e0465eca5ea70
+  metadata.gz: 6255e9bfb88b90ee0a24d22b08c77ff186dcb83f6d7b782e1c2f92c6c75fc829fb2cc1be84bcd5786eb39452f6a0be2b8bb0b5321b6dfafc01c0b87f60805f51
+  data.tar.gz: 260cbaaa98160b36fbb89b58ff86db5d5a386ad0a8aab72306b660c98d23bebe0cdefec7f5d8fc8185e485dcd872ccebef3d017b7ea66e5cf556018d2e317ab2

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unreleased
+
+## [0.5.0] - 2019-12-09
+### Changed
+- Install the bundler version that was used to create the `Gemfile.lock` (`BUNDLED WITH`) if it is present. Can be overwritten by `set :bundler_version`.
+- Reword some info output
+
 ## [0.4.0] - 2019-09-23
 ### Added
 - ruby-build now honors the :tmp_dir setting
@@ -35,6 +42,7 @@
 ### Added
 - Initial release.
 
+[0.5.0]: https://github.com/makandra/capistrano-opscomplete/compare/v0.4.0...v0.5.0
 [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

@@ -75,7 +75,8 @@ More specifically this task will:
       3) A file in the current working directory of your local checkout (e.g. `/home/user/code/myapp/.ruby-version`)
     - If the desired version is not installed, it checks if it can be installed using `ruby-build` and installs it.
     - Check if `rbenv global` version is set according to application's `.ruby-version` file. Change it if required.
-    - Install the `bundler` and `geordi` gem if required.
+    - Install `bundler`. It is tried to determine the version that was used to create the `Gemfile.lock` (`BUNDLED WITH`) if it is present.
+    - Install `geordi` gem if required.
     - Run `rbenv rehash` if required.
 
 **Note:** If, for any reason, no `.ruby-version` file can be found in your release or current working directory, you may set the following option in `deploy.rb`:
@@ -92,12 +93,18 @@ set :rbenv_roles, :web
 set :rbenv_roles, [:web, :worker]
 ```
 
-**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:
+**Optional:** If you want a specific bundler version other than the one that is set in `Gemfile.lock` available for your release, set it in your `deploy.rb`:
 
 ```ruby
 set :bundler_version, '<VERSION>'
 ```
 
+e.g. if you need bundler version 2.x:
+
+```ruby
+set :bundler_version, '~>2'
+```
+
 **Optional:** By default, the rubygems version defined by the ruby-build manifest will be installed. If you want a specific rubygems version available for your release, set it in your `deploy.rb`:
 
 ```ruby

data/capistrano-opscomplete.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.authors  = ['Makandra Operations']
   spec.email    = ['ops@makandra.de']
 
-  spec.summary  = %q(Capistrano tasks for easy deployment to a makandra opscomplete environment.)
+  spec.summary  = 'Capistrano tasks for easy deployment to a makandra opscomplete environment.'
   spec.homepage = 'https://opscomplete.com/ruby'
 
   spec.license  = 'MIT'
@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
 
   spec.required_rubygems_version = '>=2.0.1'
 
-  spec.add_development_dependency 'makandra-rubocop', '~> 0'
+  spec.add_development_dependency 'makandra-rubocop', '~> 4'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
 

data/lib/capistrano/dsl/opscomplete.rb

@@ -42,6 +42,28 @@ module Capistrano
         end
       end
 
+      def app_gemfile_bundled_with_version
+        release_gemfile_lock_file_path = release_path.join('Gemfile.lock').to_s
+
+        if test("[ -f #{release_gemfile_lock_file_path} ]")
+          debug('found release_dir/Gemfile.lock')
+
+          grep_command = [:grep, '-A', '1', '"BUNDLED WITH"', release_gemfile_lock_file_path]
+
+          if test(*grep_command)
+            bundled_with_lines = capture(*grep_command)
+            version = bundled_with_lines.split.last
+            debug("Using version #{version.inspect} from server's release_dir/Gemfile.lock file.")
+            version
+          else
+            # old bundler versions did not write "BUNDLED WITH"
+            debug('Gemfile.lock was found but did not contain "BUNDLED WITH"-section')
+          end
+        else
+          debug('There was no Gemfile.lock to parse the bundler version')
+        end
+      end
+
       def rbenv_installable_rubies
         rbenv_installable_rubies = capture(:rbenv, :install, '--list').split("\n")
         rbenv_installable_rubies.map!(&:strip)

data/lib/capistrano/opscomplete/tasks.rake

@@ -16,15 +16,15 @@ namespace :opscomplete do
       end
     end
 
-    desc 'Check if rbenv global ruby is set according to application\'s .ruby-version.'
+    desc 'Check if rbenv global Ruby version is set according to application\'s .ruby-version.'
     task :check 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?
+        warn("#{host}: Managed Ruby environment! Won't do any changes to ruby version.") if managed_ruby?
         unless capture(:rbenv, :global) == app_ruby_version
           raise Capistrano::ValidationError,
                 "#{host}: Ruby version is not set according to application\'s .ruby-version file. Use cap opscomplete:ruby:ensure."
         end
-        info("#{host}: Required ruby version '#{app_ruby_version}' is installed.")
+        info("#{host}: Ruby #{app_ruby_version} is installed.")
       end
     end
 
@@ -52,9 +52,12 @@ namespace :opscomplete do
     # desc 'Install bundler gem'
     task :install_bundler do
       on roles fetch(:rbenv_roles, :all) do
-        if fetch(:bundler_version, false)
+        # manually specified version will take precedence
+        specific_bundler_version = fetch(:bundler_version, app_gemfile_bundled_with_version)
+
+        if specific_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))
+          gem_install('bundler', specific_bundler_version, true) unless gem_installed?('bundler', specific_bundler_version)
         else
           gem_install('bundler') unless gem_installed?('bundler')
         end
@@ -89,19 +92,19 @@ 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."
+          raise Capistrano::ValidationError, "#{host}: Managed Ruby environment! Won't do any changes to Ruby version."
         end
         if rbenv_installed_rubies.include?(app_ruby_version)
-          info("#{host}: Required ruby version '#{app_ruby_version}' is installed.")
+          info("#{host}: Ruby #{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.")
+          info("#{host}: Configured Ruby version is not installed, but available for installation.")
           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."
+                "#{host}: Configured Ruby version is neither installed nor installable using ruby-install."
         end
         execute(:rbenv, :global, "'#{app_ruby_version}'") unless capture(:rbenv, :global) == app_ruby_version
       end

data/lib/capistrano/opscomplete/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-opscomplete
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Makandra Operations
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: makandra-rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,8 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Capistrano tasks for easy deployment to a makandra opscomplete environment.