capistrano-mb 0.22.2 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffdb9f630e70934e96f92ed8e881240d2d61770c
-  data.tar.gz: 26f525d2a3396ab2994ae08cb22431051b512d71
+  metadata.gz: b0bf12dd707d6d24d97510271923e2b808551369
+  data.tar.gz: d82f49ab413a40e89639974be522fbb6aeee89e0
 SHA512:
-  metadata.gz: 76c47fc1b2a63c1fdc299f73eb9888ce12ec1eb63054fd59bdc5ac278f6cf739e532c2f0323770e6b82d9c229094ae4e2521216e0140699e3832085b4ba4ac01
-  data.tar.gz: 70f1a57340dc9810dc6940a380ba111d12a8e6b7a702f05c2bd34ee7518af9fecd98c8cbcc770822a937fa35f7d3d0fda8c4ad2467b07153ee9dfa84c9e7079f
+  metadata.gz: ff8b4895ffa87304bacdef0279caa8db45a7f0dd42215653c7ded17a7e5bec2800a7596bb8d0027f29f6927706a5f34c64c3fdce94e2d90400c630d460ce3c69
+  data.tar.gz: 89e74b626f258c05ff2c499cf91da747c25c9ae71d48b62b655930879405a6e2b3cd6aa3189c40f833aed1be2672220c71c8a709742a6803c818b420bcb740c5

data/CHANGELOG.md

@@ -2,15 +2,27 @@
 
 * Your contribution here!
 
-## 0.22.2 (2015-06-22)
+## [0.23.0][] (2015-07-10)
+
+This release introduces a `bundler` recipe that automatically installs or upgrades bundler using `gem install bundler` during `cap deploy`. To disable this behavior:
+
+```ruby
+set :mb_bundler_gem_install_command, nil
+```
+
+Other changes:
+
+* No longer assume that the `colorize` gem is available (it may be removed in an upcoming version of SSHKit/capistrano).
+
+## [0.22.2][] (2015-06-22)
 
 * For backwards compatibility with capistrano-fiftyfive, also search `lib/capistrano/fiftyfive/templates` for template files (the preferred location is `lib/capistrano/mb/templates`).
 
-## 0.22.1 (2015-06-22)
+## [0.22.1][] (2015-06-22)
 
 * Remove "capistrano-fiftyfive has been renamed to capistrano-mb" post-install message.
 
-## 0.22.0 (2015-06-22)
+## [0.22.0][] (2015-06-22)
 
 **THIS GEM HAS A NEW NAME! It is now `capistrano-mb`.**
 
@@ -18,43 +30,43 @@
 * All tasks now use the `mb` namespace. E.g. `cap fiftyfive:crontab` is now `cap mb:crontab`.
 * For backwards compatibility, you can still use the `fiftyfive` versions, but a deprecation warning will be printed. This compatibility will be removed in capistrano-mb 1.0.
 
-## 0.21.0 (2015-06-22)
+## [0.21.0][] (2015-06-22)
 
 * Add a post-install message explaining the rename of `capistrano-fiftyfive` to `capistrano-mb`.
 
-## 0.20.1 (2015-05-29)
+## [0.20.1][] (2015-05-29)
 
 * An internal change in Capistrano 3.4.0 caused `fiftyfive:aptitude:install` to fail to install packages. This is now fixed.
 
