railsmachine 1.0.3 → 1.0.4

data/Rakefile

@@ -15,7 +15,7 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="1.0.3"
+version="1.0.4"
 name="railsmachine"
 
 setup_gem(name, version) do |spec|

data/lib/railsmachine/recipes.rb

@@ -3,14 +3,44 @@ Capistrano::Configuration.instance(:must_exist).load do
   default_run_options[:pty] = true
   set :keep_releases, 3
   set :app_symlinks, nil
-  set :scm, :subversion
+  set :scm, :subversion 
   set :httpd, :apache
-  set :app_server, :mongrel
+  set :app_server, :mongrel 
   set :db_adapter, :mysql
   set :rails_env, "production"
-
-  load    'config/deploy'
   
+  # mongrel defaults
+  set :mongrel_servers, 2
+  set :mongrel_port, 8000
+  set :mongrel_address, "127.0.0.1"
+  set :mongrel_environment, "production"
+  set :mongrel_conf, nil
+  set :mongrel_user, nil
+  set :mongrel_group, nil
+  set :mongrel_prefix, nil
+  set :mongrel_rails, 'mongrel_rails'
+  set :mongrel_clean, false
+  set :mongrel_pid_file, nil
+  set :mongrel_log_file, nil
+  set :mongrel_config_script, nil
+  
+  # passenger defaults
+  set :use_mod_rewrite, false
+  
+  # apache defaults
+  set :apache_server_name, nil            
+  set :apache_conf, nil
+  set :apache_default_vhost, false
+  set :apache_default_vhost_conf, nil
+  set :apache_ctl, "/etc/init.d/httpd"
+  set :apache_server_aliases, []
+  set :apache_proxy_port, 8000
+  set :apache_proxy_servers, 2
+  set :apache_proxy_address, "127.0.0.1"
+  set :apache_ssl_enabled, false
+  set :apache_ssl_ip, nil
+  set :apache_ssl_forward_all, false
+ 
   set :repository do
     scm = fetch(:scm)
     repos_base = "#{user}@#{domain}#{deploy_to}"
@@ -20,7 +50,6 @@ Capistrano::Configuration.instance(:must_exist).load do
       "ssh://#{repos_base}/repos/#{application}.git"
     end
   end
-
   
   task :validate_required_variables do
     validate_option(:scm, :in => [:subversion, :git])
@@ -73,7 +102,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   namespace :app do
   
     desc <<-DESC
-    Setup #{app_server}
+    Setup application server.
     DESC
     task :setup, :roles => :app  do
       case app_server.to_s
@@ -188,6 +217,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     task :setup, :roles => :scm  do
     begin
       sudo  "chown -R #{user}:#{user} #{deploy_to.gsub(application,'')}"
+      dump_settings
       localrepo.setup
     rescue
       puts "repos:setup failed!"

data/lib/railsmachine/recipes/app/deploy.rb

@@ -1,23 +1,22 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  load    'config/deploy'
   namespace :deploy do
   
     desc <<-DESC
-    #{app_server.to_s == 'mongrel' ? "Start the mongrel processes on the app server." : "This task no effect when using Passenger as your application server."}
+    Start the application server processes.
     DESC
     task :start, :roles => :app do
       application_servlet.start
     end
 
     desc <<-DESC
-    Restart the #{app_server} processes on the app server.
+    Restart the application server processes.
     DESC
     task :restart, :roles => :app do
       application_servlet.restart
     end
 
     desc <<-DESC
-    #{app_server.to_s == 'mongrel' ? "Stop the mongrel processes on the app server." : "This task no effect when using Passenger as your application server."} 
+    Stop the application server processes. 
     DESC
     task :stop, :roles => :app do
       application_servlet.stop

data/lib/railsmachine/recipes/app/mongrel.rb

@@ -1,19 +1,4 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  set :mongrel_servers, 2
-  set :mongrel_port, 8000
-  set :mongrel_address, "127.0.0.1"
-  set :mongrel_environment, "production"
-  set :mongrel_conf, nil
-  set :mongrel_user, nil
-  set :mongrel_group, nil
-  set :mongrel_prefix, nil
-  set :mongrel_rails, 'mongrel_rails'
-  set :mongrel_clean, false
-  set :mongrel_pid_file, nil
-  set :mongrel_log_file, nil
-  set :mongrel_config_script, nil
- 
-  load    'config/deploy'
  
   namespace :mongrel do
   

data/lib/railsmachine/recipes/app/passenger.rb

@@ -1,6 +1,5 @@
 Capistrano::Configuration.instance(:must_exist).load do
-  set :use_mod_rewrite, false
-  load    'config/deploy'
+
   namespace :passenger do
 
     [:start, :stop].each do |t|

data/lib/railsmachine/recipes/web/apache.rb

@@ -1,22 +1,6 @@
 require 'erb'
 Capistrano::Configuration.instance(:must_exist).load do
   
-  
-  set :apache_server_name, nil            
-  set :apache_conf, nil
-  set :apache_default_vhost, false
-  set :apache_default_vhost_conf, nil
-  set :apache_ctl, "/etc/init.d/httpd"
-  set :apache_server_aliases, []
-  set :apache_proxy_port, 8000
-  set :apache_proxy_servers, 2
-  set :apache_proxy_address, "127.0.0.1"
-  set :apache_ssl_enabled, false
-  set :apache_ssl_ip, nil
-  set :apache_ssl_forward_all, false
-  
-  load    'config/deploy'
-  
   namespace :apache do
   
     desc "Configure Apache. This uses the :use_sudo

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: railsmachine
 version: !ruby/object:Gem::Version 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Rails Machine
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-18 00:00:00 -05:00
+date: 2008-12-30 00:00:00 -05:00
 default_executable: railsmachine
 dependencies: 
 - !ruby/object:Gem::Dependency