automateit 0.71226.1 → 0.71230

data/CHANGES.txt

@@ -1,7 +1,19 @@
+0.71230:
+    Date: Sun, 30 Dec 2007 14:05:31 -0800
+    Desc:
+    - (!) Removed all code that relied on the ActiveSupport and Builder libraries. The new, AutomateIt-specific replacements for these libraries are guaranteed to work correctly and load much more quickly.
+    - (!) Removed the "--to-xml" option from "aitag" and "aifield". If anyone relied on this functionality, post to the mailing list and I'll write a replacement.
+    - (%) Fixed PlatformManager::LSB, it no longer converts OS release versions like "7.10" into "7.1".
+    - (%) Fixed "aitags" with "--tags" options, it now returns a sorted array instead of a set.
+    - (%) Fixed case/when statements to work with Ruby 1.9.
+    - (%) Fixed TemplateManager#render, it now only runs file-related checks when rendering to a file.
+    - Improved PackageManager::CPAN's "cpan_wrapper.pl". It's now just a single file that can be used as both a command and library.
+    - Improved EditManager. In preview mode, it now checks to make sure the file is readable, rather than failing due to permission denied errors.
+
 0.71226.1:
     Date: Wed, 26 Dec 2007 11:45:03 -0800
     Desc:
-    - Same as previous version. Something went wrong with Rubyforge and the gem was only partially uploaded, so trying again. 
+    - Same as previous version. Something went wrong with Rubyforge and the gem was only partially uploaded, so trying again.
 
 0.71226:
     Date: Wed, 26 Dec 2007 11:41:03 -0800

data/Hoe.rake

@@ -25,8 +25,7 @@ Hoe.new("AutomateIt", AutomateIt::VERSION.to_s) do |s|
   s.changes = s.paragraphs_of('CHANGES.txt', 0).join("\n")
   s.description = slogan
   s.email = "igal@pragmaticraft.com"
-  # TODO Remove dependency on activesupport and builder
-  s.extra_deps = [["activesupport", ">= 1.4"], ["builder", ">= 2.0"], ["open4", ">= 0.9"]]
+  s.extra_deps = [["open4", ">= 0.9"]]
   s.name = "automateit"
   s.summary = slogan
   s.url = "http://automateit.org/"

data/Rakefile

@@ -98,8 +98,7 @@ namespace :loc do
 
   desc "Display lines of churn"
   task :churn do
-    require 'rubygems'
-    require 'active_support'
+    automateit # Load libraries
     puts "%s lines of Hg churn" % (`hg churn`.scan(/^[^\s]+\s+(\d+)\s/).flatten.map(&:to_i).sum).commify
   end
 
@@ -143,8 +142,7 @@ end
 
 desc "RFC-822 time for right now, optional D=x where x is delta like '1.day' ago"
 task :now do
-  require 'rubygems'
-  require 'activesupport'
+  automateit # Loads libraries
   time = Time.now
   if delta = ENV["D"]
     time = eval "time - #{delta}"
@@ -154,8 +152,7 @@ end
 
 desc "RFC-822 time for yesterday"
 task :yesterday do
-  require 'rubygems'
-  require 'active_support'
+  automateit # Loads libraries
   time = Time.now - 1.day
   puts time.to_s(:rfc822)
 end
@@ -174,7 +171,7 @@ end
 
 desc "Publish to RubyForge"
 task :publish do
-  automateit
+  automateit # Loads libraries
   hoe("release VERSION=#{AutomateIt::VERSION}")
   Rake::Task[:after].invoke
 end
@@ -243,7 +240,7 @@ namespace :rdoc do
   desc "Generate documentation"
   task :make do
     # Uses Jamis Buck's RDoc template from http://weblog.jamisbuck.org/2005/4/8/rdoc-template
-    sh "rdoc --template=jamis --main ./README.txt --promiscuous --accessor class_inheritable_accessor=R --title 'AutomateIt: Open source server automation' lib docs/*.txt README.txt TUTORIAL.txt TESTING.txt"
+    sh "rdoc --op doc --template=jamis --main README.txt --promiscuous --accessor class_inheritable_accessor=R --inline-source --line-numbers --title 'AutomateIt: Open source server automation' README.txt TUTORIAL.txt TESTING.txt lib docs/*.txt"
     # Create a tutorial index
     File.open("doc/tutorial.html", "w+") do |writer|
       writer.write(File.read("doc/index.html").sub(/README_txt.html/, 'TUTORIAL_txt.html'))
