automateit 0.71006 → 0.71012

data/spec/integration/package_manager_spec.rb

@@ -86,6 +86,10 @@ else
   end
 
   targets.each_pair do |driver_token, package|
+    # Run the following from the shell to skip package tests:
+    #   export AUTOMATEIT_SPEC_SKIP_PACKAGES=1
+    next unless ENV["AUTOMATEIT_SPEC_SKIP_PACKAGES"].nil?
+
     driver = INTERPRETER.package_manager[driver_token]
     if driver.available?
       describe driver.class.to_s do

data/spec/integration/service_manager_sysv_spec.rb

@@ -7,18 +7,10 @@ elsif not INTERPRETER.superuser?
 elsif not INTERPRETER.service_manager[:sysv].available?
   puts "NOTE: Can't check ServiceManager::SYSV on this platform, #{__FILE__}"
 else
-  describe "AutomateIt::ServiceManager::SYSV" do
-    begin
-      INTERPRETER.service_manager.driver_for(:enabled?, @service_name)
-      @has_enable = true
-    rescue NotImplementedError
-      @has_enable = false
-      puts "NOTE: Can't check 'enabled?' on this platform, #{__FILE__}"
-    end
-
+  #---[ Shared ]----------------------------------------------------------
+  describe AutomateIt::ServiceManager::SYSV, :shared => true do
     before(:all) do
       @a = AutomateIt.new(:verbosity => Logger::WARN)
-      @m = @a.service_manager
 
       @service_name = "automateit_service_sysv_test"
       @service_file = "/etc/init.d/"+@service_name
@@ -29,13 +21,21 @@ else
       FileUtils.cp(@source_file, @service_file)
       FileUtils.chmod(0755, @service_file)
 
-      @m.stop(@service_name, :quiet => true) if @m.running?(@service_name)
+      INTERPRETER.service_manager.stop(@service_name, :quiet => true)
+
+      @m = @a.service_manager
     end
 
     after(:all) do
-      @m.stop(@service_name, :quiet => true) if @m.running?(@service_name)
+      INTERPRETER.service_manager.stop(@service_name, :quiet => true)
+
       FileUtils.rm(@service_file) if File.exists?(@service_file)
     end
+  end
+
+  #---[ Start ]-----------------------------------------------------------
+  describe AutomateIt::ServiceManager::SYSV, " with start" do
+    it_should_behave_like "AutomateIt::ServiceManager::SYSV"
 
     it "should start a service" do
       @m.start(@service_name, :quiet => true).should be_true
@@ -64,48 +64,103 @@ 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
+  end
 
-      timeout = 1
-      wait = timeout+2
-      @a.edit(@service_file, :backup => false) do
-        replace "touch $STATE", "sleep #{timeout} && touch $STATE &"
-      end
+  #---[ Wait ]------------------------------------------------------------
+  describe AutomateIt::ServiceManager::SYSV, " when waiting", :shared => true do
+    it_should_behave_like "AutomateIt::ServiceManager::SYSV"
+
+    before(:all) do
+      @timeout = 1
+      @wait = @timeout+5
+    end
+
+    before(:each) do
+      # Mocks need concrete object, rather than dispatcher
+      @m = @a.service_manager[:sysv]
+    end
+  end
+
+  describe AutomateIt::ServiceManager::SYSV, " when waiting with mock" do
+    it_should_behave_like "AutomateIt::ServiceManager::SYSV when waiting"
+
+    it "should wait for service to checking started status" do
+      @m.should_receive(:tell).exactly(3).times.and_return(false, false, true)
 
-      @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
+      @m.started?(@service_name, :wait => @wait).should be_true
+    end
+
+    it "should wait for service to checking stopped status" do
+      @m.should_receive(:tell).exactly(3).times.and_return(true, true, false)
+
+      @m.stopped?(@service_name).should be_false
+      @m.stopped?(@service_name, :wait => @wait).should be_true
+    end
+
+    it "should pause for service to restart" do
+      @m.should_receive(:tell).exactly(3).times.
+        with(@service_name, :status, anything).and_return(false, false, true)
+      @m.should_receive(:tell).once.
+        with(@service_name, :stop, anything).and_return(true)
+      @m.should_receive(:tell).once.
+        with(@service_name, :start, anything).and_return(true)
+
+      @m.restart(@service_name, :pause => @wait).should be_true
     end
+  end
+
+  if false
+    # TODO: How to test waiting for real without long waits and race conditions? The example below does the same thing as the mocked version above, except by actually manipulating a service. The trouble with the real version is that there's a race condition between processes, which may cause the test to fail. For example, the #started? call might get the wrong value if the 'timeout' is too short or the 'wait' is too long. Increasing these reduces the likelihood that heavy system load will cause an error, but the test will take a very long time to run because of the sleep periods.
+
+    describe AutomateIt::ServiceManager::SYSV, " when waiting with service" do
+      it_should_behave_like "AutomateIt::ServiceManager::SYSV when waiting"
 
