capify-rbenv 4.0.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82055cb61430917d0414d97abf253d26e360da3c975003f64e111e1f66e81b20
-  data.tar.gz: 79bb5d6c88821086b93d1783a8e7e0d20484d088f2e2661fb82d14757d2f1c0b
+  metadata.gz: e5f8789b142f643a4d51ce7fefcbb84c961ba03cb0351e688aeffe4bb24bcc1b
+  data.tar.gz: 82fbbeef20d477e3398af9ac1a7150ffe66815db22b9174c5bf56fa3c346a87c
 SHA512:
-  metadata.gz: 94c26ce0155b562fba6075312711c9db1cd6559d80e1111bb73b2c89661526be33e6fab689912bde301d8a0566680f68e793275fbfc39ec09fff8dcee6af6506
-  data.tar.gz: 363dab56dd7f0f512949709bb9bfb172d5592294956adf74b87515d59615db31d76031f296bb4511b2e4a5f867d736951676d1dc4bb14389f35d1810bb08d005
+  metadata.gz: 5ecabc4b6f55a3a44027abb1e56e3f546dcdfa6f5c898139dbf131107e7ba99b10b1929cb2fb5d3d9e112978773cd1ab2a480714d2bed32faeea6d8122adf7d2
+  data.tar.gz: 73bd520ec0611e7b99ab5558e127b21699f5e620e5d74e949b069dd86878925fc907219696a8bae25c89cc03a431d6411832023a1d45870e25e6d52e8ad52327

data/README.md

@@ -13,7 +13,7 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'capistrano', '~> 3.13'
-gem 'capify-rbenv', '~> 1.0'
+gem 'capify-rbenv', '~> 5.0'
 ```
 
 And then execute:
@@ -27,11 +27,14 @@ $ bundle install
 ```ruby
 # Capfile
 require 'capistrano/rbenv'
+install_plugin Capistrano::Rbenv # Required: Setup rbenv
+install_plugin Capistrano::Rbenv::SetupRuby # Optional: Install/Setup ruby 
+install_plugin Capistrano::Rbenv::SetupBundler # Optional: Install/Setup bundler
 
 
 # config/deploy.rb
-set :rbenv_ruby, '2.7.1' # Set ruby version to install (Required)
-set :rbenv_bundler, '2.1.4' # Set bundler version to install (Required)
+set :rbenv_ruby, '2.7.1' # Set ruby version to use
+set :rbenv_bundler, '2.1.4' # Set bundler version to use
 
 # In case you want to set ruby version from .ruby-version file:
 # set :rbenv_ruby, File.read('.ruby-version').strip
@@ -54,40 +57,25 @@ set :rbenv_ruby_dir, "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}"
 
 # Set or append the list of dependencies to install
 # See lib/capistrano/tasks/defaults.rake for default dependencies
-append :rbenv_deps, 'libsqlite3-dev', 'sqlite3'
+append :rbenv_ruby_deps, 'libsqlite3-dev', 'sqlite3'
 
 # Set dependencies installer
-set :rbenv_deps_installler, 'apt-get install -y'
+set :rbenv_ruby_deps_installler, 'apt-get install -y'
 
 # Set or append customs bins to create under rbenv
 # See lib/capistrano/tasks/defaults.rake for default bins
 append :rbenv_map_bins, 'puma', 'pumactl'
 ```
 
-When you `require 'capistrano/rbenv'` in your Capfile, it will add default hooks to capistrano deploy that will automatically setup everything (rbenv, ruby, bundler) you need. If you want to skip the default hooks and setup everything on your own, use the following instructions,
-
-```ruby
-# Capfile
-require 'capistrano/rbenv/without_hooks'
-
-
-# Then add it as a hook
-after :some_task, 'rbenv:setup'
-
-# Or invoke manually
-task :custom_setup do
-  invoke 'rbenv:setup'
-end
-```
-
 ## Available tasks
 
 ```ruby