@@ -297,7 +294,14 @@ namespace :rdoc do
   end
 end
 
-task :rdoc => ["rdoc:make", "rdoc:rewrite"]
+desc "Generate Rdoc"
+task :rdoc do
+  # TODO Something is broke in rdoc recently. It decides to only generate rdocs for newer files, which is very bad because if you re-run "rdoc" without deleting the "doc" directory, it'll can end up creating a set of documentation that only contains the single file you changed. This sucks. 
+  sh "rm -rf doc" if File.exist?("doc")
+
+  Rake::Task["rdoc:make"].invoke
+  Rake::Task["rdoc:rewrite"].invoke
+end
 
 desc "List aliased_methods for inclusion into rdoc"
 task :aliased_methods do

data/TODO.txt

@@ -12,9 +12,12 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 111 AccountManager::NSCD -- Uses "ps -ef", needs abstraction
 
 #---[ Design issues ]---------------------------------------------------
-111 PackageManager -- What's a reasonable way to leave out the ':with' option when using a hash argument to install? E.g.,  sudo ai -e "package_manager.install({'swiftfox-prescott' => '/tmp/swiftfox_3.0b3pre-1_prescott.deb'}, :with => :dpkg)"
+??? PackageManager -- How to specify interpreter? E.g. reuse CPAN driver's approach?
+??? PackageManager -- How to have driver check against instance variables, such as the particular interpreter requested? Needed to work around things like 'gem1.8', 'python2.5.1' and '/usr/local/bin/perl'.
+??? PackageManager -- What's a reasonable way to leave out the ':with' option when using a hash argument to install? E.g.,  sudo ai -e "package_manager.install({'swiftfox-prescott' => '/tmp/swiftfox_3.0b3pre-1_prescott.deb'}, :with => :dpkg)"
 
 #---[ Development ]-----------------------------------------------------
+111 Shell or ServiceManager -- Add pgrep/pmatch methods and import them
 111 Shell -- Write #su(user, *command) as a wrapper around #sh
 101 Shell -- Expand glob patterns, e.g. chown_R(500, 500, "*")
 100 Edit -- Display summary of edits, return with :details as [rv, list]

data/bin/aifield

@@ -29,9 +29,6 @@ Examples:
   # Dump the 'myapp' hash contents as YAML
   #{PROG} -y myapp#user
 
-  # Dump the 'myapp' hash contents as XML
-  #{PROG} -x myapp#user
-
 Options:
 EOB
   parser.on("-p", "--project PATH", "Set project path") do |v|
@@ -42,10 +39,6 @@ EOB
     opts[:yaml] = v
   end
 
-  parser.on("-X", "--xml", "Dump as XML") do |v|
-    opts[:xml] = v
-  end
-
   parser.on("-a", "--add TAGS", "Add list of space separated tags") do |v|
     opts[:tags] = [v.split].flatten
   end
@@ -75,10 +68,6 @@ EOB
     exit 1
   elsif opts[:yaml]
     puts result.to_yaml
-  elsif opts[:xml]
-    require 'active_support/core_ext/hash'
-    require 'active_support/core_ext/array'
-    puts result.to_xml
   else
     puts result.is_a?(String) ? result : result.inspect
   end

data/bin/aitag

@@ -19,11 +19,11 @@ OptionParser.new do |parser|
 Usage: #{PROG} [options] [arguments...]
 
 IMPORTANT:
-  #{PROG} can only match against tags specified in tags.yml. It cannot 
+  #{PROG} can only match against tags specified in tags.yml. It cannot
   match against automatically generated tags like the OS, architecture and such
   which are created at runtime by PlatformManager or AddressManager. So if you
   want to run a command against all Ubuntu servers, you must define them
-  explicitly in tags.yml. 
+  explicitly in tags.yml.
 
 Examples:
   # Load 'myproject' and see if it's tagged with 'apache' or 'svn':
@@ -38,13 +38,10 @@ Examples:
   # Dump the results of a query as YAML
   #{PROG} -Y myapp#user
 
