patir 0.6.1 → 0.6.4

data/History.txt

@@ -1,8 +1,17 @@
+==0.6.4 / 2009-09-4
+* context parameter added to Command#run
+
+==0.6.3
+* Repository restructured (git is used internally so the svn repository matches now the master branch)
+* Cleanup. Some obsolete code was removed
+* Unit tests clarified
+==0.6.2
+* RubyCommand and ShellCommand are now more robust handling StandardError exceptions.
 ==0.6.1
 * RubyCommand failure logs are now clearer no more 'RubyCommand failed:' redundancies.
 * RubyCommand: Backtrace added to error output if $DEBUG=true
 ==0.6.0
-* RubyCommand now sets success when the block runs to the end. Block returns values re ignored. To indicate failure raise an exception. 
+* RubyCommand now sets success when the block runs to the end. Block returns values are ignored. To indicate failure raise an exception. 
 
 == 0.5.8 /2008-09-18
 * CommandSequence status updates set the correct status

data/README.txt

@@ -1,6 +1,5 @@
-patir
-http://patir.rubyforge.org
-by riva (Vassilis Rizopoulos)
+patir - http://patir.rubyforge.org
+
 == DESCRIPTION:
   
 patir provides the libraries common to all the project automation tools included in the Patir project.

data/Rakefile

@@ -4,7 +4,8 @@ require 'rubygems'
 require 'hoe'
 require 'patir/base'
 
-Hoe.new('patir', Patir::Version::STRING) do |p|
+Hoe.spec('patir') do |p|
+  p.version = Patir::Version::STRING
   p.author = "Vassilis Rizopoulos"
   p.email = "riva@braveworld.net"
   p.summary = 'patir (Project Automation Tools in Ruby) provides libraries for use in automation tools'

data/docu/index.html

@@ -38,13 +38,28 @@
 						You can browse the <a href="http://patir.rubyforge.org/svn/">patir subversion repository</a>.
 					</p>
 					<p>
-						Like all self-conscious developers the patir team does not claim infalibility. Neither are we to proud to have our flaws pointed out, so if and when you find a bug, please post a report in our <a href="http://rubyforge.org/tracker/?group_id=3597">Bugtracker</a>
+						Like all self-conscious developers the patir team does not claim infalibility. Neither are we too proud to have our flaws pointed out, so if and when you find a bug, please post a report in our <a href="http://rubyforge.org/tracker/?group_id=3597">Bugtracker</a>
 					</p>
 				</div>
 			</div>
 			<div id="leftpanel">
 				<div align="justify" class="graypanel">
 					<span class="smalltitle">News</span><br /><br />
+					<span class="smallredtext">17 July 2009</span><br />
+					<span class="bodytext">rutema_web v1.0.0 is out!</span><br />
+					<a href="rutemaweb100.html" class="smallgraytext">More...</a><br /><br />
+					<span class="smallredtext">28 November 2008</span><br />
+					<span class="bodytext">rutemaweb v0.9.4 is out!</span><br />
+					<a href="rutemaweb094.html" class="smallgraytext">More...</a><br /><br />
+					<span class="smallredtext">11 November 2008</span><br />
+					<span class="bodytext">rutema v1.0.3 is out!</span><br />
+					<a href="rutema103.html" class="smallgraytext">More...</a><br /><br />
+					<span class="smallredtext">28 October 2008</span><br />
+					<span class="bodytext">rutema_elements v0.1.0 is out!</span><br />
+					<a href="elements010.html" class="smallgraytext">More...</a><br /><br />
+					<span class="smallredtext">10 October 2008</span><br />
+					<span class="bodytext">rutema v1.0.0 is out!</span><br />
+					<a href="rutema100.html" class="smallgraytext">More...</a><br /><br />
 					<span class="smallredtext">9 September 2008</span><br />
 					<span class="bodytext">rutema v0.9.0 is out!</span><br />
 					<a href="rutema090.html" class="smallgraytext">More...</a><br /><br />

data/lib/patir/base.rb

@@ -6,17 +6,13 @@ module Patir
   module Version
     MAJOR=0
     MINOR=6
-    TINY=1
+    TINY=4
     STRING=[ MAJOR, MINOR, TINY ].join( "." )  	
   end
   #Error thrown usually in initialize methods when missing required parameters
   #from the initialization hash.
   class ParameterException<RuntimeError
   end
-  #creates a drb service URL from an ip and a port number
-  def self.drb_service ip,port
-    return "druby://#{ip}:#{port}"
-  end
   
   class PatirLoggerFormatter<Logger::Formatter
     Format="[%s] %5s: %s\n"

data/lib/patir/command.rb

