automateit 0.71104 → 0.71111

data/CHANGES.txt

@@ -1,3 +1,10 @@
+0.71111:
+    Date: Sun, 11 Nov 2007 06:06:27 -0800
+    Desc:
+    - (+) Improved AccountManager::Etc detection logic, it now tries to run commands rather than relying on blacklists. This better supports Windows and JRuby.
+    - (+) Added ShellManager::WhichWindows, it simulates the #which command on Windows.
+    - WARNING: AccountManager::POSIX#add_groups_to_user and add_users_to_group
+
 0.71104:
     Date: Sun, 04 Nov 2007 21:01:10 -0800
     Desc:
@@ -62,11 +69,11 @@ Thanks for the report, David Brewer.
 0.71030:
     Date: Tue, 30 Oct 2007 01:43:02 -0700
     Desc:
-    - (%) Fixed bug in AddressManager#add_user when called with multiple groups. Improved AddressManager spec. 
+    - (%) Fixed bug in AddressManager#add_user when called with multiple groups. Improved AddressManager spec.
     - (+) Added documentation to Project explaining how to partition recipes, and run recipes from other recipes.
-    - (+) Added AddressManager::POSIX which provides support for Linux and SunOS, and eliminated the OS-specific drivers for these. 
-    - Added AddressManager::NSCD by extracting methods from old OS-specific drivers. 
-    - Added AddressManager::PasswdExpect which uses Expect for much more reliable password changes. 
+    - (+) Added AddressManager::POSIX which provides support for Linux and SunOS, and eliminated the OS-specific drivers for these.
+    - Added AddressManager::NSCD by extracting methods from old OS-specific drivers.
+    - Added AddressManager::PasswdExpect which uses Expect for much more reliable password changes.
     - Improved AddressManager::PasswdPty by adding retry capability.
 
 0.71021:

data/TODO.txt

@@ -3,8 +3,12 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 #===[ App ]=============================================================
 
 #---[ Quality issues ]--------------------------------------------------
-111 ServiceManager -- Create new #stop_and_start, and #restart as #tell wrapper
+!!! ServiceManager -- Create new #stop_and_start, and add new #restart as #tell wrapper
 111 ServiceManager -- Write tests for start_and_enable and such
+
+!!! AccountManager -- Solaris fails 5% of the time on the last spec.
+!!! AccountManager -- OpenBSD stalls if it thinks a password's quality sucks.
+!!! AccountManager -- OpenBSD fails "should add groups to a user" and "should add users to group"
 111 PackageManager -- Improve PEAR spec by having it check files with and without channel URL
 111 AccountManager::NSCD -- Uses "ps -ef", needs abstraction
 
@@ -25,7 +29,7 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 000 Shell -- Incorporate which.cmd so #which can work on Windows
 
 000 Interpreter#invoke and HelpfulERB -- Extract error context code into class
-000 Interpeter -- Implement #clear, #dirty? #track_changes 
+000 Interpeter -- Implement #clear, #dirty? #track_changes
 000 DatabaseManager -- Design
 000 SourceManager -- Design
 000 ScheduleManager -- Design

data/lib/automateit/account_manager/base.rb

@@ -50,6 +50,7 @@ class ::AutomateIt::AccountManager::BaseDriver < ::AutomateIt::Plugin::Driver
     end
 
     block.call(username, opts)
+    manager.invalidate(:passwd)
 
     passwd_opts = {:quiet => opts[:quiet]}
     manager.passwd(username, opts[:passwd], passwd_opts) if opts[:passwd]

data/lib/automateit/account_manager/etc.rb

@@ -5,26 +5,17 @@
 # modifications, such as +add_user+. Platform-specific drivers inherit from
 # this class and provide methods that perform modifications.
 class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDriver
-  depends_on :callbacks => [lambda{AutomateIt::AccountManager::Etc.has_etc?}]
+  depends_on :libraries => %w(etc),
+    :callbacks => lambda{
+      begin
+        ! ::Etc.getpwnam(::Etc.getlogin).nil?
+      rescue
+        false
+      end
+    }
 
   def suitability(method, *args) # :nodoc:
-    return 1
-  end
-  
-  # Does this platform provide a way of querying users and groups through 
-  # the 'etc' module?
-  def self.has_etc?
-    begin
-      require 'etc'
-      return defined?(::Etc)
-    rescue LoadError
-      return false
-    end
-  end
-  
-  # Alias for AccountManager::Etc.has_etc?
-  def has_etc?
-    self.class.has_etc?
+    return available? ? 1 : 0
   end
 
   #.......................................................................
