matthewgarysmith-ubuntu-machine 0.3.1.3 → 0.4.0.1

data/README

@@ -2,4 +2,8 @@
 http://suitmymind.github.com/ubuntu-machine
 
 = Changelog here :
-http://suitmymind.github.com/ubuntu-machine/#changelog
+http://suitmymind.github.com/ubuntu-machine/#changelog
+
+= Contributors :
+ - Joseph Glenn
+ - Ahume

data/lib/capistrano/ext/ubuntu-machine/aptitude.rb

@@ -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

data/lib/capistrano/ext/ubuntu-machine/gems.rb

@@ -1,6 +1,7 @@
 namespace :gems do
   desc "Install RubyGems"
   task :install_rubygems, :roles => :app do
+    run "cd /tmp"
     run "curl -LO http://rubyforge.org/frs/download.php/45905/rubygems-#{rubygem_version}.tgz"
     run "tar xvzf rubygems-#{rubygem_version}.tgz"
     run "cd rubygems-#{rubygem_version} && sudo ruby setup.rb"
@@ -9,7 +10,7 @@ namespace :gems do
     sudo "gem update --system"
     run "rm -Rf rubygems-#{rubygem_version}*"
   end
-  
+
   desc "List gems on remote server"
   task :list, :roles => :app do
     stream "gem list"
@@ -19,7 +20,7 @@ namespace :gems do
   task :update, :roles => :app do
     sudo "gem update"
   end
-  
+
   desc "Update gem system on remote server"
   task :update_system, :roles => :app do
     sudo "gem update --system"

data/lib/capistrano/ext/ubuntu-machine/helpers.rb

@@ -0,0 +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
+
+

data/lib/capistrano/ext/ubuntu-machine/machine.rb

@@ -3,33 +3,20 @@ namespace :machine do
   desc "Change the root password, create a new user and allow him to sudo and to SSH"
   task :initial_setup do
     set :user_to_create , user
-    set :user, username = Capistrano::CLI.ui.ask("Login as? (#{root_user}) : ")
+    username = Capistrano::CLI.ui.ask("Username to login as (#{root_user}) : ")
+    set :user, (username.nil? || username.empty?) ? root_user : username
+    puts "-- logging in as #{user}"
+    run "whoami"
     sure = Capistrano::CLI.ui.ask("Change the password for #{user}? (y/N) : ")
     if sure.to_s.strip.downcase == 'y'
-      run "passwd", :pty => true do |ch, stream, data|
-        if data =~ /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", [/UNIX password/])
     end
 
     users = capture('cat /etc/passwd | cut -d":" -f1').split(/\s+/)
     if users.include?(user_to_create)
       puts "-- user: #{user_to_create.inspect} already exists."
     else
-      sudo "adduser #{user_to_create}", :pty => true do |ch, stream, data|
-        if data =~ /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("adduser #{user_to_create}", [/UNIX password/, /\[\]\:/, /\[y\/N\]/i])
     end
 
     sudoers_file = capture("cat /etc/sudoers", :via => :sudo)

data/lib/capistrano/ext/ubuntu-machine/mysql.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
@@ -39,22 +30,25 @@ namespace :mysql do
     db_name = Capistrano::CLI.ui.ask("Which database should we create: ")
     db_username = Capistrano::CLI.ui.ask("Which database username should we create: ")
     db_user_password = Capistrano::CLI.ui.ask("Choose a password for the new database username: ")
-    file = Capistrano::CLI.ui.ask("Which database file should we import (it must be located in #{default_local_files_path}): ")
-    upload "#{default_local_files_path}/#{file}", "#{file}"
-
+    file_to_upload = Capistrano::CLI.ui.ask("Do you want to import a database file? (y/n) : ")
+    if file_to_upload == "y"
+      file = Capistrano::CLI.ui.ask("Which database file should we import (it must be located in #{default_local_files_path}): ")
+      upload "#{default_local_files_path}/#{file}", "#{file}"
+    end
     create_db_tmp_file = "create_#{db_name}.sql"
     put render("new_db", binding), create_db_tmp_file
     run "mysql -u root -p#{db_root_password} < #{create_db_tmp_file}"
-
-    run "mysql -u root -p#{db_root_password} #{db_name} < #{file}"
-    run "rm #{file} #{create_db_tmp_file}"
+    if file_to_upload == "y"
+      run "mysql -u root -p#{db_root_password} #{db_name} < #{file}"
+      run "rm #{file}"
+    end
+    run "rm #{create_db_tmp_file}"
   end
 
   desc "Install MySQL"
   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"
     restart
     run "mysqladmin -u root password #{db_root_password}"
   end

