tf 0.3.2 → 0.4.0

data/README.md

@@ -29,8 +29,13 @@ Example test file:
 The test can be negated by replacing `=` with `!=`
 
 - status=<number> - check if command returned given status (0 is success)
-- match=/<regexp>/ - regexp match command output
-- env[<var_name>]=/<regexp>/ - regexp match the given environment variable name
+- match=/<regexp>/ - regexp match command output both stdout and stderr
+- match[stdout|stderr]=/<regexp>/ - regexp match command either stdout or stderr
+- env[<var_name>]=~/<regexp>/ - regexp match the given environment variable name
+- env[<var_name>]?=[array|string|nil] - verify type of the given environment variable name
+- env[<var_name>][]=<size> - verify size of the given environment variable name
+- env[<var_name>][]=/<regexp>/ - regexp match all of elements of the given environment variable name
+- env[<var_name>][<index>]=/<regexp>/ - regexp match given element of the given environment variable name
 
 ### Selecting shell / runner program
 
@@ -44,7 +49,7 @@ Still only Bash / ZSH like shells are allowed.
     ##### Processed commands 2 of 2, success tests 2 of 3, failure tests 1 of 3.
     $ false
     # failed: status = 0 # was 1
-    
+
     $ bin/tf example_tests/comment/* --text
     ##### starting test failure.
     $ false

data/lib/plugins/tf/env_arr_test.rb

@@ -0,0 +1,65 @@
+class TF::EnvArrTest
+  MATCHER = {
+    :all  => /^env\[(.*)\]\[\]([!]?=)[~]?\/(.*)\/$/,
+    :one  => /^env\[(.*)\]\[(.+)\]([!]?=)[~]?\/(.*)\/$/,
+    :size => /^env\[(.*)\]\[\]([!]?=)([[:digit:]]+)$/,
+  }
+
+  def matches? test
+    TF::EnvArrTest::MATCHER.find{|k,v| test =~ v }
+  end
+
+
+  def execute test, _stdout, _stderr, _stdboth, _status, env
+    type, matcher = TF::EnvArrTest::MATCHER.find{|k,v| test =~ v }
+    send "execute_#{type}".to_sym, matcher, test, _stdout, _stderr, _stdboth, _status, env
+  end
+
+  def execute_one test, matcher, _stdout, _stderr, _stdboth, _status, env
+    test =~ matcher
+    variable, index, sign, value = $1.strip, $2, $3, $4
+    var_val = env[ variable ]
+    if var_val.is_a? Hash
+      var_val = var_val[index]
+    else
+      return [ false, "failed: env #{variable}[#{index}] #{sign} /#{value}/ # not an array" ]
+    end
+    if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{var_val}" )
+      [ false, "failed: env #{variable}[#{index}] #{sign} /#{value}/ # was '#{var_val}'" ]
+    else
+      [ true, "passed: env #{variable}[#{index}] #{sign} /#{value}/" ]
+    end
+  end
+
+  def execute_all test, matcher, _stdout, _stderr, _stdboth, _status, env
+    test =~ matcher
+    variable, sign, value = $1.strip, $2, $3, $4
+    var_val = env[ variable ]
+    if var_val.is_a? Hash
+      var_val = var_val.sort_by{|k,v| k}.map{|k,v| v}.join(" ")
+    else
+      return [ false, "failed: env #{variable}[] #{sign} /#{value}/ # not an array" ]
+    end
+    if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{var_val}" )
+      [ false, "failed: env #{variable}[] #{sign} /#{value}/ # was '#{var_val}'" ]
+    else
+      [ true, "passed: env #{variable}[] #{sign} /#{value}/" ]
+    end
+  end
+
+  def execute_size test, matcher, _stdout, _stderr, _stdboth, _status, env
+    test =~ matcher
+    variable, sign, value = $1.strip, $2, $3, $4
+    var_val = env[ variable ]
+    if var_val.is_a? Hash
+      var_val = var_val.size
+    else
+      return [ false, "failed: env #{variable}[] #{sign} #{value} # not an array" ]
+    end
+    if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{var_val}" )
+      [ false, "failed: env #{variable}[] #{sign} #{value} # was #{var_val}" ]
+    else
+      [ true, "passed: env #{variable}[] #{sign} #{value}" ]
+    end
+  end
+end

data/lib/plugins/tf/env_match_test.rb

@@ -1,5 +1,5 @@
 class TF::EnvMatchTest
-  MATCHER = /^env\[(.*)\]([!]?=)[~]?\/(.*)\//
+  MATCHER = /^env\[(.*)\]([!]?=)[~]?\/(.*)\/$/
 
   def matches? test
     test =~ TF::EnvMatchTest::MATCHER
@@ -9,6 +9,9 @@ class TF::EnvMatchTest
     test =~ TF::EnvMatchTest::MATCHER
     variable, sign, value = $1.strip, $2, $3
     var_val = env[ variable ]
+    unless var_val.is_a? String
+      return [ false, "failed: env #{variable} #{sign} /#{value}/ # not a string" ]
+    end
     if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{var_val}" )
       [ false, "failed: env #{variable} #{sign} /#{value}/ # was '#{var_val}'" ]
     else

data/lib/plugins/tf/env_type_test.rb

@@ -0,0 +1,23 @@
+class TF::EnvTypeTest
+  MATCHER = /^env\[(.*)\]\?([!]?=)(array|string|nil)/
+
+  def matches? test
+    test =~ TF::EnvTypeTest::MATCHER
+  end
+
+  def execute test, _stdout, _stderr, _stdboth, _status, env
+    test =~ TF::EnvTypeTest::MATCHER
+    variable, sign, type = $1.strip, $2, $3
+    var_type = variable_type( env[ variable ] )
+    if ( sign == "=" ) ^ ( var_type == type )
+      [ false, "failed: env? #{variable} #{sign} #{type} # was #{var_type}" ]
+    else
+      [ true, "passed: env? #{variable} #{sign} #{type}" ]
+    end
+  end
+
+  def variable_type value
+    value.nil? ? 'nil' :
+      value.is_a?(Hash) ? 'array' : 'string'
+  end
+end

data/lib/plugins/tf/output_match_test.rb

@@ -1,5 +1,5 @@
 class TF::OutputMatchTest
-  MATCHER = /^match([!]?=)[~]?\/(.*)\//
+  MATCHER = /^match(\[(stdout|stderr)\])?([!]?=)[~]?\/(.*)\/$/
 
   def matches? test
     test =~ TF::OutputMatchTest::MATCHER
@@ -7,11 +7,18 @@ class TF::OutputMatchTest
 
   def execute test, _stdout, _stderr, _stdboth, _status, env
     test =~ TF::OutputMatchTest::MATCHER
-    sign, value = $1, $2
-    if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{_stdboth}" )
-      [ false, "failed: match #{sign} /#{value}/" ]
+    _, type, sign, value = $1, $2, $3, $4
+    test_val, match_type =
+      case type
+      when "stdout" then [ _stdout, "[#{type}]" ]
+      when "stderr" then [ _stderr, "[#{type}]" ]
+      when nil      then [ _stdboth, "" ]
+      else return [ false, "failed: match[#{type}] #{sign} /#{value}/ # unknown output type" ]
+      end
+    if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{test_val}" )
+      [ false, "failed: match#{match_type} #{sign} /#{value}/" ]
     else
-      [ true, "passed: match #{sign} /#{value}/" ]
+      [ true, "passed: match#{match_type} #{sign} /#{value}/" ]
     end
   end
 end

data/lib/tf.rb

@@ -40,9 +40,11 @@ class TF
   end
 
   def env shell
-    Hash[ shell.execute(
-      @ruby + ' -e \'ENV.each{|k,v| printf("%s=%s\0","#{k}","#{v}") }\''
-    )[0].split("\0").map{|var| var.split('=', 2) } ]
+    TF::Environment.parse_env(
+      shell.execute(
+        TF::Environment.show_env_command
+      )[0].split(/\n/)
+    )
   end
 
   def process_test test

data/lib/tf/environment.rb

@@ -0,0 +1,91 @@
+## https://github.com/mpapis/mpapis_test/blob/master/variables_list.sh
+
+## Examples BASH:
+#~ USER=vagrant
+#~ _=
+#~ array2=([0]="four" [1]="five" [2]="six" [10]="ten")
+#~ variable1='play'\''me'
+#~ variable2=$'play\n with\n me\n now'
+
+## Examples ZSH:
+#~ FIGNORE=''
+#~ USER=vagrant
+#~ array2=(four five six '' '' '' '' '' '' ten)
+#~ variable1='play'\''me'
+#~ variable2='play
+#~  with
+#~  me
+#~  now'
+require 'shellwords'
+
+class TF::Environment
+  HANDLER=<<EOF.gsub(/\n/,'')
+set | awk -F= '
+  BEGIN{v=0;}
+  /^[a-zA-Z_]+=/{v=1;}
+  v==1&&$2~/^['\\''\\$]/{v=2;}
+  v==1&&$2~/^\\(/{v=3;}
+  v==2&&/'\\''$/&&!/'\\'\\''$/{v=1;}
+  v==3&&/\\)$/{v=1;}
+  v{print;}
+  v==1{v=0;}
+'
+EOF
+  class << self
+    def show_env_command
+      TF::Environment::HANDLER
+    end
+    def parse_env output
+      env = []
+      holder=nil
+      terminator=nil
+      output.each do |line|
+        line.chomp!
+        if holder.nil? && line =~ /^[^=]+=([\('\$]?)/
+          holder = line
+          if $1 && !$1.empty?
+            terminator = $1.sub(/\$/,"'").sub(/\(/,")")
+          end
+        elsif holder.nil? && line =~ /^[^=]*=/
+          holder = line
+          terminator=nil
+        else
+          holder += line
+        end
+        if terminator && line.chars.to_a.last == terminator
+          terminator=nil
+        end
+        if holder && terminator.nil?
+          env << parse_var( holder.strip )
+          holder=nil
+        end
+      end
+      Hash[ env ]
+    end
+    def parse_var definition
+      definition =~ /\A([^=]*)=([$]?[\(']?)(.*?)([\)']?)\z/m
+      name  = $1
+      type1 = $2
+      value = $3
+      type2 = $4
+      case type2
+      when ')'
+        parse_array( name, value.shellsplit.map{|v|v.gsub(/'\''/,'\'')} )
+      else
+        [ name, value.gsub(/'\''/,'\'') ]
+      end
+    end
+    def parse_array name, value
+      if value[0] && value[0].chars.to_a.first == '['
+        value = value.map do |string|
+          string =~ /\[([^\]]+)\]=(.*)/m
+          [ $1, $2 ]
+        end
+      else
+        value = value.to_enum.with_index.map{|v,i|[(i+1).to_s,v]}.to_a
+        # TODO: zsh -c 'typeset -A arr; arr[ala]=1; arr[kot]=2; set | grep -a ^arr=' => arr=(ala 1 kot 2 ) - space on the end
+      end
+      [ name, Hash[ value ] ]
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tf
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Michal Papis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-31 00:00:00 Z
+date: 2012-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: session
@@ -42,14 +42,17 @@ extra_rdoc_files: []
 
 files: 
 - lib/tf.rb
+- lib/tf/environment.rb
 - lib/tf/active_patches.rb
 - lib/tf/plugins.rb
 - lib/plugins/tf/error_summary_output.rb
 - lib/plugins/tf/text_output.rb
 - lib/plugins/tf/output_match_test.rb
 - lib/plugins/tf/env_match_test.rb
+- lib/plugins/tf/env_type_test.rb
 - lib/plugins/tf/stats_output.rb
 - lib/plugins/tf/comment_test_input.rb
+- lib/plugins/tf/env_arr_test.rb
 - lib/plugins/tf/status_test.rb
 - bin/tf
 - LICENSE