standup 0.3.6 → 0.3.7

data/README.md

@@ -61,7 +61,7 @@ Script params are merged in `node-specific || global || script-defaults` manner.
 0. Script file `config/standup/<script_name>.rb` will be copied from gem.
 0. Script's own files, like configs etc. under `config/standup/<script_name>`, if any, will be copied from gem too. 
 0. You can edit them and standup will use them instead of default.
-0. You can delete local script's own files, then default ones will be used. 
+0. You can delete local script file or its own files, then default ones will be used. 
 
 ## Creating new scripts
 
@@ -90,8 +90,6 @@ For example, if you want to add `rescue` to your configuration, you need to:
 
 - **?** Script sequences: rework default script as script sequence
 
-- ERB processing for script files
-
 ## Copyright
 
 Copyright (c) 2010 Ilia Ablamonov, Cloud Castle Inc.

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.3.7

data/lib/standup/scripts/base.rb

@@ -34,6 +34,17 @@ module Standup
         nil
       end
       
+      def with_processed_file filename
+        Dir.mktmpdir do |dir|
+          erb = ERB.new File.read(filename)
+          erb.filename = filename
+          result = erb.result get_binding
+          tmp_filename = File.expand_path File.basename(filename), dir 
+          File.open(tmp_filename, 'w') {|f| f.write result}
+          yield tmp_filename
+        end
+      end
+      
       def self.execute
         new.run
       end
@@ -83,6 +94,10 @@ module Standup
         end
         result
       end
+      
+      def get_binding
+        binding
+      end
     end
   end
 end

data/scripts/passenger/nginx.conf

@@ -27,7 +27,8 @@ http {
     
     client_max_body_size 100m;
     
-    passenger_max_pool_size 10;
+    passenger_max_pool_size 20;
+    passenger_max_instances_per_app 15;
 
     include  servers/*.conf;
 }

data/scripts/webapp/webapp.conf

@@ -1,9 +1,11 @@
 server {
-    server_name "";
+    server_name _;
     listen 80;
     
     root /opt/webapp/public;
     
+    rails_env <%= params.rails_env %>;
+    
     passenger_enabled on;
     passenger_min_instances 3;
 }

data/scripts/webapp.rb

@@ -24,7 +24,9 @@ Standup.script :node do
 
     sudo 'chown -R nobody:nogroup /opt/webapp'
     
-    scripts.passenger.add_server_conf script_file('webapp.conf')
+    with_processed_file script_file('webapp.conf') do |file|
+      scripts.passenger.add_server_conf file
+    end
   end
   
   protected

data/standup.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{standup}
-  s.version = "0.3.6"
+  s.version = "0.3.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilia Ablamonov", "Cloud Castle Inc."]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: standup
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Ilia Ablamonov