capserverext 0.0.4 → 0.0.5

data/History.txt

@@ -1,3 +1,7 @@
+== 0.0.5 / 2007-05-07
+
+* Fixes by Jon Egil Strand
+
 == 0.0.4 / 2007-04-18
 
 * Fixing mysql db creation method call. Just use base deprec task

data/lib/cap_server_ext.rb

@@ -1,3 +1,3 @@
 class CapistranoServerExtentions
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/capserverext/recipes.rb

@@ -42,7 +42,7 @@ Capistrano.configuration(:must_exist).load do
   }
 
   #set the nginx_postgres combination by default
-  set :deprec_combination, (defined?(deprec_combination) ? deprec_combination : deprec_combinations[:nginx_postgres])
+  set :deprec_combination, (defined?(deprec_combination) ? deprec_combination : :nginx_postgres)
 
   #set the new non standard port through which ssh communication will happen
   set :ssh_security_port, (defined?(ssh_security_port) ? ssh_security_port : 8888)
@@ -59,14 +59,13 @@ Capistrano.configuration(:must_exist).load do
       * Add following entries to deploy.rb:
 
           require 'capserverext/recipes'
-          require 'capistrano/ext/monitor'
 
       * Edit deploy.rb appropriately:
 
         * set deprec_combination to either (:nginx_postgres, :nginx_mysql, :apache_mysql, :apache_postgres)
           for a combination other than the default: ':nginx_postgres'
             e.g
-            set :deprec_combination, deprec_combinations[:nginx_mysql]
+            set :deprec_combination, :nginx_mysql
         * set ssh_security_port for an ssh port other than the default: '8888'
         * set mongrel options (best to accept the defaults)
         * set repository
@@ -89,7 +88,7 @@ Capistrano.configuration(:must_exist).load do
     #prepare
     setup_ssh_keys_for_admin_user
 
-    deprec_combination.each do |task|
+    deprec_combinations[deprec_combination].each do |task|
       send(task.intern)
     end
   end

data/lib/nginx/recipes.rb

@@ -5,7 +5,7 @@ Capistrano.configuration(:must_exist).load do
   desc <<-DESC
   prints usage
   DESC
-  task :postgres_usage do
+  task :nginx_usage do
     puts <<-EOS
      Apart from any other installations to get nginx setup on your server
      call the following tasks in order:

data/lib/nginx/recipes/nginx.rb

@@ -149,14 +149,16 @@ Capistrano.configuration(:must_exist).load do
   #http://www.nginx.net/CHANGES
   def find_current_nginx_version
     version = nil
-    open('http://www.nginx.net/CHANGES') do |f|
-      version = f.readline.match(/^Changes\swith\snginx\s([\d\.]+)\s/)[1] rescue nil
-    end
-    version ||= '0.5.14'
-    set :current_nginx_version, version
+    begin
+      open('http://www.nginx.net/CHANGES') do |f|
+        until version do
+          version = f.readline.match(/Changes with nginx [\d\.]+/).to_s.split[3]
+        end
+      end
     rescue
       version = '0.5.14'
-      set :current_nginx_version, version
+    end
+    set :current_nginx_version, version
   end
 
 end

data/lib/postgres/recipes.rb

@@ -5,13 +5,17 @@ Capistrano.configuration(:must_exist).load do
   desc <<-DESC
   prints usage
   DESC
-  task :nginx_usage do
+  task :postgres_usage do
     puts <<-EOS
-     Apart from any other installations to get nginx setup on your server
-     call the following tasks in order:
-     * cap install_nginx
-     * cap setup
-     * cap configure_nginx
+     Run the following task to get the latest version
+     of postgres installed on your server:
+     * cap setup_postgres
+
+     You can also execute arbitrary sql against the postgres server
+     via the following task:
+     * execute_postgres
+
+     Note: Set the 'sql' variable for the sql to be executed.
     EOS
   end
 

data/lib/postgres/recipes/postgres.rb

@@ -5,7 +5,7 @@ require 'capistrano/cli'
 module PostgreSQLMethods
 
   def execute(sql, user)
-    run_with_input "echo '#{sql}' | sudo su - #{user} psql"
+    run_with_input "echo '#{sql}' | sudo su --login #{user} --command psql"
   end
 
   def handle_postgres_password(user, channel, stream, data)
@@ -26,7 +26,7 @@ Capistrano.configuration(:must_exist).load do
   desc "Execute PostgreSQL statements using --command option. Set the 'sql' variable."
   task :execute_postgres, :roles => :db, :only => { :primary => true } do
     set_postgres_admin
-    postgresql.execute sql, mysql_admin
+    postgresql.execute sql, postgres_admin
   end
 
   desc "Create PostgreSQL database and user based on config/database.yml"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.2
 specification_version: 1
 name: capserverext
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-04-18 00:00:00 +02:00
+  version: 0.0.5
+date: 2007-05-07 00:00:00 +02:00
 summary: Easily setup postgresql & nginx (http://sysoev.ru/nginx/) on ubuntu hosts.
 require_paths: 
 - lib