spex 0.5.2 → 0.6.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     gem.authors = ["Bruce Williams"]
     gem.add_dependency "colored"
     gem.add_dependency "diff-lcs"
+    gem.add_dependency "facter"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/examples/postfix.rb

@@ -0,0 +1,16 @@
+# Note: We use the more specific 'postfix/master' as the process name so
+# we don't confused with spex running this file (postfix.rb)
+scenario "Postfix process management" do
+  executing "sudo postfix start" do
+    assert 'postfix/master', :started => true
+  end
+  executing "sudo postfix stop" do
+    assert 'postfix/master', :stopped => true
+  end
+  executing "sudo postfix start" do
+    assert 'postfix/master', :started => true
+  end
+  executing "sudo postfix stop && sudo postfix start" do
+    assert 'postfix/master', :restarted => true
+  end
+end

data/lib/spex.rb

@@ -1,3 +1,9 @@
+begin
+  require 'facter'
+rescue LoadError
+  abort "Requires 'facter'"
+end
+
 module Spex
   autoload :Assertion,     'spex/assertion'
   autoload :CLI,           'spex/cli'

data/lib/spex/assertions/process_assertion.rb

@@ -0,0 +1,28 @@
+module Spex
+  class ProcessAssertion < Assertion
+
+    def pattern
+      @pattern ||= target.is_a?(Regexp) ? target : Regexp.new(target)
+    end
+    
+    def ps_executable
+      ps = Facter.value(:ps)
+      if ps && !ps.empty?
+        ps
+      else
+        abort "Facter does not support 'ps' fact."
+      end
+    end
+
+    def current_pid
+      table = IO.popen(ps_executable) { |ps| ps.readlines }
+      table.each do |line|
+        if pattern.match(line)
+          return line.sub(/^\s+/, '').split(/\s+/)[1]
+        end
+      end
+      nil
+    end
+
+  end
+end

data/lib/spex/assertions/restarted_assertion.rb

@@ -0,0 +1,22 @@
+module Spex
+  class RestartedAssertion < ProcessAssertion
+    as :restarted, 'process restart'
+    example "Process was restarted", "assert 'postfix', :restarted => true"
+    example "Process was not restarted", "assert 'postfix', :restarted => false"
+
+    def before
+      @before_pid = current_pid
+      assert @before_pid, "Process '#{target}' is not running"
+    end
+
+    def after
+      after_pid = current_pid
+      assert after_pid, "Process '#{target}' is not running"
+      if active?
+        assert_not_equal @before_pid, after_pid, "Process '#{target}' pid was not changed (still #{@before_pid})"
+      else
+        assert_equal @before_pid, after_pid, "Process '#{target}' pid was changed (was #{@before_pid}, now #{after_pid})"
+      end
+    end
+  end
+end

data/lib/spex/assertions/started_assertion.rb

@@ -0,0 +1,21 @@
+module Spex
+  class StartedAssertion < ProcessAssertion
+    as :started, 'process start'
+    example "Process was started", "assert 'postfix', :started => true"
+    example "Process was not started", "assert 'postfix', :started => false"
+
+    def before
+      pid = current_pid
+      assert !pid, "Process '#{target}' is already running (pid #{pid})"
+    end
+
+    def after
+      if active?
+        assert current_pid, "Process '#{target}' was not started"
+      else
+        pid = current_pid
+        assert_nil pid, "Process '#{target}' was started (pid #{pid})"
+      end
+    end
+  end
+end

data/lib/spex/assertions/stopped_assertion.rb

@@ -0,0 +1,20 @@
+module Spex
+  class StoppedAssertion < ProcessAssertion
+    as :stopped, 'process stop'
+    example "Process was stopped", "assert 'postfix', :stopped => true"
+    example "Process was not stopped", "assert 'postfix', :stopped => false"
+
+    def before
+      assert current_pid, "Process '#{target}' is not running (will not be stopped)"
+    end
+
+    def after
+      pid = current_pid
+      if active?
+        assert_nil pid, "Process '#{target}' is still running (pid #{pid})"
+      else
+        assert_not_nil pid, "Process '#{target}' was stopped"
+      end
+    end
+  end
+end

