capper 0.9.21 → 0.9.22

data/lib/capper/base.rb

@@ -437,13 +437,9 @@ namespace :deploy do
         RewriteRule ^.*$  -  [redirect=503,last]
       EOHTACCESS
 
-      reason = ENV['REASON']
-      deadline = ENV['UNTIL']
-
       upload_template_file("maintenance.html",
                            "#{shared_path}/system/#{maintenance_basename}.html",
-                           :mode => 0644,
-                           :binding => binding)
+                           :mode => 0644)
     end
 
     desc <<-DESC

data/lib/capper/monit.rb

@@ -10,8 +10,8 @@ namespace :monit do
     servers = find_servers
 
     upload_template(monitrc, :mode => "0644") do |server|
-      configs.keys.select do |name|
-        roles = configs[name][:options][:roles]
+      configs.select do |name, config|
+        roles = config[:options][:roles]
         if roles.nil?
           true
         else
@@ -19,8 +19,8 @@ namespace :monit do
             self.roles[r.to_sym].include?(server)
           end.any?
         end
-      end.map do |name|
-        "# #{name}\n#{configs[name][:body]}"
+      end.map do |name, config|
+        "# #{name}\n#{config[:body]}"
       end.join("\n\n")
     end
   end

data/lib/capper/templates/maintenance.html.erb

@@ -38,11 +38,11 @@
      <div class="DialogBody" style="text-align: center;">
        <div style="text-align: center; width: 200px; margin: 0 auto;">
          <p style="color: red; font-size: 16px; line-height: 20px;">
-           The system is down for <%= reason ? reason : "maintenance" %>
+           The system is down for <%= ENV['REASON'] ? ENV['REASON'] : "maintenance" %>
            as of <%= Time.now.strftime("%H:%M %Z") %>.
          </p>
          <p style="color: #666;">
-           It'll be back <%= deadline ? deadline : "shortly" %>.
+           It'll be back <%= ENV['UNTIL'] ? ENV['UNTIL'] : "shortly" %>.
          </p>
        </div>
      </div>

data/lib/capper/utils/templates.rb

@@ -25,8 +25,6 @@ module Capper
       end
 
       def upload_template(path, options={})
-        bnd = options.delete(:binding) || binding
-
         if task = current_task
           servers = find_servers_for_task(task, options)
         else
@@ -39,7 +37,7 @@ module Capper
 
         servers.each do |server|
           erb = Erubis::Eruby.new(yield server)
-          result = erb.result(bnd)
+          result = erb.result(binding)
           put(result, path, options.merge!(:hosts => server))
         end
       end

data/lib/capper/version.rb

@@ -1,3 +1,3 @@
 module Capper
-  VERSION = "0.9.21"
+  VERSION = "0.9.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capper
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &11957720 !ruby/object:Gem::Requirement
+  requirement: &3929400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11957720
+  version_requirements: *3929400
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &11954580 !ruby/object:Gem::Requirement
+  requirement: &3926180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *11954580
+  version_requirements: *3926180
 - !ruby/object:Gem::Dependency
   name: capistrano_colors
-  requirement: &11951460 !ruby/object:Gem::Requirement
+  requirement: &3922980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.5.5
   type: :runtime
   prerelease: false
-  version_requirements: *11951460
+  version_requirements: *3922980
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
-  requirement: &11966340 !ruby/object:Gem::Requirement
+  requirement: &3938120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *11966340
+  version_requirements: *3938120
 description: Capper is a collection of opinionated Capistrano recipes
 email:
 - bb@xnull.de