deprec 1.8.0 → 1.9.0

data/docs/README.quickstart

@@ -11,7 +11,7 @@ to log into the remote server manually. Capistrano does all the work.
 # Install deprec on workstation
 sudo gem install deprec --include-dependencies
 echo 'require "deprec/recipes"'               >> ~/.caprc
-echo 'ssh_options[:keys] = %w(~/.ssh/id_dsa)' >> ~/.caprc
+echo "ssh_options[:keys] = %w(${HOME}/.ssh/id_dsa)" >> ~/.caprc
 echo 'ssh_options[:paranoid] = false'         >> ~/.caprc
 echo 'ssh_options[:forward_agent] = true'     >> ~/.caprc
 

data/lib/deprec/capistrano_extensions/cli_extensions.rb

@@ -19,12 +19,15 @@ module Capistrano
       end
     end
     
-    def self.prompt(prompt="Password: ")
+    def self.prompt(prompt="Password", default=nil)
       sync = STDOUT.sync
       begin
           STDOUT.sync = true
-          print(prompt)
-          STDIN.gets.chomp
+          print("#{prompt}")
+          print " [#{default}]" if default
+          print ': '
+          response = STDIN.gets.chomp
+          response == '' ? default : response
       ensure
         STDOUT.sync = sync
         puts

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

@@ -34,6 +34,19 @@ set :rails_env, "production"
 # Automatically symlink these directories from current/public to shared/public.
 # set :app_symlinks, %w{photo, document, asset}
 
+# =============================================================================
+# SPECIAL OPTIONS
+# =============================================================================
+# These options allow you to tweak deprec behaviour
+
+# If you do not keep database.yml in source control, set this to false.
+# After new code is deployed, deprec will symlink current/config/database.yml 
+# to shared/config/database.yml
+#
+# You can generate shared/config/database.yml with 'cap generate_database_yml'
+#
+# set :database_yml_in_scm, true
+
 # =============================================================================
 # APACHE OPTIONS
 # =============================================================================

data/lib/deprec/recipes.rb

@@ -1,6 +1,7 @@
 require 'deprec/recipes/ssh'
 require 'deprec/recipes/svn'
 require 'deprec/recipes/trac'
+require 'deprec/recipes/rails'
 require 'deprec/recipes/ubuntu'
 require 'deprec/recipes/apache'
 require 'deprec/recipes/memcache'
@@ -13,7 +14,7 @@ require 'deprec/capistrano_extensions/deprec_extensions.rb'
 require 'deprec/capistrano_extensions/actor_extensions.rb'
 
 Capistrano.configuration(:must_exist).load do
-  set :application, lambda { Capistrano::CLI.prompt "Enter application name: " }
+  set :application, lambda { Capistrano::CLI.prompt "Enter application name" }
   set :user, (defined?(user) ? user : ENV['USER']) # user who is deploying
   set :group, 'deploy'           # deployment group
   set :src_dir, (defined?(src_dir) ? src_dir : '/usr/local/src') # 3rd party src on servers 
@@ -210,7 +211,7 @@ Capistrano.configuration(:must_exist).load do
   end
      
   task :setup_admin_account do
-    user = Capistrano::CLI.prompt "Enter userid for new user: " 
+    user = Capistrano::CLI.prompt "Enter userid for new user" 
     deprec.useradd(user, :shell => '/bin/bash')
     puts "Setting pasword for new account"
     sudo_with_input("passwd #{user}", /UNIX password/) # ??? how many  versions of the prompt are there?

data/lib/deprec/recipes/rails.rb