data/lib/spex/runner.rb

@@ -15,10 +15,10 @@ module Spex
     end
     
     def run
-      puts %(Running scenario "#{scenario.name}").bold
+      puts %(Running scenario "#{scenario.name}").magenta.bold
       proceed = true
       scenario.each do |execution|
-        puts "Checking pre-assertions"
+        puts %(Preparing to execute "#{execution.command}").bold
         execution.assertions.each do |assertion|
           print "Pre-assertions for #{assertion}: "
           assertion.prepare
@@ -26,24 +26,26 @@ module Spex
           break unless proceed
         end
         if proceed
-          puts %(Executing "#{execution.command}")
+          print %(Executing "#{execution.command}": )
+          start = Time.now
           log = execute(execution)
+          elapsed = Time.now - start
+          puts 'DONE (%.2fs)' % elapsed
           passed = true
           execution.assertions.reverse.each do |assertion|
             print "Post-assertions for #{assertion}: "
             passed = report { assertion.after }
             break unless passed
           end
-          if passed
-            puts "SCENARIO PASSED".green.bold
-          else
-            abort "SCENARIO FAILED".red.bold
+          unless passed
+            abort "SCENARIO ASSERTIONS FAILED".red.bold
           end
           output_log(execution, log)
         else
           abort "SCENARIO FAILED (EXECUTION ABORTED)".red.bold
         end
       end
+      puts "SCENARIO PASSED".green.bold
     end
 
     def report(&block)

data/test/helper.rb

@@ -7,6 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'spex'
 require 'fakefs/safe'
+require 'flexmock/test_unit'
 
 class Test::Unit::TestCase
 
@@ -23,10 +24,27 @@ class Test::Unit::TestCase
     @assertion.after
   end
 
+  def assertion_fails_before
+    assert_raises Test::Unit::AssertionFailedError do
+      @assertion.prepare
+      @assertion.before
+    end
+  end
+
   def assertion_fails(&block)
     assert_raises Test::Unit::AssertionFailedError do
       assertion_passes(&block)
     end
   end
+
+  def start_process!(pid = '100')
+    flexmock(@assertion).flexmock_teardown
+    flexmock(@assertion).should_receive(:current_pid).and_return(pid)
+  end
+
+  def stop_process!
+    flexmock(@assertion).flexmock_teardown
+    flexmock(@assertion).should_receive(:current_pid).and_return(nil)    
+  end
   
 end

data/test/test_modified_assertion.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-class TestAssertion < Test::Unit::TestCase
+class TestModifiedAssertion < Test::Unit::TestCase
 
   def set_assertion(options = {})
     @assertion = Spex::ModifiedAssertion.new(@filename, options)

data/test/test_restarted_assertion.rb

@@ -0,0 +1,77 @@
+require 'helper'
+
+class TestRestartedAssertion < Test::Unit::TestCase
+
+  def set_assertion(options = {})
+    @assertion = Spex::RestartedAssertion.new('testproc', options)
+  end
+
+  context "Restarted Assertion" do
+    context "instances" do
+      context "set to true" do
+        setup do
+          set_assertion(true)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          context "and process running after execution" do
+            context "with the same pid" do
+              should 'fail' do
+                assertion_fails
+              end
+            end
+            context "with a different pid" do
+              should 'pass' do
+                assertion_passes { start_process!('101') }
+              end
+            end
+          end
+          context "but process not running after execution" do
+            should "fail" do
+              assertion_fails
+            end
+          end
+        end
+        context "process not running before execution" do
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+      end
+      context "set to false" do
+        setup do
+          set_assertion(false)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          context "and process running after execution" do
+            context "with the same pid" do
+              should 'pass' do
+                assertion_passes
+              end
+            end
+            context "with a different pid" do
+              should 'fail' do
+                assertion_fails { start_process!('101') }
+              end
+            end
+          end
+          context "but process not running after execution" do
+            should "fail" do
+              assertion_fails { stop_process! }
+            end
+          end
+        end
+        context "process not running before execution" do
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_started_assertion.rb

