rails_pwnerer 0.6.24 → 0.6.25

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.6.25. Fixed impedance in frontends computations in the nginx and thin managers.
+
 v0.6.24. Implemented support for checking out from git.
 
 v0.6.23. Implemented frontends_per_core option as an alternative to frontends.

data/Manifest

@@ -24,6 +24,7 @@ lib/pwnage/base/rails.rb
 lib/pwnage/base/startup.rb
 lib/pwnage/base.rb
 lib/pwnage/config/app.rb
+lib/pwnage/config/frontends.rb
 lib/pwnage/config/main.rb
 lib/pwnage/config/paths.rb
 lib/pwnage/config/ports.rb

data/lib/pwnage/app/cluster_config.rb

@@ -23,22 +23,10 @@ class RailsPwnage::App::ClusterConfig
       end
     end
   end
-  
-  # computes the number of frontends to bring up / down
-  def num_frontends(app_name, instance_name)    
-    app_config = RailsPwnage::Config[app_name, instance_name]
-    return nil unless app_config and fixed_frontends = app_config[:frontends]
-
-    if app_config[:frontends_per_core]
-      cores_frontends = app_config[:frontends_per_core] * app_config[:detected_cores]
-      return cores_frontends unless cores_frontends == 0
-    end
-    return fixed_frontends
-  end
-  
+    
   def manage_ports(app_name, instance_name, action)
     app_config = RailsPwnage::Config[app_name, instance_name]
-    return unless frontends = num_frontends(app_name, instance_name)
+    return unless frontends = RailsPwnage::Config.app_frontends(app_name, instance_name)
     
     case action
     when :alloc
@@ -56,8 +44,8 @@ class RailsPwnage::App::ClusterConfig
     # silently die if the app was completely busted
     return unless app_config and File.exists? app_config[:app_path]
         
-    app_path = app_config[:app_path]
-    frontends, first_port = num_frontends(app_name, instance_name), app_config[:port0]
+    app_path, first_port = app_config[:app_path], app_config[:port0]
+    frontends = RailsPwnage::Config.app_frontends(app_name, instance_name)
 
     cmdline_patterns = ['thin', nil]
     
@@ -81,8 +69,8 @@ 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 = num_frontends(app_name, instance_name), app_config[:port0]
-    environment = app_config[:environment]
+    frontends = RailsPwnage::Config.app_frontends(app_name, instance_name)
+    first_port, environment = app_config[:port0], app_config[:environment]
 
     stop app_name, instance_name
     

data/lib/pwnage/app/git.rb

@@ -13,6 +13,7 @@ class RailsPwnage::App::Git
   
   # clean up the application directory by removing caches 
   def cleanup_app_caches(app_name, instance_name, app_name_is_dir = false)
+    # TODO: this is almost-duplicated in git.rb -- pull up somewhere    
     app_path = app_name_is_dir ? app_name : RailsPwnage::Config[app_name, instance_name][:app_path]
     return unless File.exists?(File.join(app_path, '.git'))
     

data/lib/pwnage/app/nginx_config.rb

@@ -2,7 +2,7 @@
 
 class RailsPwnage::App::NginxConfig
   include RailsPwnage::Base
-  
+    
   # writes the nginx configuration for this server
   def config_nginx(app_name, instance_name)
     app_config = RailsPwnage::Config[app_name, instance_name]
@@ -10,11 +10,12 @@ class RailsPwnage::App::NginxConfig
     dns_name = app_config[:dns_name]
     app_port = app_config[:port] || 80
     
-    nginx_config = File.join(RailsPwnage::Config.path_to(:nginx_configs), app_name + '.' + instance_name) 
+    nginx_config = File.join(RailsPwnage::Config.path_to(:nginx_configs),
+                             app_name + '.' + instance_name) 
     File.open(nginx_config, 'w') do |f|
       # link to the frontends
       f << "  upstream #{app_name}_#{instance_name} {\n"
-      app_config[:frontends].times do |instance|
+      RailsPwnage::Config.app_frontends(app_name, instance_name).times do |instance|
         f << "    server 127.0.0.1:#{first_port + instance};\n"
       end
       f << "  }\n\n"

data/lib/pwnage/app/svn.rb

