paratrooper 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af4cf12a15977e47b772161b7acb99494f710126
-  data.tar.gz: 01d567099249dafbbb418a3f6882265222ed1b03
+  metadata.gz: 56e1f38d2b16ea6a3a7ea3f638ca46299dbb593d
+  data.tar.gz: 52ca5fd168124dffdec952b953e56bbbeac73479
 SHA512:
-  metadata.gz: 8c3a3302dbf94762959b00613c4ae66a58978460d40ebbff6cbac49907cd6dc20c81cb5e4af0a2f3f2c4c446c4d7250b99329e90ac67f77b5e9215754a94299f
-  data.tar.gz: 8d2a914587895cd37dedaaa5e7c4bf32e76aea5658d091f227839c5685891365c41f8074dca1fda214582a461953fce09b6b579498603ad7ddb60a1548257104
+  metadata.gz: 5363c5346e761369f59b7d1dc57568dd0a18f6bc47f9125d7a4b898111e82153fd4aba5fe20005d3f6a1502ce9906d48cd99241a8bb8de51bf490a159e1251c7
+  data.tar.gz: c3ed3e7e73606aca077b6264a2313863f66dacdca8b5428c1d085072f130d25fda734f1323e420cb56f3cd3487b7b4d3124b13f539e2c15942aa394d975508ad

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.4.1
+
+- Fix Deploy#app_url for wildcard domains
+
 ## 2.4.0
 
 - Maintenance mode only runs around migrations now

data/README.md

@@ -3,6 +3,7 @@
 [![Gem Version](https://badge.fury.io/rb/paratrooper.png)](http://badge.fury.io/rb/paratrooper)
 [![Build Status](https://travis-ci.org/mattpolito/paratrooper.png?branch=master)](https://travis-ci.org/mattpolito/paratrooper)
 [![Code Climate](https://codeclimate.com/github/mattpolito/paratrooper.png)](https://codeclimate.com/github/mattpolito/paratrooper)
+[![Gitter chat](https://badges.gitter.im/mattpolito/paratrooper.png)](https://gitter.im/mattpolito/paratrooper)
 
 Simplify your [Heroku][] deploy with quick and concise deployment rake tasks.
 
@@ -131,12 +132,10 @@ You can use the object's methods any way you'd like, but we've provided a sensib
 
 This will perform the following tasks:
 
-* Activate maintenance mode
 * Create or update a git tag (if provided)
 * Push changes to Heroku
 * Run database migrations if any have been added to db/migrate
 * Restart the application
-* Deactivate maintenance mode
 * Warm application instance
 
 ### Example Usage
@@ -213,7 +212,7 @@ namespace :deploy do
 end
 ```
 
-Or maybe you just want to run a rake task on your application
+Or maybe you just want to run a rake task on your application. Since this task may take a moment to complete it's probably a good idea to throw up a maintenance page.
 
 ```ruby
 # lib/tasks/deploy.rake
@@ -222,6 +221,7 @@ namespace :deploy do
   desc 'Deploy app in production environment'
   task :production do
     deployment = Paratrooper::Deploy.new("amazing-production-app") do |deploy|
+      deploy.maintenance = true
       deploy.add_callback(:after_teardown) do |output|
         output.display("Running some task that needs to run")
         deploy.add_remote_task("rake some:task:to:run")

data/lib/paratrooper/deploy.rb

@@ -14,7 +14,7 @@ module Paratrooper
 
     attr_accessor :app_name, :notifiers, :system_caller, :heroku, :tag_name,
       :match_tag_name, :protocol, :deployment_host, :migration_check, :debug,
-      :screen_notifier, :branch_name, :http_client
+      :screen_notifier, :branch_name, :http_client, :maintenance
 
     alias_method :tag=, :tag_name=
     alias_method :match_tag=, :match_tag_name=
@@ -46,6 +46,9 @@ module Paratrooper
     #                               (optional, default: 'heroku.com').
     #            :migration_check - Object responsible for checking pending
     #                               migrations (optional).
+    #            :maintenance     - If true, show maintenance page when pending
+    #                               migrations exists. False by default (optional).
+    #                               migrations (optional).
     #            :api_key         - String version of heroku api key.
     #                               (default: looks in local Netrc file).
     #            :http_client     - Object responsible for making http calls
@@ -65,6 +68,7 @@ module Paratrooper
       @debug           = options[:debug] || false
       @migration_check = options[:migration_check] || PendingMigrationCheck.new(match_tag_name, heroku, system_caller)
       @http_client     = options[:http_client] || HttpClientWrapper.new
+      @maintenance     = options[:maintenance] || false
 
       block.call(self) if block_given?
     end
@@ -89,7 +93,7 @@ module Paratrooper
     # Public: Activates Heroku maintenance mode.
     #
     def activate_maintenance_mode
-      return unless pending_migrations?
+      return unless maintenance && pending_migrations?
       callback(:activate_maintenance_mode) do
         notify(:activate_maintenance_mode)
         heroku.app_maintenance_on
@@ -205,7 +209,7 @@ module Paratrooper
 
     private
     def app_url
-      heroku.app_url
+      heroku.app_url.sub(/\A\*\./, 'www.')
     end
 
     def callback(name, &block)

data/lib/paratrooper/version.rb

@@ -1,3 +1,3 @@
 module Paratrooper
-  VERSION = "2.4.0".freeze
+  VERSION = "2.4.1".freeze
 end

data/script/bootstrap

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+bundle install --quiet "$@"

data/script/test

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo "===> Bundling..."
+script/bootstrap --quiet
+
+echo "===> Running specs..."
+bundle exec rspec

data/spec/paratrooper/deploy_spec.rb

@@ -127,8 +127,8 @@ describe Paratrooper::Deploy do
   end
 
   describe "#activate_maintenance_mode" do
-    context "when maintenance_mode option is 'true'" do
-      let(:options) { { maintenance_mode: true } }
+    context "when maintenance option is 'true'" do
+      let(:options) { { maintenance: true } }
 
       context "with pending migrations" do
         before do
@@ -162,6 +162,42 @@ describe Paratrooper::Deploy do
         end
       end
     end
+
+    context "when maintenance option is false" do
+      let(:options) { { maintenance: false } }
+
+      before do
+        migration_check.stub(:migrations_waiting?).and_return(true)
+      end
+
+      it 'does not send notification' do
+        deployer.should_not_receive(:notify).with(:activate_maintenance_mode)
+        deployer.activate_maintenance_mode
+      end
+
+      it "does not make a call to heroku to turn on maintenance mode" do
+        heroku.should_not_receive(:app_maintenance_on)
+        deployer.activate_maintenance_mode
+      end
+    end
+
+    context "when maintenance option is left as default" do
+      let(:options) { { } }
+
+      before do
+        migration_check.stub(:migrations_waiting?).and_return(true)
+      end
+
+      it 'does not send notification' do
+        deployer.should_not_receive(:notify).with(:activate_maintenance_mode)
+        deployer.activate_maintenance_mode
+      end
+
+      it "does not make a call to heroku to turn on maintenance mode" do
+        heroku.should_not_receive(:app_maintenance_on)
+        deployer.activate_maintenance_mode
+      end
+    end
   end
 
   describe "#deactivate_maintenance_mode" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paratrooper
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Matt Polito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,6 +138,8 @@ files:
 - lib/paratrooper/system_caller.rb
 - lib/paratrooper/version.rb
 - paratrooper.gemspec
+- script/bootstrap
+- script/test
 - spec/fixtures/netrc
 - spec/paratrooper/deploy_spec.rb
 - spec/paratrooper/heroku_wrapper_spec.rb