automateit 0.71017 → 0.71021

data/CHANGES.txt

@@ -1,7 +1,15 @@
+0.71021:
+    Date: Sun, 21 Oct 2007 04:58:01 -0700
+    Desc:
+    - Added PlatformManager::OpenBSD.
+    - Added AddressManager::OpenBSD.
+    - Added AddressManager::FreeBSD.
+    - Added AddressManager::BSD which assists SunOS, FreeBSD and OpenBSD.
+
 0.71017:
     Date: Wed, 17 Oct 2007 00:24:24 -0700
     Desc:
-    - (%) Fixed, created workaround so AutomateIt can run using the newly-released ActiveSupport 1.4.4 (part of Rails 2.0 PR1), because it breaks backwards compatibility by depending on new #extract_options method.
+    - (%) Fixed, created workaround so AutomateIt can run using the newly-released ActiveSupport 1.4.4 (part of Rails 2.0 PR1), because this new library breaks backwards compatibility by depending on new #extract_options method.
 
 0.71012:
     Date: Fri, 12 Oct 2007 03:54:30 -0700

data/TODO.txt

@@ -2,12 +2,8 @@ KEY: Important? Urgent? Easy? 1=yes, 0=no
 
 #===[ App ]=============================================================
 
-f=finished
-d=disabled
-
 Solaris 10
-f Create PlatformManager::SunOS
-d Create AccountManager::SunOS and prevent ::Linux from being used because it has the same commands but with different args
+- Create AccountManager::SunOS
 - Create ServiceManager::SMF
 - Create PackageManager::Blastwave
 - Create PackageManager::SunPkg

data/lib/automateit/address_manager.rb

@@ -81,5 +81,8 @@ end
 # Drivers
 require 'automateit/address_manager/base'
 require 'automateit/address_manager/portable'
+require 'automateit/address_manager/bsd'
 require 'automateit/address_manager/linux'
 require 'automateit/address_manager/sunos'
+require 'automateit/address_manager/openbsd'
+require 'automateit/address_manager/freebsd'

data/lib/automateit/address_manager/base.rb

@@ -7,7 +7,7 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
   # See AddressManager#hostnames
   def hostnames()
     # NOTE: depends on driver's implementation of addresses
-    names = addresses.inject(Set.new) do |sum, address|
+    names = manager.addresses.inject(Set.new) do |sum, address|
       # Some addresses can't be resolved, bummer.
       sum.merge(Resolv.getnames(address)) rescue Resolv::ResolvError; sum
     end
@@ -33,9 +33,9 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
   def has?(opts)
     raise ArgumentError.new(":device or :address must be specified") unless opts[:device] or opts[:address]
     result = true
-    result &= interfaces.include?(opts[:device]) if opts[:device] and not opts[:label]
-    result &= interfaces.include?(opts[:device]+":"+opts[:label]) if opts[:device] and opts[:label]
-    result &= addresses.include?(opts[:address]) if opts[:address]
+    result &= manager.interfaces.include?(opts[:device]) if opts[:device] and not opts[:label]
+    result &= manager.interfaces.include?(opts[:device]+":"+opts[:label]) if opts[:device] and opts[:label]
+    result &= manager.addresses.include?(opts[:address]) if opts[:address]
     return result
   end
 
@@ -88,14 +88,14 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
     opts[:announcements] = opts[:announcements].to_i || AutomateIt::AddressManager::DEFAULT_ANNOUNCEMENTS
     raise SecurityError.new("you must be root") unless superuser?
     raise ArgumentError.new(":device and :address must be specified") unless opts[:device] and opts[:address]
-    return false if has?(opts)
+    return false if manager.has?(opts)
     block.call(opts)
     return true
   end
 
   # Helper for #remove method.
   def _remove_helper(opts, &block)
-    return false unless has?(opts)
+    return false unless manager.has?(opts)
     raise SecurityError.new("you must be root") unless superuser?
     raise ArgumentError.new(":device and :address must be specified") unless opts[:device] and opts[:address]
     return block.call(opts)
@@ -128,21 +128,44 @@ class AutomateIt::AddressManager::BaseDriver< AutomateIt::Plugin::Driver
     )
   end
 
-  def _ifconfig_helper(action, opts)
+  # Returns a string used to construct an ifconfig command, e.g.
+  #   ifconfig hme0 192.9.2.106 netmask 255.255.255.0 up
+  #   ifconfig hme0:1 172.40.30.4 netmask 255.255.0.0 up
+  #
+  # Options:
+  # * :device -- Interface, e.g., "eth0". String.
+  # * :label -- Alias label, e.g., "1". String.
+  # * :address -- IP address, e.g., "127.0.0.1". String.
+  # * :mask -- Netmask, e.g., "255.255.255.0" or 24. String or Fixnum.
+  #
+  # Helper options:
+  # * :append -- Array of strings to append to end of command, e.g., ["-alias"].
+  # * :prepend -- Array of strings to prepend to string, adding them after after "ifconfig", e.g., ["inet"].
+  # * :state -- Whether to list "up" and "down" in command. Defaults to true.
+  def _ifconfig_helper(action, opts, helper_opts={})
     _raise_unless_available
