railsmachine 0.1.1 → 0.1.2

data/README

@@ -1,6 +1,3 @@
 == Railsmachine
 
-Doc coming soon.
-
-
-
+Coming soon.

data/Rakefile

@@ -15,14 +15,14 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="0.1.1"
+version="0.1.2"
 name="railsmachine"
 
 setup_gem(name, version) do |spec|
   spec.summary = "The Rails Machine task library"
   spec.description = spec.summary
   spec.author="Bradley Taylor"
-  spec.add_dependency('capistrano', '>= 1.1.0')
+  spec.add_dependency('capistrano', '>= 1.2.0')
   spec.add_dependency('mongrel_cluster', '>= 0.2.0')
   spec.has_rdoc = false
   spec.files += Dir.glob("bin/*")

data/lib/railsmachine/generators/railsmachine/templates/deploy.rb

@@ -12,16 +12,27 @@ require 'railsmachine/recipes'
 # correspond to. The deploy_to path must be the path on each machine that will
 # form the root of the application path.
 
+# The name of your application. Used for directory and file names associated with
+# the application.
 set :application, "<%= singular_name %>"
+
+# Target directory for the application on the web and app servers.
 set :deploy_to, "/var/www/apps/#{application}"
+
+# Primary domain name of your application. Used as a default for all server roles.
 set :domain, "<%= domain_name %>"
 
+# Login user for ssh.
 set :user, "deploy"
+
+# URL of your source repository.
 set :repository, "svn+ssh://#{user}@#{domain}#{deploy_to}/repos/trunk"
+
+# Rails environment. Used by application setup tasks and migrate tasks.
 set :rails_env, "production"
 
 # Automatically symlink these directories from curent/public to shared/public.
-# set :app_symlinks, %w{photo, document, asset}
+# set :app_symlinks, %w{photo document asset}
 
 # =============================================================================
 # ROLES
@@ -32,6 +43,7 @@ set :rails_env, "production"
 # be used to single out a specific subset of boxes in a particular role, like
 # :primary => true.
 
+# Modify these values to execute tasks on a different server.
 role :web, domain
 role :app, domain
 role :db,  domain, :primary => true
@@ -60,7 +72,7 @@ role :scm, domain
 # set :mongrel_port, apache_proxy_port
 # set :mongrel_address, apache_proxy_address
 # set :mongrel_environment, "production"
-# set :mongrel_config, "/etc/mongrel_cluster/#{application}.conf"
+# set :mongrel_conf, "/etc/mongrel_cluster/#{application}.conf"
 # set :mongrel_user, user
 # set :mongrel_group, group
 

data/lib/railsmachine/recipes.rb

@@ -6,37 +6,58 @@ require 'railsmachine/recipes/mongrel'
 Capistrano.configuration(:must_exist).load do
   set :app_symlinks, nil
   
-  desc "Setup servers."
+  desc <<-DESC
+  A macro task that calls setup, setup_db, setup_app, setup_symlinks, and setup_web.
+  Used to configure your deployment environment in one command.
+  DESC
   task :setup_servers  do
+    setup
+  begin
     setup_db
+  rescue
+    puts "setup_db failed!"
+  end
     setup_app
     setup_symlinks
     setup_web
   end
   
-  desc "Setup application server."
+  desc <<-DESC
+  A macro task that calls setup_db, setup_app, setup_symlinks, and setup_web.
+  Used to configure your deployment environment in one command.
+  DESC
   task :setup_app, :roles => :app  do
     set :mongrel_environment, rails_env
     set :mongrel_port, apache_proxy_port
     set :mongrel_servers, apache_proxy_servers
+    set :mongrel_user, user unless mongrel_user
+    set :mongrel_group, mongrel_user unless mongrel_group
+    set_mongrel_conf
     configure_mongrel_cluster
   end
   
   desc "Restart application server."
   task :restart_app, :roles => :app  do
+    set_mongrel_conf
     restart_mongrel_cluster
   end
   
   desc "Start application server."
   task :start_app, :roles => :app  do
+    set_mongrel_conf
     start_mongrel_cluster
   end
   
   desc "Stop application server."
   task :stop_app, :roles => :app  do
+    set_mongrel_conf
     stop_mongrel_cluster
   end
   
+  def set_mongrel_conf
+    set :mongrel_conf, "/etc/mongrel_cluster/#{application}.conf" unless mongrel_conf
+  end 
+
   desc "Setup web server."
   task :setup_web, :roles => :web  do
     set :apache_server_name, domain unless apache_server_name
@@ -70,7 +91,11 @@ Capistrano.configuration(:must_exist).load do
   
   desc "Setup source control server."
   task :setup_scm, :roles => :scm  do
