automateit 0.71103 → 0.71104

data/CHANGES.txt

@@ -1,3 +1,9 @@
+0.71104:
+    Date: Sun, 04 Nov 2007 21:01:10 -0800
+    Desc:
+    - (%) Fixed bugs in startup sequence when run on Microsoft Windows. Added support for Vista.
+    - (%) Fixed bugs encountered on Windows in Plugin::Driver. Dependency checks are now done in specific order and stop as soon as a missing dependency is detected.
+
 0.71103:
     Date: Sat, 03 Nov 2007 01:26:13 -0700
     Desc:

data/Hoe.rake

@@ -6,7 +6,7 @@ require 'automateit'
 
 HoeInclude = {
   :executables => Dir['bin/*'].reject{|t|t.match(/~/)}.map{|t|File.basename(t)},
-  :files => (%w(env.sh gpl.txt CHANGES.txt Hoe.rake Manifest.txt Rakefile README.txt TESTING.txt TODO.txt TUTORIAL.txt) + FileList["{bin,examples,docs,lib,misc,spec}/**/*"]).to_a.reject{|t| File.directory?(t)},
+  :files => (%w(add2path.sh gpl.txt CHANGES.txt Hoe.rake Manifest.txt Rakefile README.txt TESTING.txt TODO.txt TUTORIAL.txt) + FileList["{bin,examples,docs,lib,misc,spec}/**/*"]).to_a.reject{|t| File.directory?(t)},
   :test_files => FileList["{spec}/**/*"].to_a,
 }
 

data/Rakefile

@@ -1,6 +1,3 @@
-require 'spec/rake/spectask'
-require 'rake/gempackagetask'
-
 task :default => :spec
 
 #---[ Wrappers ]--------------------------------------------------------
@@ -27,6 +24,7 @@ end
 
 # Run rspec on the +files+
 def specify(*files)
+  require 'spec/rake/spectask'
   Spec::Rake::SpecTask.new(:spec_internal) do |t|
     t.rcov = @rcov
     t.rcov_opts = ['--text-summary', '--include', 'lib', '--exclude', 'spec,.irbrc']

data/TODO.txt

@@ -2,31 +2,34 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 
 #===[ App ]=============================================================
 
-BUGS
-- does service_manager.start_and_enable work as expected?
-
+#---[ Quality issues ]--------------------------------------------------
+111 ServiceManager -- Create new #stop_and_start, and #restart as #tell wrapper
+111 ServiceManager -- Write tests for start_and_enable and such
 111 PackageManager -- Improve PEAR spec by having it check files with and without channel URL
-111 aissh or aion -- Write command for running stuff against servers with ssh, e.g., "aissh rails_servers ls", which is basically a wrapper over "for t in aitag -w rails_servers; do echo $t; ssh $t "ls"; done"
+111 AccountManager::NSCD -- Uses "ps -ef", needs abstraction
+
+#---[ Development ]-----------------------------------------------------
 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]
-100 Shell -- Incorporate which.cmd so #which can work on Windows
-100 Interpreter#invoke and HelpfulERB -- Extract error context code into class
+100 Shell -- Consistently return single items or arrays, alter specs to match
+101 PackageManager::CPAN - Implement
 
-001 CPAN -- Write driver for PackageManager::CPAN
-001 FreeBSD -- Write driver for PackageManager::FreeBSD_Ports (or generic ::Ports?) and FreeBSD_Pkg
-000 Darwin -- Write drivers, e.g. PackageManager for Fink and MacPorts (or generic ::Ports?)
 000 Shell#chperm -- With symbolic mode, wrap `chmod -v` as temporary workaround?
-000 PackageManager -- Provide a way to specify desired versions and upgrade via recipes
-
-Solaris 10
-000 Create ServiceManager::SMF
-000 Create PackageManager::Blastwave
-000 Create PackageManager::SunOS_Pkg
-
-??? Shell -- Return false or list, never single item?
-??? Driver -- How to determine if a manager or driver method is available? Manager#available?, Manager#available and Driver#suitable? only say if it should be a default.
+001 PackageManager::FreeBSD_Ports - Implmen(or generic ::Ports?) and FreeBSD_Pkg
+000 Darwin -- Write drivers, e.g. PackageManager for Fink and MacPorts (or generic ::Ports?)
+000 PackageManager -- Upgrade or install specific versions
+000 PackageManager::Blastwave -- Implement
+000 PackageManager::SunOS_Pkg -- Implement
+000 ServiceManager::SMF -- Implement
+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 DatabaseManager -- Design
+000 SourceManager -- Design
+000 ScheduleManager -- Design
+000 Driver -- How to determine if a manager or driver method is available? Manager#available?, Manager#available and Driver#suitable? only say if it should be a default.
 
 #===[ Web ]=============================================================
 100 Index: Call for pilot users, driver authors

