automateit 0.70928 → 0.70930

data/CHANGES.txt

@@ -1,3 +1,12 @@
+0.70930:
+    Date: Sun, 30 Sep 2007 15:10:43 -0700
+    Desc:
+    - Fixed ShellManager#rm to display output like 'rm -rf' rather than 'rm_rf'.
+    - Fixed #tags, removed the standalone tag for the distro's version (e.g., "7.04"), it must now be qualified with the distro's name, "ubuntu_7.04".
+    - Improved bin/automateit so it doesn't display error trace when user types 'exit' into irb.
+    - Improved comments in basic/examples recipes.
+    - Improved #tag_for to return a sorted Array instead of a Set.
+
 0.70928:
     Date: Fri, 28 Sep 2007 23:18:37 -0700
     Desc:

data/README.txt

@@ -23,7 +23,7 @@ Execution:
 Plugins:
 * AutomateIt::AccountManager -- Manipulates users and groups.
 * AutomateIt::AddressManager -- Manipulates host's network addresses.
-* AutomateIt::EditManager -- Edits files and strings.
+* AutomateIt::DownloadManager -- Downloads files.
 * AutomateIt::EditManager::EditSession -- Commands for editing files.
 * AutomateIt::FieldManager -- Queries configuration variables.
 * AutomateIt::PackageManager -- Manipulates software packages.

data/bin/automateit

@@ -33,10 +33,10 @@ Examples:
 
   # Eval a string
   #{PROG} -e "puts tags.to_a.inspect"
-  
+
   # Add a tag
   #{PROG} -a mytag -e "puts tags.to_a.inspect"
-  
+
   # Add tags
   #{PROG} -a 'mytag othertag' -e "puts tags.to_a.inspect"
 
@@ -96,11 +96,19 @@ EOB
   argscopy = args.clone
   optscopy = opts.clone
 
+  # Display newline at the end
+  newline = true
+
   begin
     rv = AutomateIt::CLI.run(opts)
+  rescue SystemExit
+    # Don't display errors when 'exit' is run
+    newline = false
   rescue Exception => e
     msg = nil
-    if opts[:friendly_exceptions] != false and e.is_a?(AutomateIt::Error)
+    if e.is_a?(AutomateIt::Error) and e.cause.to_s =~ /IRB_EXIT/
+      # Don't display errors interpreter is closed with 'CTRL-D'
+    elsif opts[:friendly_exceptions] != false and e.is_a?(AutomateIt::Error)
       # Friendly message
       msg = PERROR+e.message
       msg << "\n\n"+PNOTE+"Use 'automateit --trace' to see complete backtrace"
@@ -115,12 +123,10 @@ EOB
     end
     puts msg
     exit 1
-  rescue SysExit => e
-    # Don't display errors when exit gets called
   end
   if optscopy[:create] or optscopy[:eval] or argscopy.size > 0
     exit rv ? 0 :1
-  else
+  elsif newline
     # CTRL-D ends the line prematurely, so add a newline
     puts
   end

data/examples/basic/recipes/install.rb

@@ -6,7 +6,7 @@ if tagged?("rails_servers | myapp_servers")
     package_manager.install("build-essential", "ruby1.8-dev", "libsqlite3-dev")
   elsif tagged?("fedoracore | fedora | centos")
     # Install equivalent packages on Fedora and similar OSes
-    package_manager.install("gcc", "'ruby-devel", "sqlite-devel")
+    package_manager.install("gcc", "ruby-devel", "sqlite-devel")
   else
     # Fail if running on another platform
     raise NotImplementedError.new("no packages specified for this platform")

data/lib/automateit/edit_manager.rb

@@ -303,7 +303,7 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
     log.silence(Logger::WARN) do
       result = backup(@filename)
     end
-    log.info(PNOTE+"Saved '#{@filename}' to '#{result}'")
+    log.debug(PNOTE+"Saved '#{@filename}' to '#{result}'")
   end
   protected :_backup
 

data/lib/automateit/platform_manager/struct.rb

@@ -63,8 +63,10 @@ class AutomateIt::PlatformManager::Struct < AutomateIt::PlatformManager::BaseDri
 
   # See PlatformManager#tags
   def tags
-    results = @struct.values
-    results << query("os#arch") rescue IndexError
+    results = []
+    for key in %w(os arch distro os#arch)
+      results << query(key) rescue IndexError
+    end
 
     release_query = \
       if single_vendor?

data/lib/automateit/root.rb

@@ -1,7 +1,7 @@
 # See AutomateIt::Interpreter for usage information.
 module AutomateIt # :nodoc:
   # AutomateIt version
-  VERSION=Gem::Version.new("0.70928")
+  VERSION=Gem::Version.new("0.70930")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/shell_manager/portable.rb

@@ -319,10 +319,23 @@ class AutomateIt::ShellManager::Portable < AutomateIt::ShellManager::BaseDriver
       else
         :rm
       end
+
     present = [targets].flatten.select{|entry| File.exists?(entry)}
     return false if present.empty?
+
+    msg = "rm"
+    if opts[:recursive] and opts[:force]
+      msg << " -rf"
+    elsif opts[:recursive]
+      msg << " -r"
+    elsif opts[:force]
+      msg << " -f"
+    end
+    msg << " " << present.join(' ')
+    log.info(PEXEC+msg)
+
     present = present.first if present.size == 0
-    log.info(PEXEC+"#{kind} #{String === present ? present : present.join(' ')}")
+
     FileUtils.send(kind, present, _fileutils_opts)
     return present
   end

data/lib/automateit/tag_manager/struct.rb

@@ -89,7 +89,7 @@ class AutomateIt::TagManager::Struct < AutomateIt::TagManager::BaseDriver
       else
         raise TypeError.new("invalid hostnames argument type: #{hostnames.class}")
       end
-    return @struct.inject(Set.new) do |sum, role_and_members|
+    result = @struct.inject(Set.new) do |sum, role_and_members|
       role, members = role_and_members
       members_aliases = members.inject(Set.new) do |aliases, member|
         aliases.merge(interpreter.address_manager.hostnames_for(member)); aliases
@@ -97,5 +97,6 @@ class AutomateIt::TagManager::Struct < AutomateIt::TagManager::BaseDriver
       sum.add(role) unless (hostnames & members_aliases).empty?
       sum
     end
+    return result.to_a.sort
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.70928"
-date: 2007-09-29 00:00:00 -07:00
+  version: "0.70930"
+date: 2007-10-01 00:00:00 -07:00
 summary: AutomateIt is an open-source tool for automating the setup and maintenance of UNIX-like systems
 require_paths: 
 - lib