@@ -35,13 +26,13 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
   class UserQuery
     # See AccountManager#users
     def [](query)
-      Etc.endpwent
+      ::Etc.endpwent
       begin
         case query
         when String
-          return Etc.getpwnam(query)
+          return ::Etc.getpwnam(query)
         when Fixnum
-          return Etc.getpwuid(query)
+          return ::Etc.getpwuid(query)
         else
           raise TypeError.new("unknonwn type for query: #{query.class}")
         end
@@ -69,13 +60,13 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
   class GroupQuery
     # See AccountManager#groups
     def [](query)
-      Etc.endgrent
+      ::Etc.endgrent
       begin
         case query
         when String
-          return Etc.getgrnam(query)
+          return ::Etc.getgrnam(query)
         when Fixnum
-          return Etc.getgrgid(query)
+          return ::Etc.getgrgid(query)
         else
           raise TypeError.new("unknonwn type for query: #{query.class}")
         end
@@ -102,7 +93,7 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
     username = pwent.name
     result = Set.new
     result << groups[pwent.gid].name if groups[pwent.gid]
-    Etc.group do |grent|
+    ::Etc.group do |grent|
       result << grent.name if grent.mem.include?(username)
     end
     return result.to_a
@@ -117,13 +108,13 @@ class ::AutomateIt::AccountManager::Etc< ::AutomateIt::AccountManager::BaseDrive
   # See AccountManager#users_to_groups
   def users_to_groups
     result = {}
-    Etc.group do |grent|
+    ::Etc.group do |grent|
       grent.mem.each do |username|
         result[username] ||= Set.new
         result[username] << grent.name
       end
     end
-    Etc.passwd do |pwent|
+    ::Etc.passwd do |pwent|
       grent = groups[pwent.gid]
       unless grent
         log.fatal(PNOTE+"WARNING: User's default group doesn't exist: user %s, gid %s" % [pwent.name, pwent.gid])

data/lib/automateit/account_manager/passwd_pty.rb

@@ -11,8 +11,10 @@
 # changed using the AccountManager::PasswdExpect driver, which works properly.
 class ::AutomateIt::AccountManager::PasswdPTY < ::AutomateIt::AccountManager::BaseDriver
   depends_on \
-    :programs => %w(passwd),
-    :libraries => %w(open3 expect pty)
+    :programs => %w(passwd uname),
+    :libraries => %w(open3 expect pty),
+    # Something is horribly wrong with Ruby PTY on Sun
+    :callbacks => lambda { `uname -s`.strip !~ /sunos|solaris|openbsd|freebsd/i }
 
   def suitability(method, *args) # :nodoc:
     # Level must be higher than Linux

data/lib/automateit/account_manager/posix.rb

@@ -1,7 +1,7 @@
 # == AccountManager::POSIX
 #
 # A POSIX driver for the AccountManager.
-class ::AutomateIt::AccountManager::POSIX < ::AutomateIt::AccountManager::Etc
+class ::AutomateIt::AccountManager::POSIX < ::AutomateIt::AccountManager::BaseDriver
   depends_on :programs => %w(useradd usermod userdel groupadd groupmod groupdel)
 
   def suitability(method, *args) # :nodoc:
@@ -123,4 +123,16 @@ class ::AutomateIt::AccountManager::POSIX < ::AutomateIt::AccountManager::Etc
       end
     end
   end
+
+  # Dispatch common names to Etc, but don't define these methods here because
+  # that would make available? and suitability think these exist, when in fact,
+  # they're just wrappers.
+  def method_missing(symbol, *args, &block)
+    case symbol
+    when :users, :has_user?, :groups, :has_group?, :groups_for_user, :users_for_group, :users_to_groups
+      manager.send(symbol, *args, &block)
+    else
+      super(symbol, *args, &block)
+    end
+  end
 end

data/lib/automateit/constants.rb

@@ -3,6 +3,10 @@ module AutomateIt # :nodoc:
   #
   # Various constants.
   module AutomateIt::Constants
+    INSTALL_DIR = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
+    
+    HELPERS_DIR = File.join(INSTALL_DIR, "helpers")
+
     # Output prefix for command execution, e.g., "** ls -la"
     PEXEC = "** "
 

data/lib/automateit/plugin/driver.rb

@@ -174,13 +174,21 @@ module AutomateIt
                   when :directories
                     File.directory?(item)
                   when :programs