@@ -26,6 +26,7 @@ class RailsPwnage::App::Svn
   
   # clean up the application directory by removing caches 
   def cleanup_app_caches(app_name, instance_name, app_name_is_dir = false)
+    # TODO: this is almost-duplicated in git.rb -- pull up somewhere
     app_path = app_name_is_dir ? app_name : RailsPwnage::Config[app_name, instance_name][:app_path]
     return unless File.exists?(File.join(app_path, '.svn'))
     

data/lib/pwnage/config/frontends.rb

@@ -0,0 +1,15 @@
+# computes the number of frontends to be used in an application
+
+module RailsPwnage::Config
+  # the number of frontends for an application
+  def self.app_frontends(app_name, instance_name)
+    # TODO: this is duplicated in cluster_config.rb -- pull up somewhere
+    app_config = self[app_name, instance_name]
+    return nil unless app_config and fixed_frontends = app_config[:frontends]
+
+    frontends_per_core = app_config[:frontends_per_core] || 0
+    detected_cores = app_config[:detected_cores] || 0
+    cores_frontends = frontends_per_core * detected_cores  
+    return (cores_frontends != 0) ? cores_frontends : fixed_frontends
+  end
+end

data/lib/pwnage/scaffolds/packages.rb

@@ -28,6 +28,9 @@ class RailsPwnage::Scaffolds::Packages
     # needed by rmagick which does image processing
     install_packages %w(libmagick9-dev), :source => true
     
+    # needed by xml parsers
+    install_packages %w(libxml2-dev libxslt1-dev)
+    
     # needed by sqlite-3 ruby gem in tools
     install_packages %w(libsqlite3-0 libsqlite3-dev sqlite3), :source => true
     

data/lib/rails_pwnerer.rb

@@ -26,6 +26,7 @@ require 'pwnage/util/main.rb'
 require 'pwnage/util/kill_process_set.rb'
 
 require 'pwnage/config/app.rb'
+require 'pwnage/config/frontends.rb'
 require 'pwnage/config/main.rb'
 require 'pwnage/config/paths.rb'
 require 'pwnage/config/ports.rb'

data/rails_pwnerer.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rails_pwnerer}
-  s.version = "0.6.24"
+  s.version = "0.6.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Victor Costan"]
-  s.date = %q{2008-12-31}
+  s.date = %q{2009-01-02}
   s.default_executable = %q{bin/rpwn}
   s.description = %q{Rails deployment tool/hack.}
   s.email = %q{victor@costan.us}
   s.executables = ["rpwn", "rpwnctl", "rpwndev"]
   s.extensions = ["ext/rpwn_setup_notice/extconf.rb"]
