@@ -1,3 +1,10 @@ +== 0.2.4 2008-02-26 + +* Change prompt.password to take options +* Adding password retry and check_hash +* Fixing :shell option for build scripting +* Add readline-devel to ruby centos install dependency + == 0.2.3 2008-02-25 * Various task and recipe fixes. History.txt @@ -110,6 +110,7 @@ module Capitate::Plugins::Base tasks end + # Task tree def task_tree top_node = Capitate::TaskNode.new("top") lib/capitate/plugins/base.rb @@ -1,3 +1,4 @@ +require 'md5' module Capitate::Plugins::Prompt @@ -5,21 +6,63 @@ module Capitate::Plugins::Prompt Capistrano::CLI.ui.ask(label, &block) end - def password(label, verify = false, lazy = true) + # Prompt for password. + # + # ==== Options + # +label+:: Label + # +options+:: Options + # - +verify+:: If true, prompt twice and verify + # - +lazy+:: If true, returns a block. _Defaults to true_ + # - +check_hash+:: If present, checks that md5 is same as password md5 + # + def password(label, options = {}) + + verify = options[:verify] + lazy = options[:lazy].nil? ? true : options[:lazy] + check_hash = options[:check_hash] + # Lazy password_prompt = Proc.new { - password = Capistrano::CLI.password_prompt(label) + + max_attempts = 2 + attempts = 0 + password = nil + success = true + + loop { + password = Capistrano::CLI.password_prompt(label) + attempts += 1 - if verify - password_verify = Capistrano::CLI.password_prompt("[VERIFY] #{label}") - raise "Passwords do not match" if password != password_verify - end + if verify + password_verify = Capistrano::CLI.password_prompt("[VERIFY] #{label}") + if password != password_verify + logger.important "Passwords do not match" + success = false + end + end + + if check_hash + if MD5.md5(password).hexdigest != check_hash + logger.important "Invalid password, try again." + success = false + end + end + + break if success + break if attempts >= max_attempts + } + + raise "Invalid password, too many tries" unless success password } return password_prompt if lazy password_prompt.call + end + + def check_password_hash(password, hash) + MD5.md5() end end lib/capitate/plugins/prompt.rb @@ -51,11 +51,8 @@ module Capitate::Plugins::Script build_dest = options[:build_dest] build_dest ||= "/tmp/#{name}" url = options[:url] - dependencies = options[:dependencies] - package.install(dependencies) if dependencies - - unpack(url, build_dest, options[:clean], options[:unpack_dir]) do |dir| + unpack(url, build_dest, options) do |dir| yield(dir) if block_given? end end @@ -85,7 +82,10 @@ module Capitate::Plugins::Script end # If want verbose, -v - run_via "sh -v #{dest} && rm -rf #{File.dirname(dest)}" + run_all <<-CMDS + sh -v #{dest} + rm -rf #{File.dirname(dest)} + CMDS end # Download and unpack URL. @@ -94,15 +94,16 @@ module Capitate::Plugins::Script # ==== Options # +url+:: URL to download # +dest+:: Destination directory - # +clean+:: If true will remove the unpacked directory - # +unpack_dir+:: Directory that is unpacked from tgz (if not matching the file name) + # +options+:: + # - +clean+:: If true will remove the unpacked directory. _Defaults to true_ + # - +unpack_dir+:: Directory that is unpacked from tgz (if not matching the file name) # # ==== Examples # script.unpack("http://rubyforge.org/frs/download.php/29548/rubygems-1.0.1.tgz", "/tmp/rubygems") do # sudo "ruby setup.rb" # end # - def unpack(url, dest, clean = true, unpack_dir = nil, &block) + def unpack(url, dest, options, &block) file = url.split("/").last # TODO: Support other types @@ -110,12 +111,16 @@ module Capitate::Plugins::Script raise "Can't unpack this file: #{file}; only support tar.gz and tgz formats" end + options[:clean] = true if options[:clean].nil? + unpack_dir = options[:unpack_dir] + clean = options[:clean] + unpack_dir ||= file.gsub(/\.tar\.gz|\.tgz/, "") http_get_method = fetch(:http_get_method, "wget -nv") - + run_all <<-CMDS - mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url} + sh -c "mkdir -p #{dest} && cd #{dest} && #{http_get_method} #{url}" sh -c "cd #{dest} && tar zxf #{file}" CMDS @@ -133,10 +138,9 @@ module Capitate::Plugins::Script # +cmds+:: Commands (separated by newlines) # +options+:: See invoke_command options # - def run_all(cmds, options = {}, &block) + def run_all(cmds, options = {}, &block) cmds.split("\n").each do |cmd| - cmd = cmd.gsub(/^\s+/, "") - #sh_cmd = %{sh -c "#{cmd.gsub("\"", "\"\"")}"} + cmd = cmd.gsub(/^\s+/, "") run_via(cmd, options, &block) end end lib/capitate/plugins/script.rb @@ -2,7 +2,7 @@ module Capitate #:nodoc: module VERSION #:nodoc: MAJOR = 0 MINOR = 2 - TINY = 3 + TINY = 4 STRING = [MAJOR, MINOR, TINY].join('.') end lib/capitate/version.rb @@ -58,7 +58,7 @@ task :install do # Gem installs gems.install([ "rake", "mysql -- --with-mysql-include=/usr/include/mysql --with-mysql-lib=/usr/lib/mysql --with-mysql-config", - "raspell", "rmagick", "mongrel", "mongrel_cluster","json" ]) + "raspell", "rmagick", "mongrel", "mongrel_cluster","json", "mime-types" ]) # Cleanup yum.clean lib/deployment/install-centos-rubyweb.rb @@ -30,7 +30,7 @@ namespace :centos do run "chmod a+rx #{home}" if home_readable - new_password = prompt.password("Password to set for #{user_add}: ", true, false) + new_password = prompt.password("Password to set for #{user_add}: ", :verify => true, :lazy => false) run "passwd #{user_add}" do |channel, stream, data| logger.info data lib/recipes/centos/centos.rb @@ -19,7 +19,7 @@ namespace :monit do # Settings fetch_or_default(:monit_port, 2812) - fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', true)) + fetch_or_default(:monit_password, prompt.password('Monit admin password (to set): ', :verify => true)) fetch_or_default(:monit_conf_dir, "/etc/monit") fetch_or_default(:monit_pid_path, "/var/run/monit.pid") fetch(:monit_build_options) lib/recipes/centos/monit.rb @@ -11,7 +11,7 @@ namespace :mysql do task :install do # Settings - fetch_or_default(:mysql_admin_password_set, prompt.password('Mysql admin password (to set): ', true)) + fetch_or_default(:mysql_admin_password_set, prompt.password('Mysql admin password (to set): ', :verify => true)) # Install through package manager yum.install([ "mysql", "mysql-devel", "mysql-server" ]) lib/recipes/centos/mysql.rb @@ -15,14 +15,14 @@ namespace :ruby do fetch(:rubygems_build_options) # Install dependencies - yum.install([ "zlib", "zlib-devel" ]) + yum.install([ "zlib", "zlib-devel", "readline-devel" ]) # Install ruby 1.8.6 script.make_install("ruby", ruby_build_options) # Install rubygems script.install("rubygems", rubygems_build_options) do |dir| - run_via "echo 'Running setup...' && cd #{dir} && ruby setup.rb > install.log" + run_via "cd #{dir} && ruby setup.rb > install.log", { :shell => true } end end lib/recipes/centos/ruby.rb @@ -23,6 +23,16 @@ namespace :rails do fetch_or_default(:db_host, nil) fetch_or_default(:db_socket, nil) + unless db_host.blank? + set :db_connect_type, "host" + set :db_connect, db_host + end + + unless db_socket.blank? + set :db_connect_type, "socket" + set :db_connect, db_socket + end + run "mkdir -p #{shared_path}/config" put template.load("rails/database.yml.erb"), "#{shared_path}/config/database.yml" end lib/recipes/rails.rb @@ -4,5 +4,4 @@ production: database: <%= db_name %> username: <%= db_user %> password: <%= db_pass %> - <%= "host: #{db_host}" unless db_host.blank? %> - <%= "socket: #{db_socket}" unless db_socket.blank? %> + <%= "#{db_connect_type}: #{db_connect}" %> lib/templates/rails/database.yml.erb @@ -38,7 +38,7 @@ <div id="version" class="clickable box" onclick='document.location = "http://rubyforge.org/projects/capitate"; return false'> <p>Get Version</p> - <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.3</a> + <a href="http://rubyforge.org/projects/capitate" class="numbers">0.2.4</a> </div> <div id="recipes"> website/index.html 0735ff383d2533745ae1faec057bf75e07e607cc Gabriel Handford gabrielh@gmail.com http://github.com/gabriel/capitate/commit/77c05af6f2991874f054a14222e3977b4e9686f1 77c05af6f2991874f054a14222e3977b4e9686f1 2008-02-26T17:26:39-08:00 2008-02-26T17:26:39-08:00 fixes, see history for 0.2.4 07a1ca9b58030103da92adca2751ac5b9cdf61aa Gabriel Handford gabrielh@gmail.com