@@ -0,0 +1,63 @@
+require 'helper'
+
+class TestStartedAssertion < Test::Unit::TestCase
+
+  def set_assertion(options = {})
+    @assertion = Spex::StartedAssertion.new('testproc', options)
+  end
+
+  context "Started Assertion" do
+    context "instances" do
+      context "set to true" do
+        setup do
+          set_assertion(true)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+        context "process not running before execution" do
+          context "process running after execution" do
+            should "pass" do
+              assertion_passes { start_process! }
+            end
+          end
+          context "process not running after execution" do
+            should 'fail' do
+              assertion_fails
+            end
+          end
+        end
+      end
+      context "set to false" do
+        setup do
+          set_assertion(false)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+        context "process not running before execution" do
+          context "but process running after execution" do
+            should "fail" do
+              assertion_fails { start_process! }
+            end
+          end
+          context "but process not running after execution" do
+            should 'pass' do
+              assertion_passes
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/test_stopped_assertion.rb

@@ -0,0 +1,63 @@
+require 'helper'
+
+class TestStoppedAssertion < Test::Unit::TestCase
+
+  def set_assertion(options = {})
+    @assertion = Spex::StoppedAssertion.new('testproc', options)
+  end
+
+  context "Stopped Assertion" do
+    context "instances" do
+      context "set to true" do
+        setup do
+          set_assertion(true)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          context "and process running after execution" do
+            should 'fail' do
+              assertion_fails
+            end
+          end
+          context "but process not running after execution" do
+            should "pass" do
+              assertion_passes { stop_process! }
+            end
+          end
+        end
+        context "process not running before execution" do
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+      end
+      context "set to false" do
+        setup do
+          set_assertion(false)
+        end
+        context "process running before execution" do
+          setup do
+            start_process!
+          end
+          context "and process running after execution" do
+            should 'pass' do
+              assertion_passes
+            end
+          end
+          context "but process not running after execution" do
+            should "fail" do
+              assertion_fails { stop_process! }
+            end
+          end
+        end
+        context "process not running before execution" do
+          should "fail" do
+            assertion_fails_before
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Bruce Williams
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-14 00:00:00 -07:00
+date: 2010-04-15 00:00:00 -07:00
 default_executable: spex
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,6 +41,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: facter
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: An easy-to-use test harness that runs assertions before and after and executable is run
 email: bruce@codefluency.com
 executables: 
@@ -61,6 +73,7 @@ files:
 - examples/chgrp.rb
 - examples/chmod.rb
 - examples/chown.rb
+- examples/postfix.rb
 - examples/puppet.rb
 - examples/touch.rb
 - examples/writing.rb
@@ -72,7 +85,11 @@ files:
 - lib/spex/assertions/created_assertion.rb
 - lib/spex/assertions/file_assertion.rb
 - lib/spex/assertions/modified_assertion.rb
+- lib/spex/assertions/process_assertion.rb
 - lib/spex/assertions/removed_assertion.rb
+- lib/spex/assertions/restarted_assertion.rb
+- lib/spex/assertions/started_assertion.rb
+- lib/spex/assertions/stopped_assertion.rb
 - lib/spex/cli.rb
 - lib/spex/execution.rb
 - lib/spex/runner.rb
@@ -81,7 +98,10 @@ files:
 - test/helper.rb
 - test/test_assertion.rb
 - test/test_modified_assertion.rb
+- test/test_restarted_assertion.rb
 - test/test_script.rb
+- test/test_started_assertion.rb
+- test/test_stopped_assertion.rb
 has_rdoc: true
 homepage: http://github.com/bruce/spex
 licenses: []
@@ -116,10 +136,14 @@ test_files:
 - test/helper.rb
 - test/test_assertion.rb
 - test/test_modified_assertion.rb
+- test/test_restarted_assertion.rb
 - test/test_script.rb
+- test/test_started_assertion.rb
+- test/test_stopped_assertion.rb
 - examples/chgrp.rb
 - examples/chmod.rb
 - examples/chown.rb
+- examples/postfix.rb
 - examples/puppet.rb
 - examples/touch.rb
 - examples/writing.rb