data/lib/automateit/account_manager/nscd.rb

@@ -4,7 +4,8 @@
 # Service Cache Daemon, found on Unix-like systems.
 class ::AutomateIt::AccountManager::NSCD < ::AutomateIt::AccountManager::BaseDriver
   depends_on :programs => %w(nscd ps),
-    :callbacks => [lambda{`ps -ef`.match(%r{/usr/sbin/nscd$})}]
+    # FIXME AccountManager.nscd - "ps -ef" isn't portable, may need to be "ps aux" or such
+    :callbacks => lambda{`ps -ef`.match(%r{/usr/sbin/nscd$})}
 
   def suitability(method, *args) # :nodoc:
     # Level must be higher than Portable

data/lib/automateit/address_manager/bsd.rb

@@ -8,7 +8,7 @@ class AutomateIt::AddressManager::BSD < AutomateIt::AddressManager::BaseDriver
   end
 
   depends_on :programs => %w(ifconfig uname),
-    :callbacks => lambda{`uname -s`.match(/openbsd|freebsd|sunos/i)}
+    :callbacks => lambda{`uname -s 2>&1`.match(/openbsd|freebsd|sunos/i)}
 
   def suitability(method, *args) # :nodoc:
     available? ? 2 : 0

data/lib/automateit/address_manager/freebsd.rb

@@ -8,10 +8,10 @@ class AutomateIt::AddressManager::FreeBSD < AutomateIt::AddressManager::BaseDriv
   end
 
   depends_on :programs => %w(ifconfig uname),
-    :callbacks => lambda{`uname -s`.match(/freebsd/i)}
+    :callbacks => lambda{`uname -s 2>&1`.match(/freebsd/i)}
 
   def suitability(method, *args) # :nodoc:
-    # Must be higher than ::BSD
+    # Must be higher than AddressManager::BSD
     available? ? 3 : 0
   end
 

data/lib/automateit/address_manager/openbsd.rb

@@ -8,10 +8,10 @@ class AutomateIt::AddressManager::OpenBSD < AutomateIt::AddressManager::BaseDriv
   end
 
   depends_on :programs => %w(ifconfig uname),
-    :callbacks => lambda{`uname -s`.match(/openbsd/i)}
+    :callbacks => lambda{`uname -s 2>&1`.match(/openbsd/i)}
 
   def suitability(method, *args) # :nodoc:
-    # Must be higher than ::BSD
+    # Must be higher than AddressManager::BSD
     available? ? 3 : 0
   end
 

data/lib/automateit/address_manager/sunos.rb

@@ -8,10 +8,11 @@ class AutomateIt::AddressManager::SunOS < AutomateIt::AddressManager::BaseDriver
   end
 
   depends_on :programs => %w(ifconfig uname),
-    :callbacks => lambda{`uname -s`.match(/sunos/i)}
+    :callbacks => lambda{`uname -s 2>&1`.match(/sunos/i)}
 
   def suitability(method, *args) # :nodoc:
-    available? ? 2 : 0
+    # Must be higher than AddressManager::BSD 
+    available? ? 3 : 0
   end
 
   # See AddressManager#add

data/lib/automateit/package_manager/gem.rb

@@ -5,16 +5,7 @@
 class AutomateIt::PackageManager::Gem < AutomateIt::PackageManager::BaseDriver
   depends_on \
     :programs => %w(gem), 
-    :callbacks => [lambda{
-      # TODO PackageManager::Gem -- Misleading #depends_on makes entire driver unavailable, although only #install requires PTY.
-      begin
-        require 'expect'
-        require 'pty'
-        return true
-      rescue LoadError
-        return false
-      end
-    }]
+    :libraries => %w(expect pty)
 
   def suitability(method, *args) # :nodoc:
     # Never select GEM as the default driver

data/lib/automateit/platform_manager/windows.rb

@@ -16,8 +16,15 @@ class AutomateIt::PlatformManager::Windows < AutomateIt::PlatformManager::Struct
     @struct[:os] = "windows"
     @struct[:arch] = ENV["PROCESSOR_ARCHITECTURE"]
     @struct[:distro] = "microsoft"
+
     # VER values: http://www.ss64.com/nt/ver.html