@@ -62,7 +62,7 @@ module Patir
     #executes the command and returns the status of the command.
     #
     #overwrite this method in classes that include Command
-    def run
+    def run context=nil
       @status=:success
       return self.status
     end
@@ -125,28 +125,34 @@ module Patir
     end
 
     #Executes the shell command and returns the status
-    def run
+    def run context=nil
       start_time=Time.now
       super
-      #create the working directory if it does not exist
-      FileUtils::mkdir_p(@working_directory,:verbose=>false)
-      #create the actual command, run it, grab stderr and stdout and set output,error, status and execution time
-      status, @output, @error = systemu(@command,:cwd=>@working_directory)
-      #lets get the status how we want it
       begin
-        exited = status.exited?
-      rescue NotImplementedError
-        # so, JRuby as of version 1.1 does not understand exited?
-        exited = true
-      end 
-      if exited
-        if status.exitstatus==0
-          @status=:success
+        #create the working directory if it does not exist
+        FileUtils::mkdir_p(@working_directory,:verbose=>false)
+        #create the actual command, run it, grab stderr and stdout and set output,error, status and execution time
+        status, @output, @error = systemu(@command,:cwd=>@working_directory)
+        #lets get the status how we want it
+        begin
+          exited = status.exited?
+        rescue NotImplementedError
+          # so, JRuby as of version 1.1 does not understand exited?
+          exited = true
+        end 
+        if exited
+          if status.exitstatus==0
+            @status=:success
+          else
+            @status=:error
+          end
         else
-          @status=:error
+          @status=:warning
         end
-      else
-        @status=:warning
+      rescue
+        @error<<"\n#{$!.message}"
+        @error<<"\n#{$!.backtrace}" if $DEBUG
+        @status=:error
       end
       #set the time it took us
       @exec_time=Time.now-start_time
@@ -200,7 +206,7 @@ module Patir
     #Executes the CommandSequence.
     #
     #Will run all step instances in sequence observing the exit strategies on warning/failures
-    def run
+    def run context=nil
       #set the start time
       @state.start_time=Time.now
       #reset the stop time
@@ -219,7 +225,7 @@ module Patir
         step.status=:running
         notify(:sequence_status=>@state)
         #run it, get the result and notify
-        result=step.run
+        result=step.run(context)
         @state.step=step
         step.status=:running
         notify(:sequence_status=>@state)
@@ -268,12 +274,14 @@ module Patir
       bstep.reset
       #set the extended attributes
       bstep.number=@steps.size
+      exit_strategy = :fail_on_error unless [:flunk_on_error,:fail_on_warning,:flunk_on_warning].include?(exit_strategy)
       bstep.strategy=exit_strategy
       #add it to the lot
       @steps<<bstep
       #add it to status as well
       @state.step=bstep
       notify(:sequence_status=>@state)
+      return bstep
     end
 
     #Resets the status. This will set :not_executed status, 
@@ -478,7 +486,7 @@ module Patir
       end
     end
     #Runs the associated block
-    def run
+    def run context=nil
       @run=true
       begin
         t1=Time.now
@@ -486,7 +494,7 @@ module Patir
           @cmd.call(self)
           @status=:success
         end
-      rescue
+      rescue StandardError
         error<<"\n#{$!.message}"
         error<<"\n#{$!.backtrace}" if $DEBUG
         @status=:error

data/test/test_patir_base.rb

@@ -3,14 +3,12 @@ require 'test/unit'
 require 'patir/base.rb'
 
 class TestBase<Test::Unit::TestCase
+  TEMP_LOG="temp.log"
   def teardown
     #clean up 
-    File.delete("temp.log") if File.exists?("temp.log")
-  end
-  #simple match test
-  def test_drb_service
-    assert_equal("druby://service.host:7000",Patir.drb_service("service.host",7000))
+    File.delete(TEMP_LOG) if File.exists?(TEMP_LOG)
   end
+  
   #This is not actually testing anything meaningfull but can be expanded when we learn more about 
   #the logger
   def test_setup_logger
@@ -20,6 +18,7 @@ class TestBase<Test::Unit::TestCase
     assert_not_nil(logger)
     logger=Patir.setup_logger("temp.log",:silent)
     assert_not_nil(logger)
+    assert(File.exists?(TEMP_LOG), "Log file not created")
     logger.close
   end
   

data/test/test_patir_command.rb

@@ -8,7 +8,7 @@ end
 
 class MockCommandWarning
   include Patir::Command
-  def run
+  def run context=nil
     @status=:warning
     return :warning
   end
@@ -16,7 +16,7 @@ end
 
 class MockCommandError
   include Patir::Command
-  def run
+  def run context=nil
     @status=:error
     return :error
   end