-                    # XXX Find less awkward way to check if a program exists. Can't use +shell_manager.which+ because that will use +dispatch+ and go into an infinite loop checking +available?+. The +which+ command isn't available on all platforms, so that failure must be handled as well.
-                    begin
-                      interpreter.shell_manager[:which].which!(item)
-                      true
-                    rescue ArgumentError, NotImplementedError, NoMethodError
-                      false
+                    # TODO Driver#available? - Find better way to locate the platform's #which driver and use it to check if a program exists. This is tricky because this #available? method is the one that handles detection, yet we have to bypass it.
+                    result = nil
+                    for variant in %w(unix windows)
+                      variant_token = "which_#{variant}".to_sym
+                      begin
+                        driver = interpreter.shell_manager[variant_token]
+                        result = driver.which!(item)
+                        ### puts "%s : %s for %s" % [variant, result, item]
+                        break
+                      rescue ArgumentError, NotImplementedError, NoMethodError => e
+                        # Exceptions are expected, only print for debugging
+                        ### puts e.inspect
+                      end
                     end
+                    result
                   when :requires, :libraries
                     begin
                       require item

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

data/lib/automateit/shell_manager.rb

@@ -267,12 +267,26 @@ end
 #
 # Base class for all ShellManager drivers.
 class AutomateIt::ShellManager::BaseDriver < AutomateIt::Plugin::Driver
+  # Returns derived filename to use as a peer given the +source+ and +target+.
+  # This is necessary for differentiating between directory and file targets.
+  #
+  # For example:
+  #
+  #   # Get the peer for an extant target directory:
+  #   peer_for("foo", "/tmp") # => "/tmp/foo"
+  #
+  #   # Get the peer for anything else:
+  #   peer_for("foo", "/bar") # => "/bar"
+  def peer_for(source, target)
+    return FileUtils.send(:fu_each_src_dest0, source, target){|a, b| b}
+  end
+
+protected
   def _replace_owner_with_user(opts)
     value = opts.delete(:owner)
     opts[:user] = value  if value and not opts[:user]
     return opts
   end
-  protected :_replace_owner_with_user
 
   # Returns hash of verbosity and preview settings for FileUtils commands.
   def _fileutils_opts
@@ -281,7 +295,6 @@ class AutomateIt::ShellManager::BaseDriver < AutomateIt::Plugin::Driver
     opts[:noop] = true if preview?
     return opts
   end
-  protected :_fileutils_opts
 
   # Return array of all the directory's top-level contents, including hidden
   # files with "." prefix on UNIX. Directories are returned just as a name,