-    @struct[:release] = `ver`.strip.match(/Windows (\w+)/)[1].downcase
+    ver = `ver`.strip
+    if match = ver.match(/Windows (\w+)/)
+      @struct[:release] = match[1].downcase
+    elsif match = ver.match(/Windows \[Version 6\.0\./)
+      @struct[:release] = "vista"
+    end
+
     @struct
   end
   private :_prepare

data/lib/automateit/plugin/driver.rb

@@ -157,42 +157,55 @@ module AutomateIt
         elsif is_available.nil?
           all_present = true
           missing = {}
-          for kind in opts.keys
-          #IK# for kind in [:files, :directories, :programs, :callbacks, :requires, :libraries]
-            next unless opts[kind]
-            for item in [opts[kind]].flatten
-              present = \
-                case kind
-                when :files
-                  File.exists?(item)
-                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
-                  end
-                when :requires, :libraries
-                  begin
-                    require item
-                    true
-                  rescue LoadError
-                    false
+
+          # Check callbacks last
+          kinds = opts.keys
+          callbacks = kinds.delete(:callbacks)
+          kinds << callbacks if callbacks
+
+          begin
+            for kind in kinds
+              next unless opts[kind]
+              for item in [opts[kind]].flatten
+                present = \
+                  case kind
+                  when :files
+                    File.exists?(item)
+                  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
+                    end
+                  when :requires, :libraries
+                    begin
+                      require item
+                      true
+                    rescue LoadError
+                      false
+                    end
+                  when :callbacks
+                    item.call() ? true : false
+                  else
+                    raise TypeError.new("Unknown kind: #{kind}")
                   end
-                when :callbacks
-                  item.call() ? true : false
-                else
-                  raise TypeError.new("Unknown kind: #{kind}")
+                unless present
+                  all_present = false
+                  missing[kind] ||= []
+                  missing[kind] << item
+
+                  # Do not continue scanning if dependency is missed
+                  raise EOFError.new("break")
                 end
-              unless present
-                all_present = false
-                missing[kind] ||= []
-                missing[kind] << item
               end
             end
+          rescue EOFError => e
+            # Ignore expected "break" warning
+            raise e unless e.message == "break"
           end
           self.class._missing_dependencies = missing
           self.class._is_available = all_present

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

data/misc/setup_ruby-dbi.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env automateit
+
+# Install ruby-dbi package and the basic drivers
+
+package_manager.install <<-HERE, :with => :gem
+  postgres-pr
+  sqlite3-ruby
+  ### mysql # FIXME Fails because of compile dependencies
+HERE
+
+mktempdircd do
+  download "http://rubyforge.org/frs/download.php/12368/dbi-0.1.1.tar.gz"
+  sh "tar xvfz *.tar.gz"
+  extracted_to = Dir.entries(".").select{|t| t=~/\w+/ && File::directory?(t)}.first
+  cd extracted_to do
+    # FIXME mysql and sqlite fail due to compile dependencies
+    ### ruby setup.rb config --with=dbi,dbd_pg,dbd_mysql,dbd_sqlite && \
+    sh <<-HERE
+      ruby setup.rb config --with=dbi,dbd_pg && \
+      ruby setup.rb setup && \
+      ruby setup.rb install
+    HERE
+  end
+end

data/spec/integration/address_manager_spec.rb

@@ -159,6 +159,6 @@ else
       end
     end
   rescue NotImplementedError
-    puts "Can't find AddressManager for this platform, #{__FILE__}"
+    puts "NOTE: Can't find AddressManager for this platform, #{__FILE__}"
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71103"
-date: 2007-11-03 00:00:00 -07:00
+  version: "0.71104"
+date: 2007-11-04 00:00:00 -07:00
 summary: AutomateIt is an open source tool for automating the setup and maintenance of servers, applications and their dependencies.
 require_paths: 
 - lib
@@ -51,7 +51,7 @@ post_install_message:
 authors: 
 - Igal Koshevoy
 files: 
-- env.sh
+- add2path.sh
 - gpl.txt
 - CHANGES.txt
 - Hoe.rake
@@ -160,6 +160,7 @@ files:
 - misc/setup_egg.rb
 - misc/which.cmd
 - misc/setup_gem_dependencies.sh
+- misc/setup_ruby-dbi.rb
 - spec/spec_helper.rb
 - spec/breaker.rb
 - spec/unit/plugins_spec.rb

metadata.gz.sig

@@ -1 +1 @@
-/DS���U�8?�y�p!Df	x�K	�c�O,�+Ng?�9�#�a-�qU�6�9��h��icE�)�����SJ`ޑj��YqY@逿5�8��H
+GL4�J�u�|G9Cj�\��Z(�皛L��