manage.rb in cap-recipes-0.3.27

- old
+ new
@@ -1,30 +1,28 @@
-require 'cap_recipes/tasks/utilities.rb'
+require File.expand_path(File.dirname(__FILE__) + '/../utilities')
 
 Capistrano::Configuration.instance(true).load do
   namespace :aptitude do
-    desc "Updates all installed packages on apt-get package system"
+    desc "Updates all installed packages on aptitude package system"
     task :updates do
       sudo "apt-get -qy update"
-      sudo "apt-get -qy upgrade"
+      utilities.apt_upgrade
       sudo "apt-get -qy autoremove"
     end
 
-    desc "Installs a specified apt-get package"
+    desc "Installs a specified aptitude package"
     task :install do
-      puts "What is the name of the package(s) you wish to install?"
-      deb_pkg_name = $stdin.gets.chomp
+      deb_pkg_name = utilities.ask "Enter name of the package(s) you wish to install:"
       raise "Please specify deb_pkg_name" if deb_pkg_name == ''
       logger.info "Updating packages..."
       sudo "aptitude update"
       logger.info "Installing #{deb_pkg_name}..."
-      utilities.sudo_with_input "apt-get install #{deb_pkg_name}", /^Do you want to continue\?/
+      utilities.apt_install deb_pkg_name
     end
 
-    desc "Removes a specified apt-get package"
+    desc "Removes a specified aptitude package"
     task :remove do
-      puts "What is the name of the package(s) you wish to install?"
-      deb_pkg_name = $stdin.gets.chomp
+      deb_pkg_name = utilities.ask "Enter name of the package(s) you wish to remove:"
       raise "Please specify deb_pkg_name" if deb_pkg_name == ''
       logger.info "Updating packages..."
       sudo "aptitude update"
       logger.info "Removing #{deb_pkg_name}..."
       utilities.sudo_with_input "apt-get remove --purge #{deb_pkg_name}", /^Do you want to continue\?/