-  # Dump the results of a query as XML
-  #{PROG} -X myapp#user
-
 Options:
 EOB
   parser.on("-s", "--tags", "List tags for this host") do |v|
-    opts[:tags] = v
+    opts[:list_tags] = v
   end
 
   parser.on("-f", "--tags_for HOST", "List tags for a specific host") do |v|
@@ -67,12 +64,8 @@ EOB
     opts[:yaml] = v
   end
 
-  parser.on("-X", "--xml", "Dump as XML") do |v|
-    opts[:xml] = v
-  end
-
   parser.on("-a", "--add TAGS", "Add list of space separated tags") do |v|
-    opts[:tags] = [v.split].flatten
+    opts[:add_tags] = [v.split].flatten
   end
 
   parser.on("-v", "--version", "Display version") do |v|
@@ -93,11 +86,11 @@ EOB
 
   interpreter = AutomateIt.new(
     :project => opts[:project],
-    :tags => opts[:tags]
+    :tags => opts[:add_tags]
   )
   result = nil
 
-  unless opts[:tags] or opts[:tags_for] or opts[:tagged?] or opts[:hosts_tagged_with]
+  unless opts[:list_tags] or opts[:tags_for] or opts[:tagged?] or opts[:hosts_tagged_with]
     if args.first
       opts[:tagged?] = args.first
     else
@@ -108,8 +101,8 @@ EOB
   end
 
   result = \
-    if opts[:tags]
-      interpreter.tags
+    if opts[:list_tags]
+      interpreter.tags.to_a.sort
     elsif opts[:tags_for]
       interpreter.tags_for(opts[:tags_for])
     elsif opts[:tagged?]
@@ -123,16 +116,16 @@ EOB
       result.inspect
     elsif opts[:yaml]
       result.to_yaml
-    elsif opts[:xml]
-      require 'active_support/core_ext/hash'
-      require 'active_support/core_ext/array'
-      result.to_xml
     else
       case result
-      when String: result
-      when Set: result.sort.to_a.join(' ')
-      when Array: result.sort.join(' ')
-      else result.inspect
+      when String
+        result
+      when Set
+        result.sort.to_a.join(' ')
+      when Array
+        result.sort.join(' ')
+      else
+        result.inspect
       end
     end
   )

data/helpers/cpan_wrapper.pl

@@ -1,21 +1,32 @@
-package CpanWrapper;
-use CPAN;
-use ExtUtils::Packlist;
-use ExtUtils::Installed;
+# This file can be used as both a Perl library (read the POD below) and a
+# stand-alone program (run it with "--help" for instructions).
 
 =head1 NAME
 
-CpanWrapper - Provides a simpler wrapper for CPAN package methods.
+CpanWrapper - Provides a simpler wrapper for the CPAN package manager.
 
 =head1 DESCRIPTION
 
-This module provides easy-to-use methods for performing typical tasks that the
-CPAN module makes difficult for some incomprehensible reason.
+This module provides easy-to-use methods for installing, uninstalling and
+querying the status of CPAN modules.
+
+=over
+
+=cut
+
+use warnings "all";
+
+package CpanWrapper;
+
+require CPAN;
+require ExtUtils::Packlist;
+require ExtUtils::Installed;
+require Tie::Handle;
 
 =head1 CLASS VARIABLES
 
 =item $CpanWrapper::DRYRUN
-  
+
 Should actions really happen? E.g., in dry-run mode, the uninstall will only
 pretend to delete files.
 
@@ -23,24 +34,28 @@ pretend to delete files.
 
 our $DRYRUN = 0;
 
-=item CpanWrapper->is_installed($module_name)
+=head1 CLASS METHODS
 
-Returns 1 if the module is installed, else 0.
+=item CpanWrapper->query($module_name)
 
-Example:
+Query the module and return 1 if it's installed, 0 if not.
 
-  CpanWrapper->is_installed('App::Ack')
 =cut