-  s.extra_rdoc_files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "lib/pwnage/app/database.rb", "lib/pwnage/app/files.rb", "lib/pwnage/app/gems.rb", "lib/pwnage/app/git.rb", "lib/pwnage/app/main.rb", "lib/pwnage/app/nginx_config.rb", "lib/pwnage/app/scripts.rb", "lib/pwnage/app/svn.rb", "lib/pwnage/base/atomics.rb", "lib/pwnage/base/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "lib/pwnage/scaffolds/mysql_config.rb", "lib/pwnage/scaffolds/packages.rb", "lib/pwnage/scaffolds/rubygems.rb", "lib/pwnage/scaffolds/sshd.rb", "lib/pwnage/util/kill_process_set.rb", "lib/pwnage/util/main.rb", "lib/rails_pwnerer.rb", "LICENSE", "README"]
-  s.files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "lib/pwnage/app/database.rb", "lib/pwnage/app/files.rb", "lib/pwnage/app/gems.rb", "lib/pwnage/app/git.rb", "lib/pwnage/app/main.rb", "lib/pwnage/app/nginx_config.rb", "lib/pwnage/app/scripts.rb", "lib/pwnage/app/svn.rb", "lib/pwnage/base/atomics.rb", "lib/pwnage/base/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "lib/pwnage/scaffolds/mysql_config.rb", "lib/pwnage/scaffolds/packages.rb", "lib/pwnage/scaffolds/rubygems.rb", "lib/pwnage/scaffolds/sshd.rb", "lib/pwnage/util/kill_process_set.rb", "lib/pwnage/util/main.rb", "lib/rails_pwnerer.rb", "LICENSE", "Manifest", "Rakefile", "README", "RUBYFORGE", "rails_pwnerer.gemspec"]
+  s.extra_rdoc_files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "lib/pwnage/app/database.rb", "lib/pwnage/app/files.rb", "lib/pwnage/app/gems.rb", "lib/pwnage/app/git.rb", "lib/pwnage/app/main.rb", "lib/pwnage/app/nginx_config.rb", "lib/pwnage/app/scripts.rb", "lib/pwnage/app/svn.rb", "lib/pwnage/base/atomics.rb", "lib/pwnage/base/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/frontends.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "lib/pwnage/scaffolds/mysql_config.rb", "lib/pwnage/scaffolds/packages.rb", "lib/pwnage/scaffolds/rubygems.rb", "lib/pwnage/scaffolds/sshd.rb", "lib/pwnage/util/kill_process_set.rb", "lib/pwnage/util/main.rb", "lib/rails_pwnerer.rb", "LICENSE", "README"]
+  s.files = ["bin/rpwn", "bin/rpwnctl", "bin/rpwndev", "CHANGELOG", "ext/rpwn_setup_notice/extconf.rb", "lib/pwnage/app/cluster_config.rb", "lib/pwnage/app/config.rb", "lib/pwnage/app/database.rb", "lib/pwnage/app/files.rb", "lib/pwnage/app/gems.rb", "lib/pwnage/app/git.rb", "lib/pwnage/app/main.rb", "lib/pwnage/app/nginx_config.rb", "lib/pwnage/app/scripts.rb", "lib/pwnage/app/svn.rb", "lib/pwnage/base/atomics.rb", "lib/pwnage/base/cpus.rb", "lib/pwnage/base/dirs.rb", "lib/pwnage/base/gems.rb", "lib/pwnage/base/hostname.rb", "lib/pwnage/base/packages.rb", "lib/pwnage/base/process.rb", "lib/pwnage/base/rails.rb", "lib/pwnage/base/startup.rb", "lib/pwnage/base.rb", "lib/pwnage/config/app.rb", "lib/pwnage/config/frontends.rb", "lib/pwnage/config/main.rb", "lib/pwnage/config/paths.rb", "lib/pwnage/config/ports.rb", "lib/pwnage/config/repository.rb", "lib/pwnage/ctl_executor.rb", "lib/pwnage/dev_executor.rb", "lib/pwnage/executor.rb", "lib/pwnage/scaffolds/config.rb", "lib/pwnage/scaffolds/dir_permissions.rb", "lib/pwnage/scaffolds/dirs.rb", "lib/pwnage/scaffolds/gems.rb", "lib/pwnage/scaffolds/hook_daemon.rb", "lib/pwnage/scaffolds/hook_dyndns.rb", "lib/pwnage/scaffolds/mysql_config.rb", "lib/pwnage/scaffolds/packages.rb", "lib/pwnage/scaffolds/rubygems.rb", "lib/pwnage/scaffolds/sshd.rb", "lib/pwnage/util/kill_process_set.rb", "lib/pwnage/util/main.rb", "lib/rails_pwnerer.rb", "LICENSE", "Manifest", "Rakefile", "README", "RUBYFORGE", "rails_pwnerer.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://www.costan.us/rails_pwnage}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rails_pwnerer", "--main", "README"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails_pwnerer
 version: !ruby/object:Gem::Version 
-  version: 0.6.24
+  version: 0.6.25
 platform: ruby
 authors: 
 - Victor Costan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-31 00:00:00 -05:00
+date: 2009-01-02 00:00:00 -05:00
 default_executable: bin/rpwn
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -57,6 +57,7 @@ extra_rdoc_files:
 - lib/pwnage/base/startup.rb
 - lib/pwnage/base.rb
 - lib/pwnage/config/app.rb
+- lib/pwnage/config/frontends.rb
 - lib/pwnage/config/main.rb
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb
@@ -106,6 +107,7 @@ files:
 - lib/pwnage/base/startup.rb
 - lib/pwnage/base.rb
 - lib/pwnage/config/app.rb
+- lib/pwnage/config/frontends.rb
 - lib/pwnage/config/main.rb
 - lib/pwnage/config/paths.rb
 - lib/pwnage/config/ports.rb