+
+    # Translate common names
     action = :del if action.to_sym == :remove
 
+    # Defaults
     _normalize_opts(opts)
-
-    ### ifconfig hme0 192.9.2.106 netmask 255.255.255.0 up
-    ### ifconfig hme0:1 172.40.30.4 netmask 255.255.0.0 up
+    helper_opts[:state] = true unless helper_opts[:state] == false
 
     ipcmd = "ifconfig"
     ipcmd << " " << _interface_and_label(opts)
+    if helper_opts[:prepend]
+      ipcmd << " " << helper_opts[:prepend].join(" ")
+    end
     ipcmd << " %s" % opts[:address]
     ipcmd << " netmask %s" % opts[:mask] if opts[:mask]
-    ipcmd << " up" if action == :add
-    ipcmd << " down" if action == :del
+    if helper_opts[:state]
+      ipcmd << " up" if action == :add
+      ipcmd << " down" if action == :del
+    end
+    if helper_opts[:append]
+      ipcmd << " " << helper_opts[:append].join(" ")
+    end
     return ipcmd
   end
 end

data/lib/automateit/address_manager/bsd.rb

@@ -0,0 +1,28 @@
+# == AddressManager::BSD
+#
+# An AddressManager driver for operating systems using a BSD-like ifconfig.
+# Driver provides querying addresses and interfaces.
+class AutomateIt::AddressManager::BSD < AutomateIt::AddressManager::BaseDriver
+  def self.token
+    :bsd
+  end
+
+  depends_on :programs => %w(ifconfig uname),
+    :callbacks => lambda{`uname -s`.match(/openbsd|freebsd|sunos/i)}
+
+  def suitability(method, *args) # :nodoc:
+    available? ? 2 : 0
+  end
+
+  # See AddressManager#interfaces
+  def interfaces()
+    _raise_unless_available
+    return `ifconfig -a`.scan(/^([^\s]+):\s+/s).flatten
+  end
+
+  # See AddressManager#addresses
+  def addresses()
+    _raise_unless_available
+    return `ifconfig -a`.scan(/\s+inet\s+([^\s]+)\s+/).flatten
+  end
+end

data/lib/automateit/address_manager/freebsd.rb

@@ -0,0 +1,56 @@
+# == AddressManager::FreeBSD
+#
+# A FreeBSD-specific driver for the AddressManager provides complete support for
+# querying, adding and removing addresses.
+class AutomateIt::AddressManager::FreeBSD < AutomateIt::AddressManager::BaseDriver
+  def self.token
+    :freebsd
+  end
+
+  depends_on :programs => %w(ifconfig uname),
+    :callbacks => lambda{`uname -s`.match(/freebsd/i)}
+
+  def suitability(method, *args) # :nodoc:
+    # Must be higher than ::BSD
+    available? ? 3 : 0
+  end
+
+  # See AddressManager#add
+  def add(opts)
+    _add_helper(opts) do |opts|
+      interpreter.sh(_freebsd_ifconfig_helper(:add, opts))
+    end
+  end
+
+  # See AddressManager#remove
+  def remove(opts)
+    _remove_helper(opts) do |opts|
+      interpreter.sh(_freebsd_ifconfig_helper(:remove, opts))
+      true
+    end
+  end
+  
+  # See AddressManager#has?
+  def has?(opts)
+    opts2 = opts.clone
+    is_alias = opts2.delete(:label)
+    return super(opts2)
+  end
+  
+protected
+
+  # ifconfig fxp0 inet 172.16.1.3 netmask 255.255.255.255 alias
+  def _freebsd_ifconfig_helper(action, opts)    
+    helper_opts = {:state => false, :prepend => %w(inet)}
+    opts2 = opts.clone
+    if opts2.delete(:label)
+      helper_opts[:append] = \
+        case action
+        when :add: %w(alias)
+        when :remove, :del: %w(-alias)
+        else ArgumentError.new("Unknown action: #{action}")
+        end
+    end
+    return _ifconfig_helper(action, opts2, helper_opts)
+  end
+end

data/lib/automateit/address_manager/openbsd.rb

