automateit 0.71003 → 0.71006

data/CHANGES.txt

@@ -1,3 +1,12 @@
+0.71006:
+    Date: Sat, 06 Oct 2007 17:55:37 -0700
+    Desc:
+    - (%) Fixed EditSession#delete to delete lines matching substrings rather than exact matches.
+    - Fixed EditSession#comment to not comment already commented-out lines.
+    - Fixed SessionManager#start and #stop so these don't check status when called with :force option.
+    - Improved SessionManager#restart to use :wait option.
+    - Improved #download to accept array or hash as arguments.
+
 0.71003:
     Date: Wed, 03 Oct 2007 01:17:32 -0700
     Desc:

data/Rakefile

@@ -299,4 +299,8 @@ task :chown do
   end
 end
 
+task :rdoclink do
+  automateit.ln_s("/home/lagi/stash/automateit_rdoc", "doc")
+end
+
 #===[ fin ]=============================================================

data/lib/automateit/download_manager.rb

@@ -9,7 +9,7 @@ module AutomateIt
     #
     # Options:
     # * :to -- Saves source to this filename or directory. Defaults to current directory.
-    def download(source, opts={}) dispatch(source, opts) end
+    def download(*arguments) dispatch(*arguments) end
 
     # == DownloadManager::BaseDriver
     #
@@ -28,8 +28,10 @@ module AutomateIt
       end
 
       # See DownloadManager#download
-      def download(source, opts={})
-        target = opts[:to] || File.basename(source)
+      def download(*arguments)
+        args, opts = args_and_opts(*arguments)
+        source = args[0] or raise ArgumentError.new("No source specified")
+        target = args[1] || opts[:to] || File.basename(source)
         target = File.join(target, File.basename(source)) if File.directory?(target)
         log.info(PNOTE+"Downloading #{target}")
         if writing?

data/lib/automateit/edit_manager.rb

@@ -217,7 +217,7 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
   # Delete lines matching the String or Regexp +query+
   def delete(query, opts={})
     query = Regexp.escape(query) if query.is_a?(String)
-    query = Regexp.new(query+"\n?")
+    query = Regexp.new("^[^\n]*%s[^\n]*\n?" % query)
     @contents.gsub!(query, "")
   end
 
@@ -234,7 +234,7 @@ class AutomateIt::EditManager::EditSession < AutomateIt::Common
   # Comment out lines matching the String or Regexp +query+.
   def comment(query, opts={})
     query = Regexp.escape(query) if query.is_a?(String)
-    query = Regexp.new("^([^\n]*%s[^\n]*)(\n*)" % query)
+    query = Regexp.new("^(?!#{comment_prefix})([^\n]*%s[^\n]*)(\n*)" % query)
     return false unless @contents.match(query)
     @contents.gsub!(query, "%s%s%s%s" % [@comment_prefix, $1, @comment_suffix, $2])
   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.71003")
+  VERSION=Gem::Version.new("0.71006")
 
   # Instantiates a new Interpreter. See documentation for
   # Interpreter#setup.

data/lib/automateit/service_manager.rb

@@ -23,15 +23,29 @@ class AutomateIt::ServiceManager < AutomateIt::Plugin::Manager
   def running?(service, opts={}) dispatch_to(:started?, service, opts) end
 
   # Start this +service+ if it's not running.
+  #
+  # Options:
+  # * :wait -- Same as :wait option for #started?
+  # * :force -- Start service without checking if it's running.
   def start(service, opts={}) dispatch(service, opts) end
 
   # Stop this +service+ if it's running.
+  #
+  # Options:
+  # * :wait -- Same as :wait option for #stopped?
+  # * :force -- Stop service without checking if it's running.
   def stop(service, opts={}) dispatch(service, opts) end
 
   # Restart this +service+ if it's running, or start it if it's stopped.
+  #
+  # Options:
+  # * :wait -- Maxmimum seconds to wait for service to STOP.
+  # * :pause -- Maximum seconds to wait for service to START before stopping
+  #   it. Only set this if you just started the service and then decided to
+  #   restart it.
   def restart(service, opts={}) dispatch(service, opts) end
 
-  # If +is_restart+, #restart the service, otherwise #start it. 
+  # If +is_restart+, #restart the service, otherwise #start it.
   #
   # Example:
   #  modified = edit "/etc/myapp.conf" {#...}