-    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
-      # the service only when necessary significantly speeds the test.
-      @disable_manually = true
+      it "should wait for service to restart" do
+        @a.edit(@service_file, :backup => false, :params => {:timeout => @timeout}) do
+          replace "touch $STATE", "sleep #{params[: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 # Still stopping
+        @m.started?(@service_name, :wait => @wait).should be_true
+      end
+    end
+  end
+
+  #---[ Enable ]----------------------------------------------------------
+  if INTERPRETER.service_manager.available?(:enabled?)
+    describe AutomateIt::ServiceManager::SYSV, " with enable" do
+      it_should_behave_like "AutomateIt::ServiceManager::SYSV"
+
+      # Make tests independent? True is correct and lets you run individual
+      # tests. False is faster but requires you to run the full suite.
+      @independent = true
 
       before(:each) do
-        @m.disable(@service_name, :quiet => true) if not @disable_manually
+        @m.disable(@service_name, :quiet => true) unless @independent
       end
 
       after(:all) do
-        @m.disable(@service_name, :quiet => true) if not @disable_manually
+        @m.disable(@service_name, :quiet => true) unless @independent
       end
 
       it "should enable a service" do
         @m.enable(@service_name, :quiet => true).should be_true
+
         # Tear down
-        @m.disable(@service_name, :quiet => true).should be_true if @disable_manually
+        @m.disable(@service_name, :quiet => true).should be_true if @independent
       end
 
       it "should not enable an enabled service" do
         @m.enable(@service_name, :quiet => true).should be_true
         @m.enable(@service_name, :quiet => true).should be_false
+
         # Tear down
-        @m.disable(@service_name, :quiet => true).should be_true if @disable_manually
+        @m.disable(@service_name, :quiet => true).should be_true if @independent
       end
 
       it "should disable a service" do
@@ -124,9 +179,12 @@ else
       it "should identify an enabled service" do
         @m.enable(@service_name, :quiet => true).should be_true
         @m.enabled?(@service_name).should be_true
+
         # Tear down
-        @m.disable(@service_name, :quiet => true).should be_true if @disable_manually
+        @m.disable(@service_name, :quiet => true).should be_true if @independent
       end
     end
+  else
+    puts "NOTE: Can't check 'enabled?' on this platform, #{__FILE__}"
   end
 end

data/spec/integration/template_manager_erb_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(File.expand_path(__FILE__)), "/../spec_helper.rb")
 
-describe "AutomateIt::TemplateManager::ERB" do
+describe AutomateIt::TemplateManager::ERB do
   before(:all) do
     @a = AutomateIt.new(:verbosity => Logger::WARN)
     @m = @a.template_manager
@@ -15,8 +15,8 @@ describe "AutomateIt::TemplateManager::ERB" do
 
   it "should set file's mode when rendering" do
     @a.mktempdircd do
-      source = "foo"
-      target = "bar"
+      source = "source"
+      target = "target"
       mode1 = 0646 if INTERPRETER.shell_manager.provides_mode?
       mode2 = 0100646
       File.open(source, "w+"){|h| h.write("<%=variable%>")}
@@ -35,14 +35,31 @@ describe "AutomateIt::TemplateManager::ERB" do
 
   it "should fail to render non-existent file" do
     @a.mktempdircd do
-      lambda { @a.render(:file => "foo", :to => "bar") }.should raise_error(Errno::ENOENT)
+      lambda { @a.render(:file => "source", :to => "target") }.should raise_error(Errno::ENOENT)
     end
   end
 
   it "should not raise error with non-existent file in preview mode" do
     @a.mktempdircd do
       @a.preview = true
-      @a.render(:file => "foo", :to => "bar").should be_true
+      @a.render(:file => "source", :to => "target").should be_true
+    end
+  end
+
+  it "should not backup non-existing files" do
+    @a.mktempdircd do
+      @a.render(:text => "source", :to => "target").should be_true
+
+      Dir.entries(".").grep(/\w/).size.should == 1
+    end
+  end
+
+  it "should backup existing files" do
+    @a.mktempdircd do
+      @a.touch "target"
+      @a.render(:text => "source", :to => "target").should be_true
+
+      Dir.entries(".").grep(/\w/).size.should == 2
     end
   end
 end

data/spec/unit/plugins_spec.rb

@@ -245,6 +245,11 @@ describe "MyManager's drivers" do
   it "should share object instances" do
     @m[:my_first_driver].should == @m.interpreter.my_manager[:my_first_driver]
   end
+
+  it "should have a manager" do
+    @m[:my_first_driver].manager.should == @m
+  end
+
 end
 
 describe AutomateIt::Interpreter do

data/spec/unit/template_manager_erb_spec.rb

