@@ -37,15 +37,7 @@ namespace :aptitude do # if it must overwrite this file, since it has been modified by OVH. \ # data =~ /^\*\*\*\sissue/ looks for the interactive prompt to enable you to answer sudo 'aptitude hold console-setup -y' - sudo 'aptitude safe-upgrade -y', :pty => true do |ch, stream, data| - if data =~ /^\*\*\*\sissue/ - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end + sudo_and_watch_prompt("aptitude safe-upgrade -y", /^\*\*\*\sissue/) end desc <<-DESC lib/capistrano/ext/ubuntu-machine/aptitude.rb @@ -1,6 +1,36 @@ require 'erb' +# render a template def render(file, binding) template = File.read("#{File.dirname(__FILE__)}/templates/#{file}.erb") result = ERB.new(template).result(binding) end + +# allows to sudo a command which require the user input via the prompt +def sudo_and_watch_prompt(cmd, regex_to_watch) + sudo cmd, :pty => true do |ch, stream, data| + watch_prompt(ch, stream, data, regex_to_watch) + end +end + +# allows to run a command which require the user input via the prompt +def run_and_watch_prompt(cmd, regex_to_watch) + run cmd, :pty => true do |ch, stream, data| + watch_prompt(ch, stream, data, regex_to_watch) + end +end + +# utility method called by sudo_and_watch_prompt and run_and_watch_prompt +def watch_prompt(ch, stream, data, regex_to_watch) + + # the regex can be an array or a single regex -> we force it to always be an array with [*xx] + if [*regex_to_watch].find { |regex| data =~ regex} + # prompt, and then send the response to the remote process + ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") + else + # use the default handler for all other text + Capistrano::Configuration.default_io_proc.call(ch, stream, data) + end +end + + lib/capistrano/ext/ubuntu-machine/helpers.rb @@ -5,26 +5,9 @@ namespace :machine do set :user_to_create , user set :user, 'root' - - run "passwd", :pty => true do |ch, stream, data| - if data =~ /Enter new UNIX password/ || data=~ /Retype new UNIX password:/ - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end - - run "adduser #{user_to_create}", :pty => true do |ch, stream, data| - if data =~ /Enter new UNIX password/ || data=~ /Retype new UNIX password:/ || data=~/\[\]\:/ || data=~/\[y\/N\]/i - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end + run_and_watch_prompt("passwd", [/Enter new UNIX password/, /Retype new UNIX password:/]) + + run_and_watch_prompt("adduser #{user_to_create}", [/Enter new UNIX password/, /Retype new UNIX password:/, /\[\]\:/, /\[y\/N\]/i]) run "echo '#{user_to_create} ALL=(ALL)ALL' >> /etc/sudoers" run "echo 'AllowUsers #{user_to_create}' >> /etc/ssh/sshd_config" @@ -52,14 +35,6 @@ namespace :machine do task :change_password do user_to_update = Capistrano::CLI.ui.ask("Name of the user whose you want to update the password : ") - sudo "passwd #{user_to_update}", :pty => true do |ch, stream, data| - if data =~ /Enter new UNIX password/ || data=~ /Retype new UNIX password:/ - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end + run_and_watch_prompt("passwd #{user_to_update}", [/Enter new UNIX password/, /Retype new UNIX password:/]) end end lib/capistrano/ext/ubuntu-machine/machine.rb @@ -19,16 +19,7 @@ namespace :mysql do desc "Export MySQL database" task :export, :roles => :db do database = Capistrano::CLI.ui.ask("Which database should we export: ") - # sudo "mysqldump -u root -p #{database} > #{database}.sql", :pty => true - sudo "mysqldump -u root -p #{database} > #{database}.sql", :pty => true do |ch, stream, data| - if data =~ /Enter\spassword/ - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end + sudo_and_watch_prompt("mysqldump -u root -p #{database} > #{database}.sql", /Enter\spassword/) download "#{database}.sql", "#{default_local_files_path}/database.sql" run "rm #{database}.sql" end @@ -58,7 +49,6 @@ namespace :mysql do task :install, :roles => :db do db_root_password = Capistrano::CLI.ui.ask("Choose a MySQL root password : ") sudo "aptitude install -y mysql-server mysql-client libmysqlclient15-dev" - sudo "aptitude install -y libmysql-ruby1.8" run "mysqladmin -u root password #{db_root_password}" end lib/capistrano/ext/ubuntu-machine/mysql.rb @@ -1,13 +1,25 @@ +require 'net/http' + namespace :ruby do desc "Install Ruby 1.8" task :install, :roles => :app do sudo "aptitude install -y ruby1.8-dev ruby1.8 ri1.8 rdoc1.8 irb1.8 libreadline-ruby1.8 libruby1.8 libopenssl-ruby sqlite3 libsqlite3-ruby1.8" + sudo "aptitude install -y libmysql-ruby1.8" sudo "ln -s /usr/bin/ruby1.8 /usr/bin/ruby" sudo "ln -s /usr/bin/ri1.8 /usr/bin/ri" sudo "ln -s /usr/bin/rdoc1.8 /usr/bin/rdoc" sudo "ln -s /usr/bin/irb1.8 /usr/bin/irb" end + + + set :ruby_enterprise_url do + Net::HTTP.get('www.rubyenterpriseedition.com', '/download.html').scan(/http:.*\.tar\.gz/).first + end + + set :ruby_enterprise_version do + "#{ruby_enterprise_url[/(ruby-enterprise.*)(.tar.gz)/, 1]}" + end desc "Install Ruby Enterpise Edition" task :install_enterprise, :roles => :app do @@ -15,7 +27,8 @@ namespace :ruby do sudo "apt-get install libreadline5-dev -y" run "test ! -d /opt/#{ruby_enterprise_version}" - run "curl -LO http://rubyforge.org/frs/download.php/50087/#{ruby_enterprise_version}.tar.gz" + # run "curl -LO http://rubyforge.org/frs/download.php/50087/#{ruby_enterprise_version}.tar.gz" + run "curl -LO #{ruby_enterprise_url}" run "tar xzvf #{ruby_enterprise_version}.tar.gz" run "rm #{ruby_enterprise_version}.tar.gz" sudo "./#{ruby_enterprise_version}/installer --auto /opt/#{ruby_enterprise_version}" lib/capistrano/ext/ubuntu-machine/ruby.rb @@ -33,16 +33,8 @@ namespace :utils do desc "Activate Phusion Passenger Enterprise Edition." task :passenger_enterprise, :roles => :gateway do - # sudo "passenger-make-enterprisey" - sudo '/opt/ruby-enterprise/bin/passenger-make-enterprisey', :pty => true do |ch, stream, data| - if data =~ /Key\:/ || data =~ /again\:/ - # prompt, and then send the response to the remote process - ch.send_data(Capistrano::CLI.password_prompt(data) + "\n") - else - # use the default handler for all other text - Capistrano::Configuration.default_io_proc.call(ch, stream, data) - end - end + + sudo_and_watch_prompt("/opt/ruby-enterprise/bin/passenger-make-enterprisey", [/Key\:/, /again\:/]) end end \ No newline at end of file lib/capistrano/ext/ubuntu-machine/utils.rb @@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "ubuntu-machine" - s.version = "0.3.1.2" - s.date = "2009-01-31" + s.version = "0.4.0" + s.date = "2009-02-06" s.summary = "Capistrano recipes for setting up and deploying to a Ubuntu Machine" s.email = "thomas@suitmymind.com" s.homepage = "http://suitmymind.github.com/ubuntu-machine" ubuntu-machine.gemspec 00f62c10761b61ccdfff65613a022aef80fe5065 Thomas Balthazar thomas@suitmymind.com http://github.com/suitmymind/ubuntu-machine/commit/57daf2bb7d5ba6237752bf43d17ed4436d5cd81c 57daf2bb7d5ba6237752bf43d17ed4436d5cd81c 2009-02-06T06:07:07-08:00 2009-02-06T06:07:07-08:00 * [#6 state:resolved] : extract the sudo 'aptitude safe-upgrade -y', :pty => true do |ch, stream, data| method * libmysql-ruby1.8 is now installed by the ruby:install task instead of the mysql task, which is more coherent for people that do not need ruby cf7aa1caf3b6a471d94595a54db167e31bd2cbb8 Thomas Balthazar thomas@suitmymind.com