tf 0.4.0 → 0.4.1

data/README.md

@@ -60,6 +60,12 @@ Still only Bash / ZSH like shells are allowed.
     # passed: status != 1
     ##### Processed commands 2 of 2, success tests 2 of 3, failure tests 1 of 3.
 
+## Troubleshooting
+
+Use environment variable `TF_DEBUG` to enable additional logging:
+
+    TF_DEBUG=1 tf --text  example_tests/comment/*
+
 ## Internal architecture
 
 Framework will load plugins from any available gem and local `lib/` path, for example:

data/lib/plugins/tf/env_arr_test.rb

@@ -1,8 +1,8 @@
 class TF::EnvArrTest
   MATCHER = {
-    :all  => /^env\[(.*)\]\[\]([!]?=)[~]?\/(.*)\/$/,
-    :one  => /^env\[(.*)\]\[(.+)\]([!]?=)[~]?\/(.*)\/$/,
-    :size => /^env\[(.*)\]\[\]([!]?=)([[:digit:]]+)$/,
+    :all  => /^env\[([a-zA-Z_][a-zA-Z0-9_]*)\]\[\]([!]?=)[~]?\/(.*)\/$/,
+    :one  => /^env\[([a-zA-Z_][a-zA-Z0-9_]*)\]\[(.+)\]([!]?=)[~]?\/(.*)\/$/,
+    :size => /^env\[([a-zA-Z_][a-zA-Z0-9_]*)\]\[\]([!]?=)([[:digit:]]+)$/,
   }
 
   def matches? test
@@ -12,6 +12,7 @@ class TF::EnvArrTest
 
   def execute test, _stdout, _stderr, _stdboth, _status, env
     type, matcher = TF::EnvArrTest::MATCHER.find{|k,v| test =~ v }
+    $stderr.puts "EnvArrTest: #{type}." if ENV["TF_DEBUG"]
     send "execute_#{type}".to_sym, matcher, test, _stdout, _stderr, _stdboth, _status, env
   end
 

data/lib/plugins/tf/env_match_test.rb

@@ -1,5 +1,5 @@
 class TF::EnvMatchTest
-  MATCHER = /^env\[(.*)\]([!]?=)[~]?\/(.*)\/$/
+  MATCHER = /^env\[([a-zA-Z_][a-zA-Z0-9_]*)\]([!]?=)[~]?\/(.*)\/$/
 
   def matches? test
     test =~ TF::EnvMatchTest::MATCHER
@@ -9,7 +9,8 @@ class TF::EnvMatchTest
     test =~ TF::EnvMatchTest::MATCHER
     variable, sign, value = $1.strip, $2, $3
     var_val = env[ variable ]
-    unless var_val.is_a? String
+    if  !(var_val.nil?) && !(var_val.is_a?(String))
+      $stderr.puts "Not a string: #{var_val}, type:#{var_val.class}." if ENV["TF_DEBUG"]
       return [ false, "failed: env #{variable} #{sign} /#{value}/ # not a string" ]
     end
     if ( sign == "=" ) ^ ( Regexp.new(value) =~ "#{var_val}" )

data/lib/plugins/tf/env_type_test.rb

@@ -1,5 +1,5 @@
 class TF::EnvTypeTest
-  MATCHER = /^env\[(.*)\]\?([!]?=)(array|string|nil)/
+  MATCHER = /^env\[([a-zA-Z_][a-zA-Z0-9_]*)\]\?([!]?=)(array|string|nil)/
 
   def matches? test
     test =~ TF::EnvTypeTest::MATCHER

data/lib/tf/environment.rb

@@ -22,7 +22,7 @@ class TF::Environment
   HANDLER=<<EOF.gsub(/\n/,'')
 set | awk -F= '
   BEGIN{v=0;}
-  /^[a-zA-Z_]+=/{v=1;}
+  /^[a-zA-Z_][a-zA-Z0-9_]*=/{v=1;}
   v==1&&$2~/^['\\''\\$]/{v=2;}
   v==1&&$2~/^\\(/{v=3;}
   v==2&&/'\\''$/&&!/'\\'\\''$/{v=1;}
@@ -41,14 +41,18 @@ EOF
       terminator=nil
       output.each do |line|
         line.chomp!
-        if holder.nil? && line =~ /^[^=]+=([\('\$]?)/
-          holder = line
-          if $1 && !$1.empty?
-            terminator = $1.sub(/\$/,"'").sub(/\(/,")")
+        if holder.nil?
+          if line =~ /^[^=]+=([\('\$]?)/
+            holder = line
+            if $1 && !$1.empty?
+              terminator = $1.sub(/\$/,"'").sub(/\(/,")")
+            end
+          elsif line =~ /^[^=]*=/
+            holder = line
+            terminator=nil
+          else
+            $stderr.puts "Unknown environment token: #{line}." if ENV["TF_DEBUG"]
           end
-        elsif holder.nil? && line =~ /^[^=]*=/
-          holder = line
-          terminator=nil
         else
           holder += line
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tf
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Michal Papis