@@ -0,0 +1,61 @@
+Capistrano.configuration(:must_exist).load do
+  
+  set :database_yml_in_scm, true
+
+  # database.yml stuff
+  #
+  # XXX DRY this up 
+  # I don't know how to let :gen_db_yml check if values have been set.
+  #
+  # if (self.respond_to?("db_host_#{rails_env}".to_sym)) # doesn't seem to work
+  
+  set :db_host_default, lambda { Capistrano::CLI.prompt 'Enter database host', 'localhost'}
+  set :db_host_staging, lambda { db_host_default }
+  set :db_host_production, lambda { db_host_default }
+  
+  set :db_name_default, lambda { Capistrano::CLI.prompt 'Enter database name', "#{application}_#{rails_env}" }
+  set :db_name_staging, lambda { db_name_default }
+  set :db_name_production, lambda { db_name_default }
+  
+  set :db_user_default, lambda { Capistrano::CLI.prompt 'Enter database user', 'root' }
+  set :db_user_staging, lambda { db_user_default }
+  set :db_user_production, lambda { db_user_default }
+  
+  set :db_pass_default, lambda { Capistrano::CLI.prompt 'Enter database pass', '' }
+  set :db_pass_staging, lambda { db_pass_default }
+  set :db_pass_production, lambda { db_pass_default }
+  
+  set :db_adaptor_default, lambda { Capistrano::CLI.prompt 'Enter database adaptor', 'mysql' }
+  set :db_adaptor_staging, lambda { db_adaptor_default }
+  set :db_adaptor_production, lambda { db_adaptor_default }
+  
+  set :db_socket_default, lambda { Capistrano::CLI.prompt('Enter database socket', '')}
+  set :db_socket_staging, lambda { db_socket_default }
+  set :db_socket_production, lambda { db_socket_default }
+
+
+  task :generate_database_yml, :roles => :app do    
+    database_configuration = render :template => <<-EOF
+#{rails_env}:
+  adapter: #{self.send("db_adaptor_#{rails_env}")}
+  database: #{self.send("db_name_#{rails_env}")}
+  username: #{self.send("db_user_#{rails_env}")}
+  password: #{self.send("db_pass_#{rails_env}")}
+  host: #{self.send("db_host_#{rails_env}")}
+  socket: #{self.send("db_socket_#{rails_env}")}
+EOF
+    run "mkdir -p #{deploy_to}/#{shared_dir}/config" 
+    put database_configuration, "#{deploy_to}/#{shared_dir}/config/database.yml" 
+  end
+  
+  task :after_update_code, :roles => :app do
+    symlink_database_yml unless database_yml_in_scm
+  end
+  
+  desc "Link in the production database.yml" 
+  task :symlink_database_yml, :roles => :app do
+    run "rm -f #{current_path}/config/database.yml"
+    run "ln -nfs #{deploy_to}/#{shared_dir}/config/database.yml #{release_path}/config/database.yml" 
+  end
+  
+end

data/lib/deprec/recipes/svn.rb

@@ -34,13 +34,13 @@ Capistrano.configuration(:must_exist).load do
     elsif ENV['HOSTS']
       svn_host = ENV['HOSTS']
     else
-      Capistrano::CLI.password_prompt('svn host: ')
+      Capistrano::CLI.prompt('svn host')
     end
   end
 
   # This is the actual path in the svn repos where we'll check our project into
   set (:repos_path) do
-    repository ? URI.parse(repository).path : Capistrano::CLI.password_prompt('svn repos path: ')
+    repository ? URI.parse(repository).path : Capistrano::CLI.prompt('svn repos path')
   end
 
   # We'll calculate this based on the repos_path. It's used when initializing the repository
@@ -51,11 +51,14 @@ Capistrano.configuration(:must_exist).load do
   # account name to perform actions on
   # this is a hack to allow us to optionally pass a variable to tasks 
   set (:svn_account) do
-    Capistrano::CLI.prompt('account name: ')
+    Capistrano::CLI.prompt('account name')
   end
   
-  # XXX sudo apt-get install swig python-dev
-  # XXX requires apache already installed...
+  # I'd like to be able to construct :repository if it's not explicitly set
+  # However we're grabbing values from it in the lines above so it would get a bit recursive
+  # set :repository, lambda { "#{svn_scheme}://#{scm_host == 'localhost' ? '/' : user+'@'+scm_host}#{repos_path}" }
+  
+  # XXX requires apache to have already been installed...
   desc "install Subversion version control system"
   task :svn_install, :roles => :scm do
     # svn 1.4 server improves on 1.3 and is backwards compatible with 1.3 clients
