aruba-jbb 0.2.6.9 → 0.2.6.10

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.6.10 jbb
+* increased default timeout to 20 seconds
+
+== Bug fixes
+* fixed implementation of environment variables
+
+
 == 0.2.6.9 jbb
 * added timeout method and basic support step definitions
 * somewhat improved api documentation

data/README.rdoc

@@ -74,21 +74,22 @@ Upstream addressed the more limited problem of locating <code>./bin</code>
 by adding a <code>@bin</code> tag which appends <code>./bin</code> to Cucumber's
 LOADPATH. This technique is supported by Aruba-jbb as well.
 
-The aruba <tt>run</tt> api method is now (0.2.6.9) surrounded by a timeout call.
-This means that after the default period of 2 seconds any process under test
+The aruba <tt>run</tt> api method is surrounded by a timeout call.
+This means that after the default period of 20 seconds any process under test
 is forceably terminated.  However, be advised that the run api methods raises 
-no error is raised by default.Instead the process exit status is set to -1 and
+no error by default.  Instead the process exit status is set to -1 and
 stderr will contain <em>Aruba::Api::ProcessTimeout: execution expired</em>.  
 You are therefore advised to either override the When /run "([^\"])"/ do |cmd|
 step definition or provide an alternative form.
 
-The default timeout value of 2 may be overriden either by defining an environmental
+The default timeout value may be overriden either by defining an environmental
 variable called ARUBA_RUN_TIMEOUT to the approprate value (in seconds) or by
 passing an optional third parameter to the run api method.  Fractional values
 are acepted but granularity of less than interger seconds is not guarenteed to
-work. 
+work.   A helper step definition is provided to set environment variables
+for process testing.  This is documented in the api rdoc.
 
-Timeout does not work for the run_interactive api method. This is experimaental
+Timeout does not handle the run_interactive api method. This is experimaental
 code merged from Mike Sassak's fork.
 
 == Ruby/RVM

data/aruba-jbb.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aruba-jbb}
-  s.version = "0.2.6.9"
+  s.version = "0.2.6.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Hellesøy", "David Chelimsky", "James B. Byrne", "Mike Sassak"]

data/features/process_timeout.feature

@@ -6,7 +6,7 @@ Feature: process should timeout
 
   
   Scenario: process runner times out for long process
-    When I run "ruby -e 'sleep(12)'"
+    When I run "ruby -e 'sleep(21)'"
     Then the exit status should not be 0
       And stderr should contain "execution expired"
 
@@ -20,6 +20,17 @@ Feature: process should timeout
 
   
   Scenario: process runner timeout can be set higher than default
-    When I run "ruby -e 'sleep(4)'" with timeout of "5.7" seconds
+    When I run "ruby -e 'sleep(21)'" with timeout of "22" seconds
     Then the exit status should be 0
       And stderr should be empty
+      And stderr should not contain "execution expired"
+
+  @announce
+  Scenario: environment variable controls timeout value
+    Given I set the env variable "ARUBA_RUN_TIMEOUT" to "25" seconds
+    When I run "ruby -e 'sleep(21)'" 
+    Then the exit status should be 0
+    When I set the env variable "ARUBA_RUN_TIMEOUT" to "5" seconds
+      And I run "ruby -e 'sleep(10)'"
+    Then the exit status should be -1
+      And stderr should contain "Aruba::Api::ProcessTimeout: execution expired"

data/lib/aruba/api.rb

@@ -65,19 +65,19 @@ module Aruba
     # contained in the ARUBA_REBASE environmental variable, if found.
     #
     def aruba_working_dir_init
-
+      
       @aruba_working_dir = [ARUBA_WORKING_DIR_DEFAULT]
 
-      if defined?(ENV[ARUBA_WORKING_DIR])
-        @aruba_working_dir = [ENV[ARUBA_WORKING_DIR]] 
+      if ( ENV['ARUBA_WORKING_DIR'] != nil )
+        @aruba_working_dir = [ENV['ARUBA_WORKING_DIR']] 
       end
 
       dirs_init
       clean_up
       rebase_dirs_clear
 