@@ -118,6 +118,7 @@ class TestCommandSequence<Test::Unit::TestCase
     @error=MockCommandError.new
     @warning=MockCommandWarning.new
   end
+  
   def test_normal
     seq=CommandSequence.new("test")
     assert(seq.steps.empty?)
@@ -129,10 +130,13 @@ class TestCommandSequence<Test::Unit::TestCase
     assert_nothing_raised{seq.run}
     assert(seq.state.success?)
   end
+  
   def test_flunk_on_error
     seq=CommandSequence.new("test")
     assert(seq.steps.empty?)
-    assert_nothing_raised{seq.add_step(@echo,:flunk_on_error)}
+    check_step=nil
+    assert_nothing_raised{check_step=seq.add_step(@echo,:flunk_on_error)}
+    assert_equal(:flunk_on_error,check_step.strategy)
     assert_nothing_raised{seq.add_step(@error,:flunk_on_error)}
     assert_nothing_raised{seq.add_step(@void,:flunk_on_error)}
     assert(:not_executed==seq.state.step_state(0)[:status])
@@ -150,7 +154,9 @@ class TestCommandSequence<Test::Unit::TestCase
     seq=CommandSequence.new("test")
     assert(seq.steps.empty?)
     assert_nothing_raised{seq.add_step(@echo)}
-    assert_nothing_raised{seq.add_step(@error,:fail_on_error)}
+    check_step=nil
+    assert_nothing_raised{check_step=seq.add_step(@error,:fail_on_error)}
+    assert_equal(:fail_on_error,check_step.strategy)
     assert_nothing_raised{seq.add_step(@void)}
     assert(:not_executed==seq.state.step_state(0)[:status])
     assert(:not_executed==seq.state.step_state(1)[:status])
@@ -167,7 +173,9 @@ class TestCommandSequence<Test::Unit::TestCase
     seq=CommandSequence.new("test")
     assert(seq.steps.empty?)
     assert_nothing_raised{seq.add_step(@echo)}
-    assert_nothing_raised{seq.add_step(@warning,:flunk_on_warning)}
+    check_step=nil
+    assert_nothing_raised{check_step=seq.add_step(@error,:flunk_on_warning)}
+    assert_equal(:flunk_on_warning,check_step.strategy)
     assert_nothing_raised{seq.add_step(@void)}
     assert(:not_executed==seq.state.step_state(0)[:status])
     assert(:not_executed==seq.state.step_state(1)[:status])
@@ -184,7 +192,9 @@ class TestCommandSequence<Test::Unit::TestCase
     seq=CommandSequence.new("test")
     assert(seq.steps.empty?)
     assert_nothing_raised{seq.add_step(@echo)}
-    assert_nothing_raised{seq.add_step(@warning,:fail_on_warning)}
+    check_step=nil
+    assert_nothing_raised{check_step=seq.add_step(@warning,:fail_on_warning)}
+    assert_equal(:fail_on_warning,check_step.strategy)
     assert_nothing_raised{seq.add_step(@void)}
     assert(:not_executed==seq.state.step_state(0)[:status])
     assert(:not_executed==seq.state.step_state(1)[:status])
@@ -198,7 +208,7 @@ class TestCommandSequence<Test::Unit::TestCase
   end
 end
 
-class TestRubyCommad<Test::Unit::TestCase
+class TestRubyCommand<Test::Unit::TestCase
   include Patir
   def test_normal_ruby
     cmd=RubyCommand.new("test"){sleep 1}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: patir
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.4
 platform: ruby
 authors: 
 - Vassilis Rizopoulos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-01 00:00:00 +02:00
+date: 2009-09-04 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,9 +30,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 2.3.3
     version: 
-description: "== SYNOPSIS:  patir is the library of common functionality used in the patir projects. This includes a class that allows you to build configuration files in Ruby and a library for command abstraction.  == REQUIREMENTS:  * systemu"
+description: |-
+  == FEATURES/PROBLEMS:
+    
+  * Configuration library for creating Ruby configuration files
+  * Command library abstracting the execution of commands
+  
+  == SYNOPSIS:
+  
+  patir is the library of common functionality used in the patir projects.
+  This includes a class that allows you to build configuration files in Ruby and a library for command abstraction.
+  
+  == REQUIREMENTS:
 email: riva@braveworld.net
 executables: []
 
@@ -76,7 +87,9 @@ files:
 - docu/rw-scenario.png
 - docu/screenshots.html
 has_rdoc: true
-homepage: http://patir.rubyforge.org
+homepage: 
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -98,9 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: patir
-rubygems_version: 1.3.0
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: patir (Project Automation Tools in Ruby) provides libraries for use in automation tools
 test_files: 
 - test/test_patir_base.rb