data/lib/automateit/service_manager/sysv.rb

@@ -76,6 +76,7 @@ class AutomateIt::ServiceManager::SYSV < AutomateIt::ServiceManager::BaseDriver
     end
     return result
   end
+  protected :_started_and_stopped_helper
 
   # See ServiceManager#started?
   def started?(service, opts={})
@@ -89,8 +90,7 @@ class AutomateIt::ServiceManager::SYSV < AutomateIt::ServiceManager::BaseDriver
 
   # See ServiceManager#start
   def start(service, opts={})
-    # TODO maybe add a :wait option?
-    if started?(service) and not opts[:force]
+    if not opts[:force] and started?(service, :wait => opts[:wait])
       # Already started
       return false
     else
@@ -102,8 +102,7 @@ class AutomateIt::ServiceManager::SYSV < AutomateIt::ServiceManager::BaseDriver
 
   # See ServiceManager#stop
   def stop(service, opts={})
-    # TODO maybe add a :wait option?
-    if stopped?(service) and not opts[:force]
+    if not opts[:force] and stopped?(service, :wait => opts[:wait])
       # Already stopped
       return false
     else
@@ -115,8 +114,17 @@ class AutomateIt::ServiceManager::SYSV < AutomateIt::ServiceManager::BaseDriver
 
   # See ServiceManager#restart
   def restart(service, opts={})
-    stop(service, opts) if running?(service)
-    return start(service, opts)
+    if started?(service, :wait => opts[:pause])
+      # We're certain that service is started
+      stop_opts = opts.clone
+      stop_opts[:force] = true # Don't check again
+      stop(service, stop_opts)
+    end
+
+    # We're certain that service is stopped
+    start_opts = opts.clone
+    start_opts[:force] = true # Don't check again
+    return start(service, start_opts)
   end
 
   # See ServiceManager#enabled?

data/spec/integration/service_manager_sysv_spec.rb

@@ -23,12 +23,12 @@ else
       @service_name = "automateit_service_sysv_test"
       @service_file = "/etc/init.d/"+@service_name
       @source_file = File.join(File.dirname(__FILE__), "..", "extras", @service_name)
+    end
 
+    before(:each) do
       FileUtils.cp(@source_file, @service_file)
       FileUtils.chmod(0755, @service_file)
-    end
 
-    before(:each) do
       @m.stop(@service_name, :quiet => true) if @m.running?(@service_name)
     end
 
@@ -64,6 +64,23 @@ else
       @m.running?(@service_name).should be_true
     end
 
+    it "should wait for service to restart" do
+      # NOTE: Test depends on race condition because checks must pass before the service starts
+
+      timeout = 1
+      wait = timeout+2
+      @a.edit(@service_file, :backup => false) do
+        replace "touch $STATE", "sleep #{timeout} && touch $STATE &"
+      end
+
+      @m.start(@service_name, :quiet => true).should be_true
+      @m.started?(@service_name).should be_false # Still starting
+      @m.started?(@service_name, :wait => wait).should be_true
+      @m.restart(@service_name, :quiet => true, :wait => wait).should be_true
+      @m.started?(@service_name).should be_false
+      @m.started?(@service_name, :wait => wait).should be_true
+    end
+
     if @has_enable
       # It's more correct to disable the service using before/after, but the
       # platform-specific scripts are ridiculously slow, so manually disabling

data/spec/unit/edit_manager_spec.rb

@@ -6,12 +6,12 @@ describe "AutomateIt::EditManager for strings" do
   end
 
   before(:each) do
-    @input = "This\nis\n\a\nstring."
+    @input = "This\nis\na\nstring."
   end
 
   it "should pass contents" do
     @a.edit(:text => @input) do
-      contents.should == "This\nis\n\a\nstring."
+      contents.should == "This\nis\na\nstring."
     end
   end
 
@@ -67,9 +67,10 @@ describe "AutomateIt::EditManager for strings" do
 
   it "should delete lines" do
     output = @a.edit(:text => @input) do
-      delete "This"
+      delete "is"
     end
-    output.should_not =~ /This/
+    output.should_not =~ /is/
+    output.should == "a\nstring."
   end
 
   it "should comment lines" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71003"
-date: 2007-10-04 00:00:00 -07:00
+  version: "0.71006"
+date: 2007-10-08 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