automateit 0.71102 → 0.71103

data.tar.gz.sig

@@ -1,2 +1 @@
-h�ɋ��r��b6���\�Dn�U��&R�U2˘��ǣQ (}��& ��J���}2���"��u�4�/)\ŒJ̽6�����OA�e
-�Z���3Ǩ��1P��{��q5��ʚ��s�NN"v����>`�w�p.�F����ر~�z0����#j
+V]�2��0��Y�����	L�������%^6&]�Ǎ���k�կY��

data/CHANGES.txt

@@ -1,3 +1,17 @@
+0.71103:
+    Date: Sat, 03 Nov 2007 01:26:13 -0700
+    Desc:
+    - (+) Added "aissh" command, provides an easy way to run commands on a group of hosts. For example, see if there's a Rails process running on all hosts matching the "rails_servers" tag: "aissh -p . rails_servers 'ps -ef | grep rails'"
+    - Improved PackageManager, it can now accept package names as Symbols.
+    - Improved AccountManager spec with additional examples for checking password changes.
+    - Improved AccountManager::NSCD with refactoring and additional tests.
+    - Improved AddressManager spec with additional tests for address conversion routines and code generation helpers.
+    - Improved Plugin spec with more checks against invalid managers and drivers, and unavailable dependencies.
+    - Improved ShellManager spec with more checks against hard links and symbolic links; for #cp when contents, modes or ownership changes; for #rm with :force option: for #umask with and without block, and with caught exceptions.
+    - Added spec for String#shell_escape.
+    - Added spec for Object's extensions for #unique_methods and #args_and_opts.
+    - Added spec for NestedError.
+
 0.71102:
     Date: Fri, 02 Nov 2007 02:59:41 -0700
     Desc:

data/Rakefile

@@ -82,50 +82,35 @@ class Numeric
   def commify() (s=self.to_s;x=s.length;s).rjust(x+(3-(x%3))).gsub(/(\d)(?=\d{3}+(\.\d*)?$)/,'\1,').strip end
 end
 