data/lib/capistrano/ext/ubuntu-machine/ruby.rb

@@ -1,7 +1,10 @@
+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"
@@ -9,27 +12,37 @@ namespace :ruby do
     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
     sudo "apt-get install libssl-dev -y"
     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}"
     sudo "rm -rf #{ruby_enterprise_version}/"
-    
+
     # create a "permanent" link to the current REE install
-    sudo "ln -s /opt/#{ruby_enterprise_version} /opt/ruby-enterprise" 
-    
+    sudo "ln -s /opt/#{ruby_enterprise_version} /opt/ruby-enterprise"
+
     # add REE bin to the path
     run "cat /etc/environment > ~/environment.tmp"
     run 'echo PATH="/opt/ruby-enterprise/bin:$PATH" >> ~/environment.tmp'
     sudo 'mv ~/environment.tmp /etc/environment'
   end
-  
+
   desc "Install Phusion Passenger"
   task :install_passenger, :roles => :app do
     # because  passenger-install-apache2-module do not find the rake installed by REE
@@ -40,9 +53,9 @@ namespace :ruby do
     sudo "apt-get install apache2-prefork-dev -y"
 
     sudo "/opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/gem install passenger"
-    
+
     run "echo -en '\n\n\n\n\n' | sudo /opt/#{ruby_enterprise_version}/bin/ruby /opt/#{ruby_enterprise_version}/bin/passenger-install-apache2-module"
-    
+
     put render("passenger.load", binding), "/home/#{user}/passenger.load"
     put render("passenger.conf", binding), "/home/#{user}/passenger.conf"
 
@@ -51,6 +64,6 @@ namespace :ruby do
 
     sudo "a2enmod passenger"
     apache.force_reload
-  end 
-   
+  end
+
 end

data/lib/capistrano/ext/ubuntu-machine/utils.rb

@@ -1,16 +1,16 @@
 namespace :utils do
-  
+
   desc "Reboot the system."
   task :reboot, :roles => :gateway do
     sure = Capistrano::CLI.ui.ask("Are you sure you want to reboot now? (y/n) : ")
     sudo "reboot" if sure=="y"
   end
-  
+
   desc "Force a reboot of the system."
   task :force_reboot, :roles => :gateway do
     sudo "reboot"
   end
-  
+
   desc "Show the amount of free disk space."
   task :disk_space, :roles => :gateway do
     run "df -h /"
@@ -29,20 +29,12 @@ namespace :utils do
   desc "Display passenger memory usage information."
   task :passenger_memory, :roles => :gateway do
     sudo "/opt/ruby-enterprise/bin/passenger-memory-stats"
-  end  
+  end
 
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matthewgarysmith-ubuntu-machine
 version: !ruby/object:Gem::Version 
-  version: 0.3.1.3
+  version: 0.4.0.1
 platform: ruby
 authors: 
 - Thomas Balthazar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,7 @@ files:
 - lib/capistrano/ext/ubuntu-machine.rb
 - lib/capistrano/ext/ubuntu-machine
 - lib/capistrano/ext/ubuntu-machine/curl.rb
+- lib/capistrano/ext/ubuntu-machine/helpers.rb
 - lib/capistrano/ext/ubuntu-machine/ruby.rb
 - lib/capistrano/ext/ubuntu-machine/gems.rb
 - lib/capistrano/ext/ubuntu-machine/git.rb
@@ -42,7 +43,6 @@ files:
 - lib/capistrano/ext/ubuntu-machine/php.rb
 - lib/capistrano/ext/ubuntu-machine/ssh.rb
 - lib/capistrano/ext/ubuntu-machine/machine.rb
-- lib/capistrano/ext/ubuntu-machine/render.rb
 - lib/capistrano/ext/ubuntu-machine/apache.rb
 - lib/capistrano/ext/ubuntu-machine/iptables.rb
 - lib/capistrano/ext/ubuntu-machine/mysql.rb

data/lib/capistrano/ext/ubuntu-machine/render.rb

@@ -1,6 +0,0 @@
-require 'erb'
-
-def render(file, binding)
-  template = File.read("#{File.dirname(__FILE__)}/templates/#{file}.erb")
-  result = ERB.new(template).result(binding)
-end