@@ -0,0 +1,63 @@
+# == AddressManager::OpenBSD
+#
+# A OpenBSD-specific driver for the AddressManager provides complete support for
+# querying, adding and removing addresses.
+class AutomateIt::AddressManager::OpenBSD < AutomateIt::AddressManager::BaseDriver
+  def self.token
+    :openbsd
+  end
+
+  depends_on :programs => %w(ifconfig uname),
+    :callbacks => lambda{`uname -s`.match(/openbsd/i)}
+
+  def suitability(method, *args) # :nodoc:
+    # Must be higher than ::BSD
+    available? ? 3 : 0
+  end
+
+  # See AddressManager#add
+  def add(opts)
+    _add_helper(opts) do |opts|
+      interpreter.sh(_openbsd_ifconfig_helper(:add, opts))
+    end
+  end
+
+  # See AddressManager#remove
+  def remove(opts)
+    _remove_helper(opts) do |opts|
+      interpreter.sh(_openbsd_ifconfig_helper(:remove, opts))
+      true
+    end
+  end
+  
+  # See AddressManager#addresses
+  def addresses()
+    _raise_unless_available
+    # OpenBSD requires an "-A" to display aliases, not the usual "-a"
+    return `ifconfig -A`.scan(/\s+inet\s+([^\s]+)\s+/).flatten
+  end
+  
+  # See AddressManager#has?
+  def has?(opts)
+    opts2 = opts.clone
+    is_alias = opts2.delete(:label)
+    return super(opts2)
+  end
+  
+protected
+
+  # ifconfig dc0 inet alias 192.168.0.3 netmask 255.255.255.255
+  def _openbsd_ifconfig_helper(action, opts)
+    helper_opts = {:state => false, :prepend => %w(inet)}
+    opts2 = opts.clone
+    if opts2.delete(:label)
+      helper_opts[:prepend] << \
+        case action
+        when :add: "alias"
+        when :remove, :del: "delete"
+        else ArgumentError.new("Unknown action: #{action}")
+        end
+    end
+    return _ifconfig_helper(action, opts2, helper_opts)
+  end
+end

data/lib/automateit/address_manager/sunos.rb

@@ -30,17 +30,4 @@ class AutomateIt::AddressManager::SunOS < AutomateIt::AddressManager::BaseDriver
       true
     end
   end
-
-  # See AddressManager#interfaces
-  def interfaces()
-    _raise_unless_available
-    return `ifconfig -a`.scan(/^([^ ]+):\s+/s).flatten
-  end
-
-  # See AddressManager#addresses
-  def addresses()
-    _raise_unless_available
-    return `ifconfig -a`.scan(/\s+inet\s+([^\s]+)\s+/).flatten
-  end
 end
-

data/lib/automateit/platform_manager.rb

@@ -46,3 +46,4 @@ require 'automateit/platform_manager/darwin'
 require 'automateit/platform_manager/windows'
 require 'automateit/platform_manager/freebsd'
 require 'automateit/platform_manager/sunos'
+require 'automateit/platform_manager/openbsd'

data/lib/automateit/platform_manager/openbsd.rb

@@ -0,0 +1,28 @@
+# == PlatformManager::OpenBSD
+#
+# A PlatformManager driver for OpenBSD.
+class AutomateIt::PlatformManager::OpenBSD < AutomateIt::PlatformManager::Uname
+  def self.token
+    :openbsd
+  end
+
+  depends_on :files => %w(/obsd /bsd /bsd.rd), :directories => %w(/altroot /stand)
+
+  def suitability(method, *args) # :nodoc:
+    # Must be higher than PlatformManager::Struct
+    return available? ? 3 : 0
+  end
+
+  def _prepare
+    return if @struct[:distro]
+    @struct[:distro] = `uname -s`.strip.downcase
+    @struct[:release] = `uname -r`.strip.downcase
+    @struct
+  end
+  private :_prepare
+
+  def query(search)
+    _prepare
+    super(search)
+  end
+end

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

data/lib/ext/metaclass.rb

@@ -3,7 +3,7 @@
 class Object
   # The hidden singleton lurks behind everyone
   def metaclass; class << self; self; end; end
-  def meta_eval &blk; metaclass.instance_eval &blk; end
+  def meta_eval(&blk); metaclass.instance_eval(&blk); end
 
   # Adds methods to a metaclass
   def meta_def name, &blk

data/spec/integration/address_manager_spec.rb

@@ -47,7 +47,7 @@ else
     it "should find added interface" do
       @m.add(@properties).should be_true if @independent
 
-      @m.interfaces.should include(@device_and_label)
+      @m.interfaces.should include(@has_named_aliases ? @device_and_label : @device)
     end
 
     it "should find added IP address" do