-## 0.20.0 (2015-05-29)
+## [0.20.0][] (2015-05-29)
 
 * Increase SSL/TLS security of the generated nginx configuration by following the suggestions of [weakdh.org](https://weakdh.org/sysadmin.html).
 
-## 0.19.0 (2015-04-10)
+## [0.19.0][] (2015-04-10)
 
 * Add `--retry=3` to bundle install options. This will help prevent deployment failures in case that a gem initially fails to download during the `bundle install` step.
 * Ensure that `--dry-run` works without crashing. This involved working around Capistrano's `download!` behavior (it returns a String normally, but an entirely different object during a dry run).
 
-## 0.18.0
+## [0.18.0][]
 
 * **The abbreviated log formatter has been removed and is now available in a new gem: `airbrussh`.** With this change, capistrano-fiftyfive no longer automatically changes the logging format of capistrano. To opt into the prettier, more concise format, add the airbrussh gem to your project as explained in the [airbrussh README](https://github.com/mattbrictson/airbrussh#readme).
 * The version initializer that capistrano-fiftyfive adds during deployment sets a new value: `Rails.application.config.version_time`. You can use this value within your app for the date and time of the last commit that produced the version that is currently deployed.
 
 
-## 0.17.2
+## [0.17.2][]
 
 * Default self-signed SSL certificate is now more generic (for real this time).
 
-## 0.17.1
+## [0.17.1][]
 
 * Cosmetic changes to the gemspec.
 
-## 0.17.0
+## [0.17.0][]
 
 * Write a banner message into `capistrano.log` at the start of each cap run, to aid in troubleshooting.
 * Default self-signed SSL certificate is now more generic.
 
-## 0.16.0
+## [0.16.0][]
 
 * capistrano-fiftyfive now requires capistrano >= 3.3.5 and sshkit => 1.6.1
 * `ask_secretly` has been removed in favor of Capistrano's built-in `ask ..., :echo => false`
@@ -62,20 +74,20 @@
 * highline dependency removed
 * Install libffi-dev so that Ruby 2.2.0 can be compiled
 
-## 0.15.2
+## [0.15.2][]
 
 * The capistrano-fiftyfive GitHub repository has changed: it is now <https://github.com/mattbrictson/capistrano-fiftyfive>.
 
-## 0.15.1
+## [0.15.1][]
 
 * Remove `-j4` bundler flag
 
-## 0.15.0
+## [0.15.0][]
 
 * Dump useful troubleshooting information when a deploy fails.
 * Nginx/unicorn: fix syntax errors introduced by changes in 0.14.0, ensuring that gzip and far-future expires headers are sent as expected.
 
-## 0.14.0
+## [0.14.0][]
 
 * The `highline` gem is now a dependency ([#3](https://github.com/mattbrictson/capistrano-fiftyfive/pull/3) from [@ahmozkya](https://github.com/ahmozkya)).
 * Dotenv: only mask input when prompting for keys containing the words "key", "secret", "token", or "password". Input for other keys is echoed for easier data entry.
@@ -83,7 +95,7 @@
 * Nginx/unicorn: tweak reverse-proxy cache settings to prevent cache stampede.
 * Nginx/unicorn: apply far-future expires cache headers only for assets that have fingerprints.
 
-## 0.13.0
+## [0.13.0][]
 
 The provisioning tasks now work for a non-root user that has password-less sudo privileges. Assuming a user named `matt` that can sudo without being prompted for a password ([instructions here](http://askubuntu.com/questions/192050/how-to-run-sudo-command-with-no-password)), simply modify `deploy.rb` with:
 
@@ -93,30 +105,55 @@ set :fiftyfive_privileged_user, "matt"
 
 Now all provisioning tasks that would normally run as root will instead run as `matt` using `sudo`.
 
-## 0.12.0
+## [0.12.0][]
 
 * capistrano-fiftyfive's abbreviated format now honors the new `SSHKIT_COLOR` environment variable. Set `SSHKIT_COLOR=1` to force ANSI color even on non-ttys (e.g. Jenkins).
 * The generated nginx config now enables reverse proxy caching by default.
 * INFO messages printed by sshkit are now printed to console under the appropriate rake task heading.
 
-## 0.11.1
+## [0.11.1][]
 
 Fixes errors caused by PostgreSQL password containing shell-unsafe characters. Passwords are now safely hashed with MD5 before being used in the `CREATE USER` command.
 
-## 0.11.0
+## [0.11.0][]
 
 * INFO log messages are now included in abbreviated output (e.g. upload/download progress).
 * Add `agree()` method to the DSL, which delegates to `HighLine.new.agree`.
 * Add `fiftyfive:postgresql:dump`/`restore` tasks.
 
-## 0.10.0
+## [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
+## [0.9.1][]
 
 Flush console output after each line is printed. This allows deployment progress to be monitored in e.g. Jenkins.
 
 ## 0.9.0
 
 Initial Rubygems release!
+
+[Unreleased]: https://github.com/mattbrictson/capistrano-mb/compare/v0.23.0...HEAD
+[0.23.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.22.2...v0.23.0
+[0.22.2]: https://github.com/mattbrictson/capistrano-mb/compare/v0.22.1...v0.22.2
+[0.22.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.22.0...v0.22.1
+[0.22.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.21.0...v0.22.0
+[0.21.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.20.1...v0.21.0
+[0.20.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.20.0...v0.20.1
+[0.20.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.19.0...v0.20.0
+[0.19.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.18.0...v0.19.0
+[0.18.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.17.2...v0.18.0
+[0.17.2]: https://github.com/mattbrictson/capistrano-mb/compare/v0.17.1...v0.17.2
+[0.17.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.17.0...v0.17.1
+[0.17.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.16.0...v0.17.0
+[0.16.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.15.2...v0.16.0
+[0.15.2]: https://github.com/mattbrictson/capistrano-mb/compare/v0.15.1...v0.15.2
+[0.15.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.15.0...v0.15.1
+[0.15.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.14.0...v0.15.0
+[0.14.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.13.0...v0.14.0
+[0.13.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.12.0...v0.13.0
+[0.12.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.11.1...v0.12.0
+[0.11.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.11.0...v0.11.1
+[0.11.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.10.0...v0.11.0
+[0.10.0]: https://github.com/mattbrictson/capistrano-mb/compare/v0.9.1...v0.10.0
+[0.9.1]: https://github.com/mattbrictson/capistrano-mb/compare/v0.9.0...v0.9.1

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 55 Minutes Inc
+Copyright (c) 2015 Matt Brictson
 
 MIT License
 

data/lib/capistrano/mb.rb

@@ -26,4 +26,5 @@ load File.expand_path("../tasks/seed.rake", __FILE__)
 load File.expand_path("../tasks/version.rake", __FILE__)
 load File.expand_path("../tasks/rake.rake", __FILE__)
 load File.expand_path("../tasks/sidekiq.rake", __FILE__)
+load File.expand_path("../tasks/bundler.rake", __FILE__)
 load File.expand_path("../tasks/fiftyfive.rake", __FILE__)

data/lib/capistrano/mb/compatibility.rb

@@ -1,17 +1,37 @@
-require 'colorize'
+module Capistrano
+  module MB
+    module Compatibility
+      def self.check
+        check_capistrano_and_rake_are_loaded
+        check_blacklisted_capistrano_version
+      end
 
-unless defined?(Capistrano) && defined?(:namespace)
-  $stderr.puts\
-    "WARNING: capistrano/mb must be loaded by Capistrano in order "\
-    "to work.\nRequire this gem by using Capistrano's Capfile, "\
-    "as described here:\n"\
-    "https://github.com/mattbrictson/capistrano-mb#installation"\
-    .colorize(:red)
-end
+      def self.check_capistrano_and_rake_are_loaded
+        return if defined?(Capistrano::VERSION) && defined?(Rake)
+
+        warn "capistrano/mb must be loaded by Capistrano in order "\
+             "to work.\nRequire this gem by using Capistrano's Capfile, "\
+             "as described here:\n"\
+             "https://github.com/mattbrictson/capistrano-mb#installation"
+      end
+
+      def self.check_blacklisted_capistrano_version
+        return unless defined?(Capistrano::VERSION)
+        return unless Capistrano::VERSION == "3.2.0"
 
-if Capistrano::VERSION == "3.2.0"
-  $stderr.puts\
-    "WARNING: Capistrano 3.2.0 has a critical bug that prevents "\
-    "capistrano-mb from working as intended:\n"\
-    "https://github.com/capistrano/capistrano/issues/1004".colorize(:red)
+        warn "Capistrano 3.2.0 has a critical bug that prevents "\
+             "capistrano-mb from working as intended:\n"\
+             "https://github.com/capistrano/capistrano/issues/1004"
+      end
+
+      # We can't really rely on anything being loaded at this point, so define
+      # our own basic colorizing helper.
+      def self.warn(message)
+        return $stderr.puts("WARNING: #{message}") unless $stderr.tty?
+        $stderr.puts("\e[0;31;49mWARNING: #{message}\e[0m")
+      end
+    end
+  end
 end
+
+Capistrano::MB::Compatibility.check

data/lib/capistrano/mb/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module MB
-    VERSION = "0.22.2"
+    VERSION = "0.23.0"
   end
 end

data/lib/capistrano/tasks/bundler.rake

@@ -0,0 +1,31 @@
+mb_recipe :bundler do
+  prior_to "bundler:install", "gem_install"
+end
+
+namespace :mb do
+  namespace :bundler do
+    desc "Install correct version of bundler based on Gemfile.lock"
+    task :gem_install do
+      install_command = fetch(:mb_bundler_gem_install_command, nil)
+      next unless install_command
+
+      on fetch(:bundle_servers) do
+        within release_path do
+          if (bundled_with = capture_bundled_with)
+            execute "#{install_command} -v #{bundled_with}"
+          end
+        end
+      end
+    end
+
+    def capture_bundled_with
+      lockfile = fetch(:mb_bundler_lockfile, "Gemfile.lock")
+      return unless test "[ -f #{release_path.join(lockfile)} ]"
+
+      ruby_expr = 'puts $<.read[/BUNDLED WITH\n   (\S+)$/, 1]'
+      version = capture :ruby, "-e", ruby_expr.shellescape, lockfile
+      version.strip!
+      version.empty? ? nil : version
+    end
+  end
+end

data/lib/capistrano/tasks/defaults.rake

@@ -3,6 +3,7 @@ namespace :load do
 
     set :mb_recipes, %w(
       aptitude
+      bundler
       crontab
       dotenv
       logrotate
@@ -31,6 +32,10 @@ namespace :load do
         "postgresql@ppa:pitti/postgresql"        => :db,
         "ufw"                                    => :all
 
+    set :mb_bundler_lockfile, "Gemfile.lock"
+    set :mb_bundler_gem_install_command,
+        "gem install bundler --conservative --no-document"
+
     set :mb_delayed_job_args, "-n 2"
     set :mb_delayed_job_script, "bin/delayed_job"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-mb
 version: !ruby/object:Gem::Version
-  version: 0.22.2
+  version: 0.23.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -117,6 +117,7 @@ files:
 - lib/capistrano/mb/templates/version.rb.erb
 - lib/capistrano/mb/version.rb
 - lib/capistrano/tasks/aptitude.rake
+- lib/capistrano/tasks/bundler.rake
 - lib/capistrano/tasks/crontab.rake
 - lib/capistrano/tasks/defaults.rake
 - lib/capistrano/tasks/delayed_job.rake