rails_pwnerer 0.6.3 → 0.6.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.4. Added configuration variable for the environment. Switched to a more determinstic config update model.
+
 v0.6.3. Bugfix: scaffolding "forgot" to install database gems.
 
 v0.6.2. Added port-based filterning, so there's no need for a CNAME for every app.

data/README

@@ -45,7 +45,7 @@ Workaround:
 
 a) Find the path to the gems: gem environment gemdir (e.g. /var/lib/gems/1.8/gems/)
 b) run bin/rpwn from there:
-sudo /var/lib/gems/1.8/bin/rails_pwnerer scaffold
+sudo /var/lib/gems/1.8/bin/rpwn scaffold
 
 After you scaffold, you'll get good rubygems which put rpwn in your path.
 

data/lib/pwnage/app/cluster_config.rb

@@ -70,6 +70,7 @@ class RailsPwnage::App::ClusterConfig
     app_path, pwnerer_user = app_config[:app_path], app_config[:pwnerer_user]
     pwnerer_group = group_for_username(pwnerer_user)    
     frontends, first_port = app_config[:frontends], app_config[:port0]
+    environment = app_config[:environment]
 
     stop app_name, instance_name
     
@@ -81,7 +82,7 @@ class RailsPwnage::App::ClusterConfig
     end
     
     static_cmd = "thin start -a 127.0.0.1 -A rails -c #{app_path} -d -u #{pwnerer_user}" +
-                 " -g #{pwnerer_group} -e production "
+                 " -g #{pwnerer_group} -e #{environment} "
     
     # TODO: start the servers simultaneously
     Dir.chdir app_config[:app_path] do

data/lib/pwnage/app/config.rb

@@ -4,42 +4,51 @@ require 'yaml'
 class RailsPwnage::App::Config
   include RailsPwnage::Base
 
-  # allocates room for the application and creates the application configuration database
-  def alloc(app_name, instance_name)
-    app_path = File.join(RailsPwnage::Config.path_to(:apps), app_name + '.' + instance_name)
-    FileUtils.mkpath app_path
-
-    app_db_name = RailsPwnage::Config.app_db_name(app_name, instance_name)
-    app_db = RailsPwnage::Config.create_db app_db_name
-    
-    # default settings
-    
-    app_db[:app_path] = app_path
-    app_db[:backup_path] = File.join(RailsPwnage::Config.path_to(:backups), app_name + '.' + instance_name)
+  # fills inexsitent keys with their default values
+  # setup: this effectively creates the baseline configuration db
+  # update: this adds keys that might have been added in new versions of rpwn
+  def populate_defaults(app_name, instance_name, app_db)
+    # the path to application backups
+    app_db[:backup_path] ||= File.join(RailsPwnage::Config.path_to(:backups), app_name + '.' + instance_name)
     
     # the user which will receive the "keys" to the production system 
-    app_db[:pwnerer_user] = 'victor'    
+    app_db[:pwnerer_user] ||= 'victor'    
     # the number of frontends for the application instance
-    app_db[:frontends] = 4
+    app_db[:frontends] ||= 4
     # the first internal port for the application instance
     app_db[:port0] = 0  # will be overwritten during allocation
     # the name of the database for the application instance 
-    app_db[:db_name] = app_name + '_' + instance_name + '_prod'
+    app_db[:db_name] ||= app_name + '_' + instance_name + '_prod'
     # the datbase user for the given application
-    app_db[:db_user] = (app_name + '_' + instance_name)[0...16] # mySQL doesn't like long user names
+    app_db[:db_user] ||= (app_name + '_' + instance_name)[0...16] # mySQL doesn't like long user names
     # the password of the database user for the given application
-    app_db[:db_pass] = (0...16).map { |i| "abcdefghijklmnopqrstuvwxyz"[rand(26),1]}.join
+    app_db[:db_pass] ||= (0...16).map { |i| "abcdefghijklmnopqrstuvwxyz"[rand(26),1]}.join
     # a DNS name for server-based filtering (multiple apps on the same box)
-    app_db[:dns_name] = ''
+    app_db[:dns_name] ||= ''
+    # the environment to run the application in
+    app_db[:environment] ||= 'production'
     # a port for server-based filtering (multiple apps on the same box)
-    app_db[:port] = 80
+    app_db[:port] ||= 80
     # the maximum request size (megabytes) to be accepted by an application
-    app_db[:max_request_mb] = 48
+    app_db[:max_request_mb] ||= 48
     # comma-separated directories that should be writable by the application user
-    app_db[:writable_dirs] = ''
+    app_db[:writable_dirs] ||= ''
     # comma-separated gems that should be installed for the application
-    app_db[:gems] = ''
+    app_db[:gems] ||= ''
+  end
+
+  # allocates room for the application and creates the application configuration database
+  def alloc(app_name, instance_name)
+    app_path = File.join(RailsPwnage::Config.path_to(:apps), app_name + '.' + instance_name)
+    FileUtils.mkpath app_path
+
+    app_db_name = RailsPwnage::Config.app_db_name(app_name, instance_name)
+    app_db = RailsPwnage::Config.create_db app_db_name
     
+    # default settings    
+    app_db[:app_path] = app_path    
+    populate_defaults app_name, instance_name, app_db
+        
     RailsPwnage::Config.flush_db app_db    
     return app_path
   end
@@ -47,6 +56,8 @@ class RailsPwnage::App::Config
   # pushes config changes from the application file to the database
   def update(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
+    app_config.clear
+    populate_defaults app_name, instance_name, app_db
     Dir.chdir app_config[:app_path] do
       ["config/rails_pwnerer/.yml", "config/rails_pwnerer/#{instance_name}.yml"].each do |fname|
         next unless File.exists? fname

data/rails_pwnerer.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Rails_pwnerer-0.6.3
+# Gem::Specification for Rails_pwnerer-0.6.4
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Victor Costan
 autorequire: 
 bindir: bin
 
-date: 2008-09-07 00:00:00 -04:00
+date: 2008-09-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-07 00:00:00 -04:00
+date: 2008-09-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency