capistrano-fiftyfive 0.9.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3916348a87186409600372b158a754099cb4b60
-  data.tar.gz: 95c586c5077aeee4c858260ab86db882d9a9470b
+  metadata.gz: e23bb6c0cd0ee5b7bdf7cbce96bc25c9c2e86a3a
+  data.tar.gz: 32a703d754d35f55903c9f9718f4ebade51a4598
 SHA512:
-  metadata.gz: 314a74494bda7d2c26657abfa91906c4b4933c6f7dfc6da5a3070f5156c9bb3471351842268ca1b804c2cf64a049f202a4d9eb36741ef5934fda4107f3246fe1
-  data.tar.gz: 482de0be4a080b7c49b45edcc8007ea15e30b543a0b400ba6e9fbdcdf19b3b8e7766deeab653d2b03e98946920077b3fb0fea0020a7acdd3ab969170d4bbd7e9
+  metadata.gz: 39b2ddc41c28bc51c30b84eab97ca7bdd825d86a2cf58b9b1d9b2f26c62f6e87a75dd28b478cfc0a6405c1e745abd801f88f84cb7c730e3676832dadf1333e6a
+  data.tar.gz: e17816da9a56350727d87c86fb504927c30c20ffe4da75ccb7d8bee8abd526a221c9e3b2fc0312a8b01520aa8499811a16141da22afe00a9bba3e9b16b6c2288

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # capistrano-fiftyfive Changelog
 
+## `0.10.0`
+
+Add support for Ubuntu 14.04 LTS. To provision a 14.04 server, use the new `provision:14_04` task.
+
 ## `0.9.1`
 
 Flush console output after each line is printed. This allows deployment progress to be monitored in e.g. Jenkins.

data/README.md

@@ -19,7 +19,7 @@ The capistrano-fiftyfive gem adds a `cap <stage> provision` task to Capistrano t
 
 The gem is named "capistrano-fiftyfive" because it is built first and foremost for serving our deployment needs here at [55 Minutes](http://55minutes.com). You'll notice that capistrano-fiftyfive is opinionated and strictly uses the following stack:
 
-* Ubuntu 12.04 LTS
+* Ubuntu 12.04 LTS or 14.04 LTS
 * PostgreSQL
 * Unicorn
 * Nginx
@@ -121,7 +121,7 @@ Check out our [rails-starter][] project for a sample Capfile and deploy.rb.
 ## Usage
 
 The power of the capistrano-fiftyfive recipes is that they take care of the
-entire setup of a bare Ubuntu 12.04 server, all the way to a fully configured
+entire setup of a bare Ubuntu 12.04 or 14.04 server, all the way to a fully configured
 and running Rails app on top up Unicorn, Nginx, rbenv, and PostgreSQL.
 
 ### Deploying to a new server from scratch
@@ -129,13 +129,14 @@ and running Rails app on top up Unicorn, Nginx, rbenv, and PostgreSQL.
 These steps assume you have loaded the full set of capistrano-fiftyfive
 recipes in your Capfile.
 
-1. Provision an Ubuntu 12.04 VPS at your hosting provider of choice.
+1. Provision an Ubuntu 12.04 or 14.04 VPS at your hosting provider of choice.
 2. Install your public SSH key for the root user. Some providers (e.g. DigitalOcean) can do this for you automatically when you provision a new VPS.
 3. Repeat steps 1-2 for all the servers in your cluster, if you are using
    a multi-server setup (e.g. separate web, app, and database servers).
 4. Let capistrano-fiftyfive take it from here:
 
-        cap staging provision
+        cap staging provision       # for 12.04 LTS
+        cap staging provision:14_04 # for 14.04 LTS
         cap staging deploy
 
 ### Running individual tasks

data/lib/capistrano/fiftyfive/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module Fiftyfive
-    VERSION = "0.9.1"
+    VERSION = "0.10.0"
   end
 end

data/lib/capistrano/fiftyfive.rb

@@ -7,6 +7,7 @@ require "capistrano/fiftyfive/console"
 require "sshkit/formatter/abbreviated"
 include Capistrano::Fiftyfive::DSL
 
+load File.expand_path("../tasks/provision.rake", __FILE__)
 load File.expand_path("../tasks/defaults.rake", __FILE__)
 load File.expand_path("../tasks/user.rake", __FILE__)
 load File.expand_path("../tasks/aptitude.rake", __FILE__)

data/lib/capistrano/tasks/aptitude.rake

@@ -1,5 +1,7 @@
 fiftyfive_recipe :aptitude do
   during :provision, %w(upgrade install)
+  before "provision:14_04", "fiftyfive:aptitude:install_postgres_repo"
+  before "provision:14_04", "fiftyfive:aptitude:change_postgres_packages"
 end
 
 namespace :fiftyfive do
@@ -34,15 +36,37 @@ namespace :fiftyfive do
       end
     end
 
+    desc "Add the official apt repository for PostgreSQL"
+    task :install_postgres_repo do
+      privileged_on roles(:all) do |host|
+        _add_repository(
+          "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main",
+          :key => "https://www.postgresql.org/media/keys/ACCC4CF8.asc")
+      end
+    end
+
+    desc "Change 12.04 PostgreSQL package requirements to 14.04 versions"
+    task :change_postgres_packages do
+      packages = fetch(:fiftyfive_aptitude_packages, {})
+      packages = Hash[packages.map do |key, value|
+        [key.sub(/@ppa:pitti\/postgresql$/, ""), value]
+      end]
+      set(:fiftyfive_aptitude_packages, packages)
+    end
+
     def _already_installed?(pkg)
       test(:dpkg, "-s", pkg, "2>/dev/null", "|", :grep, "-q 'ok installed'")
     end
 
-    def _add_repository(repo)
+    def _add_repository(repo, options={})
       unless _already_installed?("python-software-properties")
         _install("python-software-properties")
       end
-      execute :"apt-add-repository", "-y", repo
+      execute :"apt-add-repository", "-y '#{repo}'"
+
+      if (key = options.fetch(:key, nil))
+        execute "wget --quiet -O - #{key} | sudo apt-key add -"
+      end
     end
 
     def _install(pkg)

data/lib/capistrano/tasks/provision.rake

@@ -0,0 +1,18 @@
+# Define empty provision tasks.
+# These will be filled in by other recipes that contribute additional
+# `before` and `during` tasks.
+
+desc "Install and set up all app prerequisites (assumes Ubuntu 12.04)"
+task :provision
+
+namespace :provision do
+  desc "Install and set up all app prerequisites for Ubuntu 12.04"
+  task :"12_04" do
+    invoke "provision"
+  end
+
+  desc "Install and set up all app prerequisites for Ubuntu 14.04"
+  task :"14_04" do
+    invoke "provision"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-fiftyfive
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -128,6 +128,7 @@ files:
 - lib/capistrano/tasks/migrate.rake
 - lib/capistrano/tasks/nginx.rake
 - lib/capistrano/tasks/postgresql.rake
+- lib/capistrano/tasks/provision.rake
 - lib/capistrano/tasks/rake.rake
 - lib/capistrano/tasks/rbenv.rake
 - lib/capistrano/tasks/seed.rake