@@ -116,44 +116,49 @@ else
 
   #---[ Targets ]---------------------------------------------------------
 
-  %w(linux sunos).each do |driver_name|
-    driver_token = driver_name.to_sym
-    driver = INTERPRETER.address_manager[driver_token]
-    if driver.available?
-      describe driver.class.to_s do
-        it_should_behave_like "AutomateIt::AddressManager"
-
-        before(:all) do
-
-          @properties = {
-            :device => @m.interfaces.reject{|t| t =~ /^lo\d+$/}.first,
-            :label => "1",
-            :address => "10.0.0.249",
-            :mask => "24",
-          }
-
-          case driver_token
-          when :sunos
-            # Accept defaults
-          when :linux
-            @properties[:label] = "atst"
-            @properties[:announcements] = 1
-          else
-            raise ArgumentError.new("Unknown AddressManager driver: #{driver_token}")
-          end
-
-          @device_and_label = @properties[:device]+":"+@properties[:label]
-
-          if @m.interfaces.include?(@device_and_label) \
-              or @m.addresses.include?(@properties[:address])
-            raise "ERROR: This computer already has the device/address used for testing! Either disable #{@device_and_label} and #{@properties[:address]}, or change the spec to test using different properties."
-          end
-
-          @d = @m[driver_token]
+  begin
+    # Raises exception if no driver is available, which is caught later
+    driver = INTERPRETER.address_manager.driver_for(:add)
+    driver_token = driver.token
+
+    describe driver.class.to_s do
+      it_should_behave_like "AutomateIt::AddressManager"
+
+      before(:all) do
+        @driver_token = driver_token
+
+        # Defaults
+        @has_named_aliases = true
+        @properties = {
+          :device => @m.interfaces.reject{|t| t =~ /^lo\d+$/}.first,
+          :label => "1",
+          :address => "10.0.0.249",
+          :mask => "24",
+        }
+
+        # Platform specifics
+        case driver_token
+        when :sunos
+          # Accept defaults
+        when :openbsd, :freebsd
+          @has_named_aliases = false
+        when :linux
+          @properties[:label] = "atst"
+          @properties[:announcements] = 1
+        else
+          raise ArgumentError.new("Unknown defaults for AddressManager driver: #{driver_token}")
+        end
+
+        @device = @properties[:device]
+        @device_and_label = @properties[:device]+":"+@properties[:label]
+
+        if @m.interfaces.include?(@device_and_label) \
+            or @m.addresses.include?(@properties[:address])
+          raise "ERROR: This computer already has the device/address used for testing! Either disable #{@device_and_label} and #{@properties[:address]}, or change the spec to test using different properties."
         end
       end
-    else
-      puts %{NOTE: Can't check %s on this platform, #{__FILE__}} % driver.class
     end
+  rescue NotImplementedError
+    puts "Can't find AddressManager for this platform, #{__FILE__}"
   end
 end

data/spec/integration/package_manager_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "/../spec_helper.rb")
 
 PACKAGE_FOUND_ERROR = %q{ERROR: Found the '%s' package installed for %s. You're probably not using this obscure package and should remove it so that this test can run. In the unlikely event that you actually rely on this package, change the spec to test with another unused package.}
-PACKAGE_DRIVER_MISSING_ERROR = %{NOTE: Can't check %s on this platform, #{__FILE__}}
+PACKAGE_DRIVER_MISSING_ERROR = "NOTE: Can't check %s on this platform, #{__FILE__}"
 
 if not INTERPRETER.euid?
   puts "NOTE: Can't check 'euid' on this platform, #{__FILE__}"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71017"
-date: 2007-10-18 00:00:00 -07:00
+  version: "0.71021"
+date: 2007-10-22 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
@@ -123,14 +123,18 @@ files:
 - lib/automateit/platform_manager/windows.rb
 - lib/automateit/platform_manager/uname.rb
 - lib/automateit/platform_manager/lsb.rb
+- lib/automateit/platform_manager/openbsd.rb
 - lib/automateit/platform_manager/gentoo.rb
 - lib/automateit/platform_manager/darwin.rb
 - lib/automateit/platform_manager/freebsd.rb
 - lib/automateit/platform_manager/sunos.rb
+- lib/automateit/address_manager/openbsd.rb
 - lib/automateit/address_manager/portable.rb
 - lib/automateit/address_manager/sunos.rb
 - lib/automateit/address_manager/linux.rb
 - lib/automateit/address_manager/base.rb
+- lib/automateit/address_manager/bsd.rb
+- lib/automateit/address_manager/freebsd.rb
 - lib/automateit/shell_manager/portable.rb
 - lib/automateit/shell_manager/which.rb
 - lib/automateit/shell_manager/symlink.rb