@@ -289,26 +302,15 @@ class AutomateIt::ShellManager::BaseDriver < AutomateIt::Plugin::Driver
   def _directory_contents(directory)
     return Dir[directory+"/{,.}*"].reject{|t| t =~ /(^|#{File::SEPARATOR})\.{1,2}$/}
   end
-  protected :_directory_contents
-
-  # Returns derived filename to use as a peer given the +source+ and +target+.
-  # This is necessary for differentiating between directory and file targets.
-  #
-  # For example:
-  #
-  #   # Get the peer for an extant target directory:
-  #   peer_for("foo", "/tmp") # => "/tmp/foo"
-  #
-  #   # Get the peer for anything else:
-  #   peer_for("foo", "/bar") # => "/bar"
-  def peer_for(source, target)
-    return FileUtils.send(:fu_each_src_dest0, source, target){|a, b| b}
-  end
 end
 
 # Drivers
 require 'automateit/shell_manager/portable'
-require 'automateit/shell_manager/which'
+
+require 'automateit/shell_manager/which_base'
+require 'automateit/shell_manager/which_unix'
+require 'automateit/shell_manager/which_windows'
+
 require 'automateit/shell_manager/base_link'
 require 'automateit/shell_manager/symlink'
 require 'automateit/shell_manager/link'

data/lib/automateit/shell_manager/which_base.rb

@@ -0,0 +1,30 @@
+# == ShellManager::WhichBase
+#
+# Provides abstract helper methods for other drivers implementing the +which+.
+class AutomateIt::ShellManager::WhichBase < AutomateIt::ShellManager::BaseDriver
+  abstract_driver
+
+  def suitability(method, *args) # :nodoc:
+    # Level must be higher than Portable
+    return available? ? 2 : 0
+  end
+
+  # See ShellManager#which!
+  def which!(command)
+    result = which(command)
+    if result.nil?
+      raise ArgumentError.new("command not found: #{command}")
+    else
+      true
+    end
+  end
+
+protected
+
+  def _which_helper(&block)
+    data = block.call
+    data.strip! if data
+    return (! data.blank? && File.exists?(data)) ? data : nil
+  end
+
+end

data/lib/automateit/shell_manager/which_unix.rb

@@ -0,0 +1,16 @@
+# == ShellManager::WhichUnix
+#
+# A ShellManager driver providing access to the +which+ command found on
+# Unix-like systems.
+class AutomateIt::ShellManager::WhichUnix < AutomateIt::ShellManager::WhichBase
+  depends_on :programs => %w(which)
+
+  # Inherits WhichBase#suitability
+
+  # See ShellManager#which
+  def which(command)
+    _which_helper do
+      `which #{command} 2>&1`
+    end
+  end
+end

data/lib/automateit/shell_manager/which_windows.rb

@@ -0,0 +1,20 @@
+# == ShellManager::WhichWindows
+#
+# A ShellManager driver providing access to +which+ command by faking it on
+# Windows systems.
+class ::AutomateIt::ShellManager::WhichWindows < ::AutomateIt::ShellManager::WhichBase
+  WHICH_HELPER = File.join(::AutomateIt::Constants::HELPERS_DIR, "which.cmd")
+
+  # FIXME how to detect windows through Java?
+  depends_on :callbacks => lambda { RUBY_PLATFORM =~ /mswin/i }
+
+  # Inherits WhichBase#suitability
+
+  # See ShellManager#which
+  def which(command)
+    _which_helper do
+      data = `#{WHICH_HELPER} #{command} 2>&1`
+    end
+  end
+end
+

data/spec/integration/account_manager_spec.rb

@@ -4,7 +4,7 @@ if not INTERPRETER.euid?
   puts "NOTE: Can't check 'euid' on this platform, #{__FILE__}"
 elsif not INTERPRETER.superuser?
   puts "NOTE: Must be root to check #{__FILE__}"
-elsif not INTERPRETER.account_manager.available?(:add_user)
+elsif (INTERPRETER.account_manager.available?(:users) && INTERPRETER.account_manager.available?(:add_user)) != true
   puts "NOTE: Can't find AccountManager for this platform, #{__FILE__}"
 else
   describe AutomateIt::AccountManager do
@@ -20,7 +20,7 @@ else
       # Some OSes are limited to 8 character names :(
       @username =  "aitestus"
       @groupname = "aitestgr"
-      @password = "automateit"
+      @password = "WejVotyejik2"
 
       begin
         raise "User named '#{@username}' found. If this isn't a real user, delete it so that the test can contineu. If this is a real user, change the spec to test with a user that shouldn't exist." if @m.users[@username]
@@ -54,7 +54,7 @@ else
       # work around this by using a directory we know can be used
       home = INTERPRETER.tagged?(:sunos) ? "/var/tmp/#{@username}" : nil
 
-      defaults = { :passwd => "asdf", :shell => "/bin/false", :home => home,
+      defaults = { :passwd => "skosk8osWu", :shell => "/bin/false", :home => home,
         :quiet => @quiet }
 
       return @m.add_user(@username, defaults.merge(opts))
@@ -69,12 +69,6 @@ else
       return @m.add_group(@groupname, :members => @username)
     end
 
-    unless INTERPRETER.tagged?("windows | darwin")
-      it "should have Etc support on Unix-like platforms" do
-        @m.driver_for(:users).should have_etc
-      end
-    end
-
     it "should find root user" do
       entry = @m.users["root"]
       entry.should_not be_nil
@@ -267,12 +261,15 @@ else
     def change_password_with(object)
       add_user if @independent
 
-      # TODO This isn't portable
       def extract_pwent(username)
-        for filename in %w(/etc/shadow /etc/passwd)
+        # TODO Not portable.
+        for filename in %w(/etc/master.passwd /etc/shadow /etc/passwd)
           next unless File.exist?(filename)
           return File.read(filename).split(/\n/).grep(/^#{username}\b/)
         end
+
+        # Fails on SunOS which returns "x"
+        #::Etc.getpwnam(username).passwd
       end
 
       before = extract_pwent(@username)

data/spec/integration/shell_manager_spec.rb

@@ -15,12 +15,18 @@ describe AutomateIt::ShellManager, " with sh and which" do
   it_should_behave_like "AutomateIt::ShellManager"
 
   begin
-    INTERPRETER.which("true")
-    INTERPRETER.which("false")
+    if INTERPRETER.tagged?(:windows)
+      it "should run shell commands and detect their exit status (sh)" do
+        @m.sh("dir > nul").should be_true
+      end
+    else
+      INTERPRETER.which!("true")
+      INTERPRETER.which!("false")
 
-    it "should run shell commands and detect their exit status (sh)" do
-      @m.sh("true").should be_true
-      @m.sh("false").should be_false
+      it "should run shell commands and detect their exit status (sh)" do
+        @m.sh("true").should be_true
+        @m.sh("false").should be_false
+      end
     end
   rescue NotImplementedError
     puts "NOTE: Can't check 'sh' on this platform, #{__FILE__}"
@@ -30,7 +36,8 @@ describe AutomateIt::ShellManager, " with sh and which" do
     puts "NOTE: Can't use 'which' on this platform in #{__FILE__}"
   else
     it "should find which program is in the path (which)" do
-      @m.which("sh").match(/.\/sh$/).nil?.should be_false
+      cmd = "ruby"
+      @m.which(cmd).match(/#{cmd}/).nil?.should be_false
     end
 
     it "should not find programs that aren't in the path (which)" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71104"
-date: 2007-11-04 00:00:00 -07:00
+  version: "0.71111"
+date: 2007-11-12 00:00:00 -08:00
 summary: AutomateIt is an open source tool for automating the setup and maintenance of servers, applications and their dependencies.
 require_paths: 
 - lib
@@ -119,12 +119,12 @@ files:
 - lib/automateit/service_manager/sysv.rb
 - lib/automateit/service_manager/chkconfig.rb
 - lib/automateit/service_manager/update_rcd.rb
+- lib/automateit/account_manager/posix.rb
 - lib/automateit/account_manager/nscd.rb
 - lib/automateit/account_manager/base.rb
+- lib/automateit/account_manager/etc.rb
 - lib/automateit/account_manager/passwd_expect.rb
-- lib/automateit/account_manager/posix.rb
 - lib/automateit/account_manager/passwd_pty.rb
-- lib/automateit/account_manager/etc.rb
 - lib/automateit/platform_manager/debian.rb
 - lib/automateit/platform_manager/struct.rb
 - lib/automateit/platform_manager/windows.rb
@@ -143,10 +143,12 @@ files:
 - lib/automateit/address_manager/freebsd.rb
 - lib/automateit/address_manager/openbsd.rb
 - lib/automateit/shell_manager/portable.rb
-- lib/automateit/shell_manager/which.rb
 - lib/automateit/shell_manager/symlink.rb
 - lib/automateit/shell_manager/link.rb
 - lib/automateit/shell_manager/base_link.rb
+- lib/automateit/shell_manager/which_windows.rb
+- lib/automateit/shell_manager/which_unix.rb
+- lib/automateit/shell_manager/which_base.rb
 - lib/automateit/tag_manager/struct.rb
 - lib/automateit/tag_manager/yaml.rb
 - lib/automateit/tag_manager/tag_parser.rb
@@ -158,7 +160,6 @@ files:
 - misc/index_gem_repository.rb
 - misc/setup_rubygems.sh
 - misc/setup_egg.rb
-- misc/which.cmd
 - misc/setup_gem_dependencies.sh
 - misc/setup_ruby-dbi.rb
 - spec/spec_helper.rb

data/lib/automateit/shell_manager/which.rb

@@ -1,25 +0,0 @@
-# == ShellManager::Which
-#
-# A ShellManager driver providing access to the +which+ command found on
-# Unix-like systems.
-class AutomateIt::ShellManager::Which < AutomateIt::ShellManager::BaseDriver
-  depends_on :programs => %w(which)
-
-  def suitability(method, *args) # :nodoc:
-    # Level must be higher than Portable
-    return available? ? 2 : 0
-  end
-
-  # See ShellManager#which
-  def which(command)
-    data = `which "#{command}" 2>&1`.chomp
-    return (! data.blank? && File.exists?(data)) ? data : nil
-  end
-
-  # See ShellManager#which!
-  def which!(command)
-    if which(command).nil?
-      raise ArgumentError.new("command not found: #{command}")
-    end
-  end
-end

data/misc/which.cmd

@@ -1,6 +0,0 @@
-@ rem "which" workalike for Windows. Searches current directory and PATH for all extensions, stops after first match, and returns meaningful exit value for "system" or "ERRORLEVEL" checks.
-@setlocal
-@set P2=.;%PATH%
-@for %%e in (%PATHEXT%) do @for %%i in (%1%%e) do @if NOT "%%~$P2:i"=="" echo %%~$P2:i && goto end
-@exit 1
-:end