-desc "Display the lines of source code and how many lines were changed in the repository"
-task :loc => [:loclines, :locdiff, :locchurn, :sloc]
-
-desc "Display the lines of source code"
-task :loclines do
-  require 'find'
-  lines = 0
-  bytes = 0
-  Find.find(*%w(bin lib spec Rakefile ../web/Rakefile ../web/src )) do |path|
-    Find.prune if path.match(/.*(\b(.hg|.svn|CVS)\b|(.sw.?|.pyc)$)/)
-    next if File.directory?(path)
-    if path.match(/(\bbin\b|.*\.(env|pl|py|rb|rake|java|sql|ftl|jsp|xml|properties|css|rcss|html|rhtml|erb|po|haml|sass)$)/)
-      data = File.read(path)
-      bytes += data.size
-      ### lines += data.scan(/^.*\w.*$/).size # Skip spaces
-      lines += data.scan(/^\s*(?!#)\w.*$/).size # Skip blanks and comments
-    end
+namespace :loc do
+  desc "Display lines of code using loccount"
+  task :count do
+    sh "loccount bin/* lib/ spec/ examples/ *.rake"
   end
-  puts "Lines: "+lines.commify
-  puts "Bytes: "+bytes.commify
-end
 
-task :loccount do
-  sh ""
-end
+  desc "Display the lines of code changed in the repository"
+  task :diff do
+    if File.directory?(".hg")
+      puts "%s lines added and removed through SCM operations" % `hg log --patch`.scan(/^[+-][^+-].+/).size.commify
+    else
+      raise NotImplementedError.new("Sorry, this only works for a Mercurial checkout")
+    end
+  end
 
-desc "Display the lines of code changed in the repository"
-task :locdiff do
-  if File.directory?(".hg")
-    puts "%s lines added and removed through SCM operations" % `hg log --patch`.scan(/^[+-][^+-].+/).size.commify
-  else
-    raise NotImplementedError.new("Sorry, this only works for a Mercurial checkout")
+  desc "Display lines of churn"
+  task :churn do
+    require 'active_support'
+    puts "%s lines of Hg churn" % (`hg churn`.scan(/^[^\s]+\s+(\d+)\s/).flatten.map(&:to_i).sum).commify
   end
-end
 
-desc "Display lines of churn"
-task :locchurn do
-  require 'active_support'
-  puts "%s lines of Hg churn" % (`hg churn`.scan(/^[^\s]+\s+(\d+)\s/).flatten.map(&:to_i).sum).commify
+  desc "Display lines of code based on sloccount"
+  task :sloc do
+    sh "sloccount lib spec misc examples bin"
+  end
 end
 
-task :sloc do
-  sh "sloccount lib spec misc examples bin"
-end
+desc "Display the lines of source code and how many lines were changed in the repository"
+task :loc => ["loc:count", "loc:diff", "loc:churn", "loc:sloc"]
 
 #---[ RubyGems ]--------------------------------------------------------
 
@@ -172,22 +157,26 @@ namespace :gem do
   end
 end
 
+desc "Create a gem"
 task :gem do
   hoe(:gem)
 end
 
+desc "Publish to RubyForge"
 task :publish do
   automateit
   hoe("release VERSION=#{AutomateIt::VERSION}")
   Rake::Task[:after].invoke
 end
 
+desc "Tag a stable release"
 task :tag do
   automateit
   sh "hg tag #{AutomateIt::VERSION}"
   sh "hg tag -f stable"
 end
 
+desc "Push a stable release"
 task :push do
   sh "hg push -r stable ../app_stable"
 end
@@ -233,6 +222,7 @@ namespace :install do
   end
 end
 
+desc "Uninstall automateit gem"
 task :uninstall do
   automateit.package_manager.uninstall "automateit", :with => :gem
 end

data/bin/aissh

@@ -0,0 +1,93 @@
+#!/usr/bin/env ruby
+
+# XXX What can go wrong with this loading approach?
+libdir = File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
+if File.directory?(libdir) and File.exists?(File.join(libdir, "automateit.rb"))
+  $LOAD_PATH.unshift(libdir)
+end
+
+require 'rubygems'
+require 'optparse'
+require 'automateit'
+include AutomateIt::Constants
+
+OptionParser.new do |parser|
+  PROG = File.basename($0)
+  opts = {}
+  parser.banner = <<EOB
+#{PROG} - tool for running command via SSH on hosts matching AutomateIt tags
+
+Usage: #{PROG} [options] [arguments...]
+
+IMPORTANT:
+  #{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.
+
+Examples:
+  # Read tags from project in current directory and run "ls" on all hosts
+  # tagged with "apache_servers" or "rails_servers":
+  #{PROG} --project . 'apache_servers | rails_servers' ls
+
+  # Preview SSH commands needed to run "ls" on "apache_servers":
+  #{PROG} -p . -n apache_servers ls
+
+  # Pass arguments to "ls", rather than #{PROG}:
+  #{PROG} -p . -n apache_servers -- ls -la
+
+  # Same as previous but using a quoted string:
+  #{PROG} -p . -n apache_servers 'ls -la'
+
+  # Execute a command which requires the target server to redirect output:
+  #{PROG} -p . -n apache_servers 'ps -ef | grep apache'
+
+Options:
+EOB
+  parser.on("-n", "--preview", "Preview without executing commands") do |v|
+    opts[:preview] = v
+  end
+
+  parser.on("-p", "--project PATH", "Set project path") do |v|
+    opts[:project] = v
+  end
+
+  parser.on("-q", "--quiet", "Don't display commands executed") do |v|
+    opts[:verbosity] = Logger::ERROR
+  end
+
+  parser.on("-v", "--version", "Display version") do |v|
+    puts AutomateIt::VERSION
+    exit 0
+  end
+
+  parser.on("-h", "--help", "Display this help message") do |v|
+    puts parser
+    exit
+  end
+
+  args = parser.parse!.dup
+  query = args.shift
+  commands = args
+
+  if commands.blank?
+    puts parser
+    puts "\nERROR: No commands specified"
+    exit 1
+  end
+
+  interpreter = AutomateIt.new(
+    :project => opts[:project],
+    :verbosity => opts[:verbosity]
+  )
+
+  interpreter.preview true if opts[:preview]
+
+  for host in interpreter.hosts_tagged_with(query).sort
+    cmd = "ssh %s %s" % [host, commands.join(" ").shell_escape]
+    interpreter.sh(cmd)
+  end
+
+  exit 0
+end

data/bin/aitag

@@ -18,6 +18,13 @@ OptionParser.new do |parser|
 
 Usage: #{PROG} [options] [arguments...]
 
+IMPORTANT:
+  #{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. 
+
 Examples:
   # Load 'myproject' and see if it's tagged with 'apache' or 'svn':
   #{PROG} -p myproject 'apache || svn'

data/lib/automateit.rb

@@ -35,6 +35,7 @@ Hash.module_eval{include ActiveSupport::CoreExtensions::Hash::Keys}
 # Extensions
 require 'ext/object.rb'
 require 'ext/metaclass.rb'
+require 'ext/shell_escape.rb'
 
 # Helpers
 require 'hashcache'
@@ -42,6 +43,7 @@ require 'queued_logger'
 require 'tempster'
 require 'helpful_erb'
 require 'nested_error'
+require 'nitpick'
 
 # Core
 require 'automateit/root'

data/lib/automateit/account_manager/etc.rb

@@ -15,8 +15,8 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
   # the 'etc' module?
   def self.has_etc?
     begin
-      require './spec/integration/account_manager_spec.rb:1etc'
-      return defined?(Etc)
+      require 'etc'
+      return defined?(::Etc)
     rescue LoadError
       return false
     end
@@ -24,7 +24,7 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
   
   # Alias for AccountManager::Etc.has_etc?
   def has_etc?
-    self.has_etc?
+    self.class.has_etc?
   end
 
   #.......................................................................

data/lib/automateit/account_manager/nscd.rb

@@ -3,7 +3,7 @@
 # AccountManager driver for invalidating records stored in the NSCD, Name
 # Service Cache Daemon, found on Unix-like systems.
 class ::AutomateIt::AccountManager::NSCD < ::AutomateIt::AccountManager::BaseDriver
-  depends_on :programs => %w(nscd ps), 
+  depends_on :programs => %w(nscd ps),
     :callbacks => [lambda{`ps -ef`.match(%r{/usr/sbin/nscd$})}]
 
   def suitability(method, *args) # :nodoc:
@@ -11,18 +11,21 @@ class ::AutomateIt::AccountManager::NSCD < ::AutomateIt::AccountManager::BaseDri
     return available? ? 5 : 0
   end
 
+  # Returns the NSCD database for the specified shorthand +query+.
+  def database_for(query)
+    case query.to_sym
+    when :user, :users, :passwd, :password
+      :passwd
+    when :group, :groups
+      :group
+    else
+      raise ArgumentError.new("Unknown cache database: #{query}")
+    end
+  end
+
   def invalidate(database)
     return false unless available?
 
-    name = \
-      case database.to_sym
-      when :user, :users, :passwd
-        :passwd
-      when :group, :groups
-        :group
-      else
-        raise ArgumentError.new("Unknown cache database: #{database}")
-      end
-    interpreter.sh("nscd -i #{name}")
+    interpreter.sh("nscd -i #{database_for(database)}")
   end
 end

data/lib/automateit/address_manager/base.rb

@@ -155,7 +155,7 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
     ipcmd = "ifconfig"
     ipcmd << " " << _interface_and_label(opts)
     if helper_opts[:prepend]
-      ipcmd << " " << helper_opts[:prepend].join(" ")
+      ipcmd << " " << [helper_opts[:prepend]].flatten.join(" ")
     end
     ipcmd << " %s" % opts[:address]
     ipcmd << " netmask %s" % opts[:mask] if opts[:mask]
@@ -164,7 +164,7 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
       ipcmd << " down" if action == :del
     end
     if helper_opts[:append]
-      ipcmd << " " << helper_opts[:append].join(" ")
+      ipcmd << " " << [helper_opts[:append]].flatten.join(" ")
     end
     return ipcmd
   end

data/lib/automateit/interpreter.rb

@@ -82,6 +82,8 @@ module AutomateIt
   # how to more easily dispatch commands from your program to the Interpreter
   # instance.
   class Interpreter < Common
+    include Nitpick
+
     # Plugin instance that instantiated the Interpreter.
     attr_accessor :parent
     private :parent
@@ -627,24 +629,5 @@ module AutomateIt
       text = ::HelpfulERB.new(template).result(binding)
       object.instance_eval(text)
     end
-
-    # Use to manage nitpick message for debugging AutomateIt internals.
-    #
-    # Arguments:
-    # * nil -- Returns boolean of whether nitpick messages will be displayed.
-    # * Boolean -- Sets nitpick state.
-    # * String or Symbol -- Displays nitpick message if state is on.
-    #
-    # Example:
-    #   nitpick true
-    #   nitpick "I'm nitpicking"
-    def nitpick(value=nil)
-      case value
-      when NilClass: @nitpick
-      when TrueClass, FalseClass: @nitpick = value
-      when String, Symbol: puts "%% #{value}" if @nitpick
-      else raise TypeError.new("Unknown nitpick type: #{value.class}")
-      end
-    end
   end
 end

data/lib/automateit/package_manager.rb

@@ -222,6 +222,8 @@ class AutomateIt::PackageManager::BaseDriver < AutomateIt::Plugin::Driver
       result = packages.map(&:to_s).grep(LIST_NORMALIZER_RE)
     when Hash
       result = packages.stringify_keys
+    when Symbol, String
+      result = packages.to_s
     else
       raise TypeError.new("Unknown input type: #{packages.class}")
     end

data/lib/automateit/plugin/driver.rb

@@ -185,7 +185,7 @@ module AutomateIt
                 when :callbacks
                   item.call() ? true : false
                 else
-                  raise "unknown kind: #{kind}"
+                  raise TypeError.new("Unknown kind: #{kind}")
                 end
               unless present
                 all_present = false

data/lib/automateit/plugin/manager.rb

@@ -199,12 +199,7 @@ module AutomateIt
       # instance found, else raises a NotImplementedError if no suitable driver
       # is found.
       def driver_for(method, *args, &block)
-        begin
-          driver, level = driver_suitability_levels_for(method, *args, &block).sort_by{|k,v| v}.last
-        rescue IndexError
-          driver = nil
-          level = -1
-        end
+        driver, level = driver_suitability_levels_for(method, *args, &block).sort_by{|k,v| v}.last
         if driver and level > 0
           return @drivers[driver]
         else

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.71102")
+  VERSION=Gem::Version.new("0.71103")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/tag_manager/tag_parser.rb

@@ -2,13 +2,13 @@
 #
 # Helper class for parsing tags. Not useful for users -- for internal use only.
 class AutomateIt::TagManager::TagParser
+  include Nitpick
+
   attr_accessor :struct
-  attr_accessor :is_trace # FIXME replace is_trace with nitpick
 
   # Create a parser for the +struct+, a hash of tag keys to values with arrays of items.
-  def initialize(struct, is_trace=false)
+  def initialize(struct)
     self.struct = struct
-    self.is_trace = is_trace
     normalize!
   end
 
@@ -33,11 +33,6 @@ class AutomateIt::TagManager::TagParser
     end
   end
 
-  # Display debugging information if +is_trace+ is enabled.
-  def trace(msg)
-    puts msg if is_trace
-  end
-
   HOSTS_FOR_VALUE = /(.+?)/
   HOSTS_FOR_INCLUDE_TAG_RE = /^INCLUDE_TAG #{HOSTS_FOR_VALUE}$/
   HOSTS_FOR_EXCLUDE_TAG_RE = /^EXCLUDE_TAG #{HOSTS_FOR_VALUE}$/
@@ -45,27 +40,29 @@ class AutomateIt::TagManager::TagParser
 
   # Return array of hosts for the +tag+.
   def hosts_for(tag)
-    raise IndexError.new("Unknown tag - #{tag}") unless struct[tag]
-    trace "\nAA %s" % tag
+    raise IndexError.new("Unknown tag - #{tag}") unless struct.has_key?(tag)
+    return [] if struct[tag].nil? # Tag has no leaves
+
+    nitpick "\nAA %s" % tag
     hosts = Set.new
     for item in struct[tag]
       case item
       when HOSTS_FOR_INCLUDE_TAG_RE
-        trace "+g %s" % $1
+        nitpick "+g %s" % $1
         hosts.merge(hosts_for($1))
       when HOSTS_FOR_EXCLUDE_TAG_RE
-        trace "-g %s" % $1
+        nitpick "-g %s" % $1
         hosts.subtract(hosts_for($1))
       when HOSTS_FOR_EXCLUDE_HOST_RE
-        trace "-h %s" % $1
+        nitpick "-h %s" % $1
         hosts.delete($1)
       else
-        trace "+h %s" % item
+        nitpick "+h %s" % item
         hosts << item
       end
     end
     result = hosts.to_a
-    trace "ZZ %s for %s" % [result.inspect, tag]
+    nitpick "ZZ %s for %s" % [result.inspect, tag]
     return result
   end
 
@@ -90,7 +87,7 @@ class AutomateIt::TagManager::TagParser
   end
 
   # Expand the +struct+.
-  def self.expand(struct, is_trace=false)
-    self.new(struct, is_trace).expand
+  def self.expand(struct)
+    self.new(struct).expand
   end
 end