-rbenv:install              # Install rbenv
-rbenv:install_ruby         # Install ruby
-rbenv:install_bundler      # Install bundler gem
-rbenv:install_ruby_build   # Install/Update ruby_build - rbenv plugin
-rbenv:setup                # Setup rbenv, ruby-build, ruby and bundler
+rbenv:install                # Install rbenv
+rbenv:map_bins               # Map binaries to rbenv path
+rbenv:install_bundler        # Install bundler
+rbenv:install_ruby           # Install ruby
+rbenv:install_ruby_build     # Install/Update ruby-build - rbenv plugin
+rbenv:install_ruby_deps      # Install ruby dependencies
 ```
 
 ## Contributing

data/lib/capistrano/rbenv.rb

@@ -1 +1,33 @@
-require 'capistrano/rbenv/with_hooks'
+module Capistrano
+  class Rbenv < Plugin
+    def define_tasks
+      eval_rakefile File.expand_path('tasks/rbenv.rake', __dir__)
+    end
+
+    def register_hooks
+      Capistrano::DSL.stages.each do |stage|
+        after stage, 'rbenv:map_bins'
+      end
+    end
+
+    def set_defaults
+      # Set role on which rbenv setup will apply
+      set_if_empty :rbenv_role, :app
+
+      # Set rbenv installation type (user/system)
+      set_if_empty :rbenv_type, :user
+
+      # Set ruby version to use/install
+      set_if_empty :rbenv_ruby, '2.7.1'
+
+      # Set rbenv installation path
+      set_if_empty :rbenv_path, fetch(:rbenv_type) == :system ? '/usr/local/rbenv' : '$HOME/.rbenv'
+
+      # Set customs bins to create under rbenv
+      set_if_empty :rbenv_map_bins, %i[gem rake ruby rails bundle bundler]
+    end
+  end
+end
+
+require_relative 'rbenv/setup_ruby'
+require_relative 'rbenv/setup_bundler'

data/lib/capistrano/rbenv/setup_bundler.rb

@@ -0,0 +1,16 @@
+module Capistrano
+  class Rbenv::SetupBundler < Plugin
+    def define_tasks
+      eval_rakefile File.expand_path('../tasks/setup_bundler.rake', __dir__)
+    end
+
+    def register_hooks
+      after 'rbenv:install_ruby', 'rbenv:install_bundler'
+    end
+
+    def set_defaults
+      # Set bundler version to use/install
+      set_if_empty :rbenv_bundler, '2.1.4'
+    end
+  end
+end

data/lib/capistrano/rbenv/setup_ruby.rb

@@ -0,0 +1,22 @@
+module Capistrano
+  class Rbenv::SetupRuby < Plugin
+    def define_tasks
+      eval_rakefile File.expand_path('../tasks/setup_ruby.rake', __dir__)
+    end
+
+    def register_hooks
+      after 'rbenv:map_bins', 'rbenv:install_ruby'
+    end
+
+    def set_defaults
+      # Set rbenv directory for installed ruby versions
+      set_if_empty :rbenv_ruby_dir, "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}"
+
+      # Set list of dependencies needed for ruby
+      set_if_empty :rbenv_ruby_deps, %w[libssl-dev zlib1g-dev libreadline-dev build-essential]
+
+      # Set dependencies installer
+      set_if_empty :rbenv_ruby_deps_installler, 'sudo apt-get install -y'
+    end
+  end
+end

data/lib/capistrano/rbenv/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Rbenv
-    VERSION = '4.0.1'.freeze
+    VERSION = '5.0.0'.freeze
   end
 end

data/lib/capistrano/tasks/rbenv.rake

@@ -1,59 +1,11 @@
 namespace :rbenv do
-  RBENV_REPO_URL = 'https://github.com/rbenv/rbenv.git'.freeze
-  RUBY_BUILD_REPO_URL = 'https://github.com/rbenv/ruby-build.git'.freeze
+  desc 'Map binaries to rbenv path'
+  task :map_bins do
+    SSHKit.config.default_env.merge!({ rbenv_root: fetch(:rbenv_path), rbenv_version: fetch(:rbenv_ruby) })
+    SSHKit.config.command_map[:rbenv] = "#{fetch(:rbenv_path)}/bin/rbenv"
 
-
-  desc 'Install rbenv'
-  task :install do
-    on roles(fetch(:rbenv_role)) do
-      next if test "[ -d #{fetch(:rbenv_path)} ]"
-
-      execute :sudo, "#{fetch(:rbenv_deps_installler)} #{fetch(:rbenv_default_deps)} #{fetch(:rbenv_deps)}"
-      execute :git, "clone #{RBENV_REPO_URL} #{fetch(:rbenv_path)}"
-    end
-  end
-
-
-  desc 'Install/Update ruby-build - rbenv plugin'
-  task :install_ruby_build do
-    on roles(fetch(:rbenv_role)) do
-      ruby_build_path = "#{fetch(:rbenv_path)}/plugins/ruby-build"
-
-      if test "[ -d #{ruby_build_path} ]"
-        execute :git, "-C #{ruby_build_path} pull"
-      else
-        invoke 'rbenv:install'
-        execute :git, "clone #{RUBY_BUILD_REPO_URL} #{ruby_build_path}"
-      end
-    end
-  end
-
-
-  desc 'Install ruby'
-  task :install_ruby do
-    on roles(fetch(:rbenv_role)) do
-      next if test "[ -d #{fetch(:rbenv_ruby_dir)} ]"
-
-      invoke 'rbenv:install_ruby_build'
-      execute :rbenv, "install #{fetch(:rbenv_ruby)}"
-    end
-  end
-
-
-  desc 'Install bundler'
-  task :install_bundler do
-    on roles(fetch(:rbenv_role)) do
-      next if test :gem, :query, "-q -i -n ^bundler$ -v #{fetch(:rbenv_bundler)}"
-
-      invoke 'rbenv:install_ruby'
-      execute "echo 'gem: --no-document' >> ~/.gemrc"
-      execute :gem, :install, :bundler, "-v #{fetch(:rbenv_bundler)}"
+    fetch(:rbenv_map_bins).uniq.each do |cmd|
+      SSHKit.config.command_map.prefix[cmd].unshift("#{fetch(:rbenv_path)}/bin/rbenv exec")
     end
   end
-
-
-  desc 'Setup rbenv, ruby-build, ruby and bundler'
-  task :setup do
-    invoke 'rbenv:install_bundler'
-  end
 end

data/lib/capistrano/tasks/setup_bundler.rake

@@ -0,0 +1,11 @@
+namespace :rbenv do
+  desc 'Install bundler'
+  task :install_bundler do
+    on roles(fetch(:rbenv_role)) do
+      next if test :gem, "query -q -i -n ^bundler$ -v #{fetch(:rbenv_bundler)}"
+
+      execute "echo 'gem: --no-document' >> ~/.gemrc"
+      execute :gem, "install bundler -v #{fetch(:rbenv_bundler)}"
+    end
+  end
+end

data/lib/capistrano/tasks/setup_ruby.rake

@@ -0,0 +1,45 @@
+namespace :rbenv do
+  RBENV_REPO_URL = 'https://github.com/rbenv/rbenv.git'.freeze
+  RUBY_BUILD_REPO_URL = 'https://github.com/rbenv/ruby-build.git'.freeze
+
+  desc 'Install ruby dependencies'
+  task :install_ruby_deps do
+    on roles(fetch(:rbenv_role)) do
+      execute "#{fetch(:rbenv_ruby_deps_installler)} #{fetch(:rbenv_ruby_deps).join(' ')}"
+    end
+  end
+
+  desc 'Install rbenv'
+  task :install do
+    on roles(fetch(:rbenv_role)) do
+      next if test "[ -d #{fetch(:rbenv_path)} ]"
+
+      invoke 'rbenv:install_ruby_deps'
+      execute :git, "clone #{RBENV_REPO_URL} #{fetch(:rbenv_path)}"
+    end
+  end
+
+  desc 'Install/Update ruby-build - rbenv plugin'
+  task :install_ruby_build do
+    on roles(fetch(:rbenv_role)) do
+      ruby_build_path = "#{fetch(:rbenv_path)}/plugins/ruby-build"
+
+      if test "[ -d #{ruby_build_path} ]"
+        execute :git, "-C #{ruby_build_path} pull"
+      else
+        execute :git, "clone #{RUBY_BUILD_REPO_URL} #{ruby_build_path}"
+      end
+    end
+  end
+
+  desc 'Install ruby'
+  task :install_ruby do
+    on roles(fetch(:rbenv_role)) do
+      next if test "[ -d #{fetch(:rbenv_ruby_dir)} ]"
+
+      invoke 'rbenv:install'
+      invoke 'rbenv:install_ruby_build'
+      execute :rbenv, "install #{fetch(:rbenv_ruby)}"
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capify-rbenv
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Muhammad Usman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-08 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -54,12 +54,12 @@ files:
 - bin/setup
 - capify-rbenv.gemspec
 - lib/capistrano/rbenv.rb
+- lib/capistrano/rbenv/setup_bundler.rb
+- lib/capistrano/rbenv/setup_ruby.rb
 - lib/capistrano/rbenv/version.rb
-- lib/capistrano/rbenv/with_hooks.rb
-- lib/capistrano/rbenv/without_hooks.rb
-- lib/capistrano/tasks/defaults.rake
-- lib/capistrano/tasks/deploy.rake
 - lib/capistrano/tasks/rbenv.rake
+- lib/capistrano/tasks/setup_bundler.rake
+- lib/capistrano/tasks/setup_ruby.rake
 homepage: https://github.com/uxxman/capify-rbenv
 licenses:
 - MIT

data/lib/capistrano/rbenv/with_hooks.rb

@@ -1,3 +0,0 @@
-load File.expand_path('../tasks/defaults.rake', __dir__)
-load File.expand_path('../tasks/rbenv.rake', __dir__)
-load File.expand_path('../tasks/deploy.rake', __dir__)

data/lib/capistrano/rbenv/without_hooks.rb

@@ -1,2 +0,0 @@
-load File.expand_path('../tasks/defaults.rake', __dir__)
-load File.expand_path('../tasks/rbenv.rake', __dir__)

data/lib/capistrano/tasks/defaults.rake

@@ -1,59 +0,0 @@
-namespace :load do
-  task :defaults do
-    default_deps = %w[
-      libpq-dev
-      libssl-dev
-      zlib1g-dev
-      libreadline-dev
-      build-essential
-    ]
-
-    default_bins = %w[
-      gem
-      rake
-      ruby
-      rails
-      bundle
-    ]
-
-    # Set ruby version to install using rbenv (Required)
-    # set :rbenv_ruby, '2.7.1'
-
-    # Set bundler version to install using rbenv (Required)
-    # set :rbenv_bundler, '2.1.4'
-
-    # Set role on which rbenv setup will apply
-    set_if_empty :rbenv_role, :app
-
-    # Set rbenv installation type (user/system)
-    set_if_empty :rbenv_type, :user
-
-    # Set rbenv installation path
-    set_if_empty :rbenv_path, fetch(:rbenv_type) == :system ? '/usr/local/rbenv' : '$HOME/.rbenv'
-
-    # Set rbenv directory for installed ruby versions
-    set_if_empty :rbenv_ruby_dir, "#{fetch(:rbenv_path)}/versions/#{fetch(:rbenv_ruby)}"
-
-    # Set list of custom dependencies to install
-    set_if_empty :rbenv_deps, default_deps.join(' ')
-
-    # Set dependencies installer
-    set_if_empty :rbenv_deps_installler, 'apt-get install -y'
-
-    # Set customs bins to create under rbenv
-    set_if_empty :rbenv_map_bins, default_bins
-  end
-end
-
-
-Capistrano::DSL.stages.each do |stage|
-  after stage, :rbenv_map_bins do
-    SSHKit.config.default_env.merge!({ rbenv_root: fetch(:rbenv_path), rbenv_version: fetch(:rbenv_ruby) })
-    SSHKit.config.command_map[:rbenv] = "#{fetch(:rbenv_path)}/bin/rbenv"
-    rbenv_prefix = fetch(:rbenv_prefix, "#{fetch(:rbenv_path)}/bin/rbenv exec")
-
-    fetch(:rbenv_map_bins).uniq.each do |command|
-      SSHKit.config.command_map.prefix[command.to_sym].unshift(rbenv_prefix)
-    end
-  end
-end

data/lib/capistrano/tasks/deploy.rake

@@ -1,3 +0,0 @@
-Capistrano::DSL.stages.each do |stage|
-  after stage, 'rbenv:setup'
-end