-sub is_installed {
+sub query {
   my($class, $module) = @_;
-  return $CPAN::META->has_inst($module);
+  no warnings;
+  my $result = $CPAN::META->has_inst($module);
+  use warnings "all";
+  return $result;
 }
 
 =item CpanWrapper->uninstall($module_name)
 
 Uninstall the module. Returns an array of files removed.
+
 =cut
 sub uninstall {
+  # /usr/local/lib/perl/5.8.8/auto/ack/.packlist
   my($class, $module) = @_;
   my $packlists = ExtUtils::Installed->new;
   my @result;
@@ -48,14 +63,19 @@ sub uninstall {
     push(@result, $file);
     unlink $file unless $DRYRUN;
   }
+  my $packlist = $packlists->packlist($module)->packlist_file();
+  push(@result, $packlist);
+  unlink $packlist unless $DRYRUN;
   return @result;
 }
 
 =item CpanWrapper->install($module_name)
 
 Install the module. Returns 0 if can't find module.
+
 =cut
 sub install {
+  no warnings;
   my($class, $module) = @_;
   tie *NO, 'NoHandle';
   open(SAVEIN, ">&STDIN");
@@ -70,15 +90,16 @@ sub install {
   }
   open(STDIN, ">&SAVEIN");
   close NO;
+  use warnings "all";
   return $result;
 }
 
 =item NoHandle
 
 File handle that responds with "no" to all readline queries. This is used
-during the install process to reject CPAN's bad defaults.
+during the install process to reject CPAN's unreasonable defaults.
+
 =cut
-require Tie::Handle;
 package NoHandle;
 sub TIEHANDLE { my $self; bless \$self, shift }
 sub WRITE { die }
@@ -93,6 +114,107 @@ sub BINMODE { }
 sub EOF { 0 }
 sub TELL { }
 sub DESTROY { }
+
+#===[ command-line usage ]==============================================
+
 package main;
+if ($0 eq __FILE__) {
+  sub usage {
+    my($message) = @_;
+    print <<HERE;
+USAGE: cpan_wrapper.pl [OPTIONS] ACTION module [modules...]
+
+OPTIONS:
+--help
+    Show this help
+--quiet
+    Don't print anything other than what CPAN generates
+--dryrun
+    Don't actually perform actions, just pretend to
+
+ACTIONS:
+
+--install
+    Install modules
+--uninstall
+    Uninstall modules
+--query
+    Display which packages are installed and which aren't
+HERE
+
+    if ($message) {
+      print "ERROR: $message\n";
+      exit 1;
+    } else {
+      exit 0;
+    }
+  }
+
+  use Getopt::Long;
+  our $quiet = 0;
+  our $dryrun = 0;
+  our $help = 0;
+  our $install = 0;
+  our $uninstall = 0;
+  our $query = 0;
+  GetOptions(
+    'quiet' => \$quiet,
+    'dryrun' => \$dryrun,
+    'n' => \$dryrun,
+    'help' => \$help,
+    'install' => \$install,
+    'uninstall' => \$uninstall,
+    'query' => \$query,
+    'q' => \$query
+  );
+  my @modules = @ARGV;
+
+  usage(0) if 1 == $help;
+  usage("No action specified") unless $install or $uninstall or $query;
+  usage("No modules specified") unless $#modules >= 0;
+
+  if ($install) {
+    foreach my $module (@modules) {
+      if (CpanWrapper->install($module)) {
+        print "* Installed: $module\n" unless $quiet;
+      } else {
+        print "! Can't find CPAN module: $module\n";
+        exit 1
+      }
+    }
+  } elsif ($uninstall) {
+    foreach my $module (@modules) {
+      print "* Uninstalling module: $module\n" unless $quiet;
+
+      my(@files) = CpanWrapper->uninstall($module);
+      foreach my $file (@files) {
+        print "- $file\n" unless $quiet;
+      }
+    }
+  } elsif ($query) {
+    my @available;
+    my @unavailable;
+    foreach my $module (@modules) {
+      if (CpanWrapper->query($module)) {
+        push(@available, $module);
+      } else {
+        push(@unavailable, $module);
+      }
+    }
+
+    sub print_contents {
+      my($name, @modules) = @_;
+      return if $#modules < 0;
+      print "$name:\n";
+      foreach my $module (@modules) {
+        print "  - $module\n";
+      }
+    }
+
+    print "--- %YAML:1.0\n";
+    print_contents 'available', @available;
+    print_contents 'unavailable', @unavailable;
+  }
+}
 
 1;