capistrano-mb 0.25.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68f254e189ca2c33534fd00783cd175af1a8406
-  data.tar.gz: 784f000997958d8c0f75a2d9a0a9d47373adfca7
+  metadata.gz: 1a635a5c0e264df5e8a8471ba83d32095b5155ff
+  data.tar.gz: 0f8a89893367acf14bf4a5f29e013f253e72973a
 SHA512:
-  metadata.gz: 3c50211747368f79ec6d0de1239cf36e08d801c07c36116e76b698ce0470fa7905f63f17f34d685a58a16cd47b40bae37fe125a0f88816ba16aaa5931c88e6ef
-  data.tar.gz: d80d91386d2948928deccd37237a34cd630188f23b456b34ec3bb5190c8e46ff06f3ee96579694408fdf1fa18092dee3d21d2d58d4bc85b92eef7191936053a4
+  metadata.gz: 1935554eb3a9c48b1b8119bb64f7dd5f30dddeb20ef6c216df85a139534b25881c7aadfead3a97b07cad1829e632f9d87386185b53334eaf64d6247d57db2f52
+  data.tar.gz: 5cf45d13b17e22210ae5cd5e533106f07172a409fd9f2980c5ffefad82d9b8c8f858bdbe00c3ef79e4574d7e3b3b33518fdb6e51af16ea283dab1856af4e69ef

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 * Your contribution here!
 