+  begin  
     setup_svn
+  rescue
+    puts "setup_svn failed!"
+  end
     import_svn
   end
   

data/lib/railsmachine/recipes/apache.rb

@@ -33,7 +33,7 @@ Capistrano.configuration(:must_exist).load do
       buffer += ssl_buffer
     end
     
-    put buffer, "#{shared_path}/httpd.conf"
+    put buffer, "#{shared_path}/httpd.conf", :mode => 0444
     send(run_method, "cp #{shared_path}/httpd.conf #{apache_conf}")
     delete "#{shared_path}/httpd.conf"
   end

data/lib/railsmachine/recipes/pgsql.rb

@@ -0,0 +1,66 @@
+# Copyright 2006, Bradley Taylor, bradley@railsmachine.com
+# Licensed under the GNU Lesser General Public License.
+
+# CentOS 4.3 install for Rails Machine
+# sudo -s
+# yum install postgresql-client postgresql-server postgresql-devel
+# chkconfig postgresql on
+# service postgresql start
+# gem install postgres
+# su - postgres
+# createuser deploy -a -d 
+# exit
+
+require 'yaml'
+require 'capistrano'
+require 'capistrano/cli'
+
+module PostgreSQLMethods
+  
+  def createdb(db, user)
+    run "createdb -O #{user} #{db}"  
+  end
+  
+  def createuser(user, password)
+    cmd = "createuser -P -D -A -E #{user}"
+    run cmd do |channel, stream, data|
+      if data =~ /^Enter password for new user:/
+        channel.send_data "#{password}\n" 
+      end
+      if data =~ /^Enter it again:/
+        channel.send_data "#{password}\n" 
+      end
+    end
+  end
+  
+  def command(sql, database)
+    run "psql --command=\"#{sql}\" #{database}" 
+  end
+   
+end
+
+Capistrano.plugin :pgsql, PostgreSQLMethods
+
+Capistrano.configuration(:must_exist).load do
+  
+  desc "Create PosgreSQL database and user based on config/database.yml"
+  task :setup_pgsql, :roles => :db, :only => { :primary => true } do
+    # on_rollback {} TODO
+    read_config
+    pgsql.createuser db_user, db_password
+    pgsql.createdb db_name, db_user
+  end
+  
+  desc "Setup database"
+  task :setup_db, :roles => :db, :only => { :primary => true } do
+    setup_pgsql
+  end
+  
+  def read_config
+    db_config = YAML.load_file('config/database.yml')
+    set :db_user, db_config[rails_env]["username"]
+    set :db_password, db_config[rails_env]["password"] 
+    set :db_name, db_config[rails_env]["database"]
+  end
+  
+end

data/lib/railsmachine/recipes/svn.rb

@@ -11,7 +11,7 @@ Capistrano.configuration(:must_exist).load do
  
  desc "Import code into svn repository."
  task :import_svn  do
-   new_path = "../#{application}_machine"
+   new_path = Dir.pwd + "_machine"
    tags = repository.sub("trunk", "tags")
    branches = repository.sub("trunk", "branches")
    puts "Adding branches and tags"

data/lib/railsmachine/recipes/templates/httpd.conf

@@ -58,6 +58,3 @@
   CustomLog logs/<%= domain %>-access_log combined
 </VirtualHost>
 
-<% if apache_ssl_enabled %>
-Include "<%= apache_ssl_config %>"
-<% end %>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: railsmachine
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-06-21 00:00:00 -04:00
+  version: 0.1.2
+date: 2006-11-29 00:00:00 -05:00
 summary: The Rails Machine task library
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Bradley Taylor
 files: 
@@ -46,13 +47,13 @@ files:
 - lib/railsmachine/recipes/apache.rb
 - lib/railsmachine/recipes/mongrel.rb
 - lib/railsmachine/recipes/mysql.rb
+- lib/railsmachine/recipes/pgsql.rb
 - lib/railsmachine/recipes/svn.rb
 - lib/railsmachine/recipes/templates
 - lib/railsmachine/recipes/templates/httpd-ssl.conf
 - lib/railsmachine/recipes/templates/httpd.conf
 - tools/rakehelp.rb
 - resources/defaults.yaml
-- resources/pound.conf
 test_files: []
 
 rdoc_options: []
@@ -73,7 +74,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.0
+        version: 1.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel_cluster

data/resources/pound.conf

@@ -1,18 +0,0 @@
-User "nobody"
-Group "nobody"
-
-ListenHTTP
-  Address <%= ip_address %>
-  Port 80
- 
-  Service
-    Backend
-      Address 127.0.0.1
-      Port 8000
-    End
-    Backend
-      Address 127.0.0.1
-      Port 8001
-    End
-  End 
-End