@@ -50,6 +50,7 @@ describe "AutomateIt::TemplateManager::ERB" do
     @d.should_receive(:_read).once.with(@source).and_return("my template content")
     @d.should_receive(:_mtime).once.with(@source).and_return(timestamp+1)
     @d.should_receive(:_mtime).once.with(@target).and_return(timestamp)
+    @d.should_receive(:_backup).once.with(@target).and_return(true)
     @d.should_receive(:_write).once.with(@target, "my template content").and_return(true)
 
     @a.render(@source, @target, :check => :timestamp).should be_true
@@ -74,6 +75,7 @@ describe "AutomateIt::TemplateManager::ERB" do
     @d.should_receive(:_mtime).once.with("foo").and_return(timestamp+1)
     @d.should_receive(:_mtime).once.with(@source).and_return(timestamp)
     @d.should_receive(:_mtime).once.with(@target).and_return(timestamp)
+    @d.should_receive(:_backup).once.with(@target).and_return(true)
     @d.should_receive(:_write).once.with(@target, "my template content").and_return(true)
 
     @a.render(@source, @target, :check => :timestamp, :dependencies => ["foo"]).should be_true
@@ -95,6 +97,7 @@ describe "AutomateIt::TemplateManager::ERB" do
     @d.should_receive(:_exists?).once.with(@target).and_return(true)
     @d.should_receive(:_read).once.with(@target).and_return("my old content")
     @d.should_receive(:_read).once.with(@source).and_return("my template content")
+    @d.should_receive(:_backup).once.with(@target).and_return(true)
     @d.should_receive(:_write).once.with(@target, "my template content").and_return(true)
 
     @a.render(@source, @target, :check => :timestamp, :dependencies => ["foo"], :force => true).should be_true
@@ -121,6 +124,7 @@ describe "AutomateIt::TemplateManager::ERB" do
     @d.should_receive(:_exists?).once.with(@target).and_return(true)
     @d.should_receive(:_read).once.with(@target).and_return("my old content")
     @d.should_receive(:_read).once.with(@source).and_return("my template content")
+    @d.should_receive(:_backup).once.with(@target).and_return(true)
     @d.should_receive(:_write).once.with(@target, "my template content").and_return(true)
 
     @a.render(@source, @target, :check => :compare).should be_true

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: automateit
 version: !ruby/object:Gem::Version 
-  version: "0.71006"
-date: 2007-10-08 00:00:00 -07:00
+  version: "0.71012"
+date: 2007-10-13 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
@@ -126,8 +126,11 @@ files:
 - 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/portable.rb
+- lib/automateit/address_manager/sunos.rb
 - lib/automateit/address_manager/linux.rb
+- lib/automateit/address_manager/base.rb
 - lib/automateit/shell_manager/portable.rb
 - lib/automateit/shell_manager/which.rb
 - lib/automateit/shell_manager/symlink.rb
@@ -146,6 +149,7 @@ files:
 - misc/which.cmd
 - misc/setup_gem_dependencies.sh
 - spec/spec_helper.rb
+- spec/breaker.rb
 - spec/unit/plugins_spec.rb
 - spec/unit/template_manager_erb_spec.rb
 - spec/unit/field_manager_spec.rb
@@ -157,7 +161,6 @@ files:
 - spec/integration/service_manager_sysv_spec.rb
 - spec/integration/template_manager_erb_spec.rb
 - spec/integration/package_manager_spec.rb
-- spec/integration/address_manager_linux_spec.rb
 - spec/integration/platform_manager_spec.rb
 - spec/integration/edit_manager_spec.rb
 - spec/integration/shell_manager_spec.rb
@@ -168,6 +171,7 @@ files:
 - spec/integration/tempster_spec.rb
 - spec/integration/examples_spec_editor.rb
 - spec/integration/download_spec.rb
+- spec/integration/address_manager_spec.rb
 - spec/extras/scratch.rb
 - spec/extras/automateit_service_sysv_test
 - spec/extras/simple_recipe.rb
@@ -175,6 +179,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit
 - spec/integration
+- spec/breaker.rb
 - spec/extras
 - spec/unit/plugins_spec.rb
 - spec/unit/template_manager_erb_spec.rb
@@ -187,7 +192,6 @@ test_files:
 - spec/integration/service_manager_sysv_spec.rb
 - spec/integration/template_manager_erb_spec.rb
 - spec/integration/package_manager_spec.rb
-- spec/integration/address_manager_linux_spec.rb
 - spec/integration/platform_manager_spec.rb
 - spec/integration/edit_manager_spec.rb
 - spec/integration/shell_manager_spec.rb
@@ -198,6 +202,7 @@ test_files:
 - spec/integration/tempster_spec.rb
 - spec/integration/examples_spec_editor.rb
 - spec/integration/download_spec.rb
+- spec/integration/address_manager_spec.rb
 - spec/extras/scratch.rb
 - spec/extras/automateit_service_sysv_test
 - spec/extras/simple_recipe.rb