@@ -104,27 +107,24 @@ Capistrano.configuration(:must_exist).load do
     deprec.add_user_to_group(svn_account, scm_group)
   end
   
-  task :scm_setup do # deprecated
-    svn_setup
+  desc "Create subversion repository and import project into it"
+  task :svn_setup, :roles => :scm do 
+    svn_create_repos
+    svn_import
   end
   
-  task :svn_setup do 
-    svn_import_project
+  task :scm_setup, :roles => :scm do # deprecated
+    svn_setup
   end
   
-  desc "Create subversion repository and import project into it"
-  task :svn_import_project, :roles => :scm do
-    svn_create_repos
-    svn_import
+  task :svn_import_project, :roles => :scm do # deprecated
+    svn_setup
   end
   
   desc "Create a subversion repository"
   task :svn_create_repos, :roles => :scm do
     set :svn_account, user
     svn_grant_user_access
-    # deprec.useradd(user)
-    # deprec.groupadd(scm_group) 
-    # deprec.add_user_to_group(user, scm_group)
     deprec.mkdir(repos_root, :mode => '2775', :group => scm_group)
     sudo "svnadmin verify #{repos_root} > /dev/null 2>&1 || sudo svnadmin create #{repos_root}"
     sudo "chmod -R g+w #{repos_root}"
@@ -133,7 +133,6 @@ Capistrano.configuration(:must_exist).load do
   # Adapted from code in Bradley Taylors RailsMachine gem
   desc "Import project into subversion repository."
   task :svn_import, :roles => :scm do 
-    repository ||= "#{svn_scheme}://#{scm_host == 'localhost' ? '/' : scm_host}/#{repos_path}"   
     new_path = "../#{application}"
     tags = repository.sub("trunk", "tags")
     branches = repository.sub("trunk", "branches")

data/lib/deprec/recipes/trac.rb

@@ -4,13 +4,15 @@ Capistrano.configuration(:must_exist).load do
   set :trac_pidfile, lambda { "#{deploy_to}/shared/pids/trac.pid" }
   set :tracd_port, '9000'
   set (:trac_path) do
-    deploy_to ? "#{deploy_to}/trac" : Capistrano::CLI.prompt('path to trac config: ')
+    deploy_to ? "#{deploy_to}/trac" : Capistrano::CLI.prompt('path to trac config')
   end
   set (:trac_account) do
-    Capistrano::CLI.prompt('enter new trac user account name: ')
+    Capistrano::CLI.prompt('enter new trac user account name')
   end  
   set :trac_passwordfile_exists, true # hack - should check on remote system instead
   
+  set :trac_smtp_enabled, true
+  
   task :trac_install, :roles => :scm do
     version = 'trac-0.10.4'
     set :src_package, {

data/lib/deprec/templates/trac.ini.erb

@@ -44,7 +44,7 @@ mime_encoding = base64
 smtp_always_bcc = 
 smtp_always_cc = 
 smtp_default_domain = 
-smtp_enabled = false
+smtp_enabled = <%= trac_smtp_enabled.to_s %>
 smtp_from = trac@localhost
 smtp_password = 
 smtp_port = 25

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: deprec
 version: !ruby/object:Gem::Version 
-  version: 1.8.0
-date: 2007-06-22 00:00:00 +10:00
+  version: 1.9.0
+date: 2007-06-28 00:00:00 +10:00
 summary: deployment recipes for capistrano
 require_paths: 
 - lib
@@ -53,6 +53,7 @@ files:
 - lib/deprec/recipes/apache.rb
 - lib/deprec/recipes/cache_svn.rb
 - lib/deprec/recipes/memcache.rb
+- lib/deprec/recipes/rails.rb
 - lib/deprec/recipes/ssh.rb
 - lib/deprec/recipes/svn.rb
 - lib/deprec/recipes/trac.rb