-      if defined?(ENV[ARUBA_REBASE])
-        rebase(ENV[ARUBA_REBASE].split(%r{,|;\s*}))
+      if ( ENV['ARUBA_REBASE'] != nil )
+        rebase(ENV['ARUBA_REBASE'].split(%r{,|;\s*}))
       end
     end
 
@@ -579,7 +579,7 @@ module Aruba
     class ProcessTimeout < Timeout::Error; end
     # Set the default timeout in seconds for external process to finish
     # May be overrriden by setting environment variable ARUBA_RUN_TIMEOUT
-    ARUBA_RUN_TIMEOUT_DEFAULT = 2
+    ARUBA_RUN_TIMEOUT_DEFAULT = 20
     
     # run is the internal helper method that actually runs the external 
     # test process, optionally failing if the exit status != 0.  Takes an
@@ -595,30 +595,31 @@ module Aruba
     #   When /I run a long process without error/ do
     #       run(long_process, true, 15) # allow 15 seconds.
     #
-    #   When /run "(.*)" with timeout of "()" seconds$/ do |cmd, time|
+    #   When /run "(.*)" with timeout of "(\d+\.\d*)" seconds$/ do |cmd, time|
     #     run(unescape(cmd), true, time.to_f)
     #   end
+    #
+    #   When I set the env variable "SOME_THING" to "some value" 
+    #
     def run(cmd, fail_on_error=true, tlimit=nil)
 
       @last_stderr = ""
       @last_stdout = ""
       cmd = detect_ruby(cmd)
 
-      if tlimit == nil
-        if defined?(ENV[ARUBA_RUN_TIMEOUT])
-          tlimit = ENV[ARUBA_RUN_TIMEOUT]
+      if tlimit == nil || tlimit == ""
+        if ( ENV['ARUBA_RUN_TIMEOUT'] != nil ) 
+          tlimit = ENV['ARUBA_RUN_TIMEOUT']
         else
           tlimit = ARUBA_RUN_TIMEOUT_DEFAULT
         end
-      else
-        tlimit = tlimit.to_f
-      end 
+      end
 
       in_current_dir do
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
         begin
-          Timeout::timeout(tlimit, ProcessTimeout) {
+          Timeout::timeout(tlimit.to_f, ProcessTimeout) {
             ps = BackgroundProcess.run(cmd)
             @last_stdout = ps.stdout.read 
             announce_or_puts(@last_stdout) if @announce_stdout

data/lib/aruba/cucumber_steps.rb

@@ -209,18 +209,25 @@ When /run "(.*)" interactively$/ do |cmd|
 end
 
 
-When /run "(.*)" with errors?$/ do |cmd|
-  run(unescape(cmd), false)
+When /run "(.*)" with errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
+  do |cmd, time|
+  run(unescape(cmd), false, time)
+end
+
+
+When /run "(.*)" with timeout of "(\d+\.?\d*)" seconds?$/ do |cmd, time|
+  run(unescape(cmd), true, time)
 end
 
 
-When /run "(.*)" with timeout of "(\d+\.?\d*)" seconds$/ do |cmd, time|
-  run(unescape(cmd), true, time.to_f)
+When /run "(.*)" without errors?(?: and timeout of "(\d+\.?\d*)" seconds?)?$/\
+  do |cmd, time|
+  run(unescape(cmd), true, time)
 end
 
 
-When /run "(.*)" without errors?$/ do |cmd|
-  run(unescape(cmd), true)
+When /set the env variable "([^\"]*)" to "(\d+\.?\d*)" seconds?$/ do |var, val|
+  ENV[var] = val
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: aruba-jbb
 version: !ruby/object:Gem::Version 
-  hash: 85
+  hash: 83
   prerelease: false
   segments: 
   - 0
   - 2
   - 6
-  - 9
-  version: 0.2.6.9
+  - 10
+  version: 0.2.6.10
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"