+## [0.26.0][] (2016-01-08)
+
+* Remove `mb:postgresql:tune` task. The [pgtune](https://github.com/gregs1104/pgtune) tool no longer works with the latest versions of PostgresSQL.
+* Overhaul the `mb:rbenv:*` tasks.
+  * Use the official rbenv-installer script
+  * Install necessary dev packages via `mb:aptitude:install` rather than relying on an external (and outdated) script
+  * Remove several unused rbenv plugins, keeping only: `ruby-build`, `rbenv-vars`, `rbenv-update`
+  * Install plugins using our own code, rather than using external script
+  * No longer install the `psych` gem
+
 ## [0.25.0][] (2015-10-09)
 
 * Add `X-Accel-Mapping` and appropriate NGINX configuration so that `send_file` used in a Rails controller is now accelerated using `X-Accel-Redirect`. For security this only works if the file being sent resides in the Rails app directory (e.g. `<rails_root>/tmp` or `<rails_root>/public`). This means `send_file` files will be served by NGINX natively, rather than through Rack.
@@ -146,7 +156,8 @@ Flush console output after each line is printed. This allows deployment progress
 
 Initial Rubygems release!
 
-[Unreleased]: https://github.com/mattbrictson/capistrano-mb/compare/v0.25.0...HEAD
+[Unreleased]: https://github.com/mattbrictson/capistrano-mb/compare/v0.26.0...HEAD
+[0.26.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.25.0...v0.26.0
 [0.25.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.24.0...v0.25.0
 [0.24.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.23.1...v0.24.0
 [0.23.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.23.0...v0.23.1

data/lib/capistrano/mb/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MB
-    VERSION = "0.25.0"
+    VERSION = "0.26.0"
   end
 end

data/lib/capistrano/tasks/defaults.rake

@@ -22,15 +22,23 @@ namespace :load do
     set :mb_privileged_user, "root"
 
     set :mb_aptitude_packages,
+        "build-essential"                        => :all,
         "curl"                                   => :all,
         "debian-goodies"                         => :all,
         "git-core"                               => :all,
         "libpq-dev@ppa:pitti/postgresql"         => :all,
+        "libreadline-gplv2-dev"                  => :all,
+        "libssl-dev"                             => :all,
+        "libxml2"                                => :all,
+        "libxml2-dev"                            => :all,
+        "libxslt1-dev"                           => :all,
         "nginx@ppa:nginx/stable"                 => :web,
         "nodejs@ppa:chris-lea/node.js"           => :all,
         "postgresql-client@ppa:pitti/postgresql" => :all,
         "postgresql@ppa:pitti/postgresql"        => :db,
-        "ufw"                                    => :all
+        "tklib"                                  => :all,
+        "ufw"                                    => :all,
+        "zlib1g-dev"                             => :all
 
     set :mb_bundler_lockfile, "Gemfile.lock"
     set :mb_bundler_gem_install_command,
@@ -48,7 +56,6 @@ namespace :load do
     set :mb_nginx_redirect_hosts, {}
 
     ask :mb_postgresql_password, nil, :echo => false
-    set :mb_postgresql_max_connections, 25
     set :mb_postgresql_pool_size, 5
     set :mb_postgresql_host, "localhost"
     set :mb_postgresql_database,

data/lib/capistrano/tasks/postgresql.rake

@@ -10,34 +10,6 @@ end
 
 namespace :mb do
   namespace :postgresql do
-    desc "Update postgresql.conf using pgtune"
-    task :tune do
-      privileged_on primary(:db), :in => :sequence do
-        pgtune_dir = "/tmp/pgtune"
-        pgtune_output = "/tmp/postgresql.conf.pgtune"
-        pg_conf = "/etc/postgresql/9.1/main/postgresql.conf"
-
-        execute :sudo, "rm", "-rf", pgtune_dir
-        execute :sudo, "git",
-                "clone",
-                "-q",
-                "https://github.com/gregs1104/pgtune.git",
-                pgtune_dir
-
-        execute "sudo #{pgtune_dir}/pgtune",
-                "--input-config", pg_conf,
-                "--output-config", pgtune_output,
-                "--type", "Web",
-                "--connections", fetch(:mb_postgresql_max_connections)
-
-        # Log diff for informational purposes
-        execute :sudo, "diff", pg_conf, pgtune_output, "|| true"
-
-        execute :sudo, "cp", pgtune_output, pg_conf
-        execute :sudo, "service", "postgresql", "restart"
-      end
-    end
-
     desc "Create user if it doesn't already exist"
     task :create_user do
       privileged_on primary(:db) do

data/lib/capistrano/tasks/rbenv.rake

@@ -7,15 +7,15 @@ namespace :mb do
     desc "Install rbenv and compile ruby"
     task :install do
       invoke "mb:rbenv:run_installer"
+      invoke "mb:rbenv:add_plugins"
       invoke "mb:rbenv:modify_bashrc"
-      invoke "mb:rbenv:bootstrap_ubuntu_for_ruby_compile"
       invoke "mb:rbenv:compile_ruby"
     end
 
     desc "Install the latest version of Ruby"
     task :upgrade do
+      invoke "mb:rbenv:add_plugins"
       invoke "mb:rbenv:update_rbenv"
-      invoke "mb:rbenv:bootstrap_ubuntu_for_ruby_compile"
       invoke "mb:rbenv:compile_ruby"
     end
 
@@ -40,10 +40,31 @@ namespace :mb do
     end
 
     task :run_installer do
+      installer_url = \
+      "https://github.com/rbenv/rbenv-installer/raw/master/bin/rbenv-installer"
+
       on release_roles(:all) do
-        execute :curl,
-                "-L https://raw.github.com/fesplugas/rbenv-installer/master/bin/rbenv-installer",
-                "|", :bash
+        with :path => "$HOME/.rbenv/bin:$HOME/.rbenv/shims:$PATH" do
+          execute :curl, "-fsSL", installer_url, "| bash"
+        end
+      end
+    end
+
+    task :add_plugins do
+      plugins = %w(
+        sstephenson/rbenv-vars
+        sstephenson/ruby-build
+        rkh/rbenv-update
+      )
+      plugins.each do |plugin|
+        git_repo = "https://github.com/#{plugin}.git"
+        plugin_dir = "$HOME/.rbenv/plugins/#{plugin.split('/').last}"
+
+        on release_roles(:all) do
+          unless test("[ -d #{plugin_dir} ]")
+            execute :git, "clone", git_repo, plugin_dir
+          end
+        end
       end
     end
 
@@ -59,15 +80,6 @@ namespace :mb do
       end
     end
 
-    task :bootstrap_ubuntu_for_ruby_compile do
-      privileged_on release_roles(:all) do |host, user|
-        with :debian_frontend => "noninteractive" do
-          execute "sudo ~#{user}/.rbenv/plugins/rbenv-bootstrap/bin/rbenv-bootstrap-ubuntu-12-04"
-          execute "sudo aptitude -y -q install libffi-dev"
-        end
-      end
-    end
-
     task :compile_ruby do
       ruby_version = fetch(:mb_rbenv_ruby_version)
       on release_roles(:all) do
@@ -78,8 +90,7 @@ namespace :mb do
         if force
           execute "CFLAGS=-O3 rbenv install --force #{ruby_version}"
           execute "rbenv global #{ruby_version}"
-          execute "gem install bundler psych --no-document"
-          execute "rbenv rehash"
+          execute "gem install bundler --no-document"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-mb
 version: !ruby/object:Gem::Version
-  version: 0.25.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-09 00:00:00.000000000 Z
+date: 2016-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Additional Capistrano 3 recipes