capistrano-maintenance 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25477cc88ca901a2e817c8af7a006b16a1f33b3d
-  data.tar.gz: bbd59d8cfb1b4e27ca887ee44b3cb5bf6df3a16a
+  metadata.gz: 6715cb21f27cd1be81fc54884fc95c01ba678a42
+  data.tar.gz: 2ef524d1e52972161859d263c89bb30babd60731
 SHA512:
-  metadata.gz: 5aa9f2219c5bedad52d41a5f89809335e4da43037cc2a14113a92d1588c390dca0fab6915b8ec33b8caaa5062cc3a9e0ef980d37a2261489522235f015882111
-  data.tar.gz: 608e2fcb177320e6bf7be54a8e8307afc26fac11e6d14f48fd4328b7ef35228fe09002c75c0e66a2d89f8063375e7f34c0908914538a243b36b7d68b7ebd4116
+  metadata.gz: 0645b1a1bac92fb1be978303183b67d5040ce6e6a69bc273766cdb63bbf2407d7c17ad74f5d67dfe541b779c986ab8ca67b79a0933be48746c7f2f52a8077f1c
+  data.tar.gz: acf2b89d61e45f500c6dd709a9292583e38633d529e32e152b14d416f7743d9ec3929f5c808623ae048279282563b60bbc08e1d1c21d3bc9ad8670eba596406e

data/.travis.yml

@@ -0,0 +1,6 @@
+sudo: false
+language: ruby
+rvm:
+  - 2.3.3
+before_install: gem install bundler -v '~> 1.14' --conservative
+before_script: bundle exec danger

data/CHANGELOG.md

@@ -4,10 +4,16 @@ Reverse chronological order:
 
 ## master
 
-https://github.com/capistrano/capistrano-maintenance/compare/v1.1.0...HEAD
+https://github.com/capistrano/capistrano-maintenance/compare/v1.2.0...HEAD
 
 * Your contribution here!
 
+## `1.2.0` (2017-03-10)
+
+https://github.com/capistrano/capistrano-maintenance/compare/v1.1.0...v1.2.0
+
+* [#40](https://github.com/capistrano/maintenance/pull/40): Allow directory of maintenance page to be customized - [@tjwallace](https://github.com/tjwallace)
+
 ## `1.1.0` (2017-01-26)
 
 https://github.com/capistrano/capistrano-maintenance/compare/v1.0.0...v1.1.0

data/Dangerfile

@@ -0,0 +1 @@
+danger.import_dangerfile(github: "capistrano/danger")

data/README.md

@@ -89,7 +89,7 @@ cap maintenance:enable REASON="hardware upgrade" UNTIL="12pm Central Time"
 ```
 
 You can use a different template for the maintenance page by setting the
-`:maintenance_template_path` variable in your deploy.rb file with an absolute path. 
+`:maintenance_template_path` variable in your deploy.rb file with an absolute path.
 
 ```
 set :maintenance_template_path, File.expand_path("../../app/path/to/maintenance.erb.html", __FILE__)
@@ -125,6 +125,14 @@ The template file should either be a plaintext or an erb file. For example:
 </html>
 ```
 
+You can customize which folder the maintenance page template is rendered to by
+setting the `:maintenance_dirname` variable. By default it renders to
+`"#{shared_path}/public/system"`.
+
+```
+set :maintenance_dirname, -> { "#{current_path}/dist" }
+```
+
 By default, the maintenance page will be uploaded to all servers with the `web` role,
 but if your application has different needs, you can customize this using the
 `maintenance_roles` variable:

data/Rakefile

@@ -1 +1,4 @@
 require "bundler/gem_tasks"
+
+# Do nothing by default
+task :default

data/capistrano-maintenance.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capistrano", ">= 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "danger"
   spec.add_development_dependency "rake"
 end

data/lib/capistrano-maintenance/version.rb

@@ -1,3 +1,3 @@
 module CapistranoMaintenance
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/lib/capistrano/tasks/maintenance.rake

@@ -1,33 +1,42 @@
 namespace :maintenance do
   desc "Turn on maintenance mode"
   task :enable do
-    on fetch(:maintenance_roles, roles(:web)) do
+    on fetch(:maintenance_roles) do
       require 'erb'
 
       reason = ENV['REASON']
       deadline = ENV['UNTIL']
 
-      default_template = File.join(File.expand_path('../../templates', __FILE__), 'maintenance.html.erb')
-      template = fetch(:maintenance_template_path, default_template)
-      result = ERB.new(File.read(template)).result(binding)
+      result = ERB.new(File.read(fetch(:maintenance_template_path))).result(binding)
 
-      rendered_path = "#{shared_path}/public/system/"
-      rendered_name = "#{fetch(:maintenance_basename, 'maintenance')}.html"
+      rendered_path = fetch(:maintenance_dirname)
+      rendered_name = "#{fetch(:maintenance_basename)}.html"
 
       if test "[ ! -d #{rendered_path} ]"
         info 'Creating missing directories.'
         execute :mkdir, '-pv', rendered_path
       end
 
-      upload!(StringIO.new(result), rendered_path + rendered_name)
-      execute "chmod 644 #{rendered_path + rendered_name}"
+      rendered_fullpath = "#{rendered_path}/#{rendered_name}"
+      upload! StringIO.new(result), rendered_fullpath
+      execute "chmod 644 #{rendered_fullpath}"
     end
   end
 
   desc "Turn off maintenance mode"
   task :disable do
-    on fetch(:maintenance_roles, roles(:web)) do
-      execute "rm -f #{shared_path}/public/system/#{fetch(:maintenance_basename, 'maintenance')}.html"
+    on fetch(:maintenance_roles) do
+      execute "rm -f #{fetch(:maintenance_dirname)}/#{fetch(:maintenance_basename)}.html"
     end
   end
 end
+
+namespace :load do
+  task :defaults do
+    set_if_empty :maintenance_roles, -> { roles(:web) }
+    set_if_empty :maintenance_template_path,
+      File.join(File.expand_path('../../templates', __FILE__), 'maintenance.html.erb')
+    set_if_empty :maintenance_dirname, -> { "#{shared_path}/public/system" }
+    set_if_empty :maintenance_basename, 'maintenance'
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-maintenance
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Kir Shatrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: danger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +74,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
+- Dangerfile
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -90,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Enable and disabled tasks to show when your project is on maintenance