tdi 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ace014ad816a976c9ca34af587c453b3855039b
-  data.tar.gz: 9f884036570d63cbddb5bb9e13798b5457d2259c
+  metadata.gz: 5b8898f508f627e740b007ad50d900d6e4c4ae5d
+  data.tar.gz: b8eebdef3edd43ab89b508ff9020e260dd483cdd
 SHA512:
-  metadata.gz: 2e22075e3756151860807f0c6e94dfceb19fcfe63757de885b491d6166f98013fa7317bb1d29836ee960c4c48d9f05c6e6decbc6eb0779df91da34fd11005302
-  data.tar.gz: b2b39a09a8c839f7f24e2277f3a4f4cdc2ebedb1d661f183bb9c507000d4522b6f542b506699713911da836598ce7aa2dff60044c6adbaea1d3fb9ff676d738f
+  metadata.gz: 5a38f4bd18507d935778ce36accdccad54e4472091e5e205c361923d776dd9e768b3aab1d4cb56c18fea57cb26a1171ead5c52b21ba6fdab64a4b1b6d7abdf54
+  data.tar.gz: e3932200c469a3662994fadf132bf7d21770fed18bc6a44897063a9a72ad9471bfb7004f24c78d9a6852b776a96ee6969f88201a11041ad90adaee3c060f9bda

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tdi (0.1.1)
+    tdi (0.1.3)
       colorize
       etc
       net-ssh

data/helper/http.rb

@@ -42,6 +42,7 @@ class TDIPlan < TDI
     # Params
     code = params['code'].nil? ? 200 : params['code'].to_i
     match = params['match']
+    expect_header = params['expect_header']
     timeout_limit = params['timeout'].nil? ? 2 : params['timeout'].to_i
 
     if not params['proxy'].nil?
@@ -49,8 +50,15 @@ class TDIPlan < TDI
         proxy_port = 3128 unless not proxy_port.nil?
     end
 
-    return host, port, path, proxy_addr, proxy_port, code, match, ssl, timeout_limit
-    
+    if not params['expect_header'].nil?
+        expect_header_key = params['expect_header'].split(':').first
+        expect_header_value = nil
+        if params['expect_header'].include?(':')
+            expect_header_value = params['expect_header'][params['expect_header'].index(':')+1..-1].strip
+        end
+    end
+
+    return host, port, path, proxy_addr, proxy_port, code, match, expect_header_key, expect_header_value, ssl, timeout_limit
   end
 
   def http(plan)
@@ -58,11 +66,11 @@ class TDIPlan < TDI
       val.is_a?(Hash)
     }.each_pair do |case_name,case_content|
 
-      host, port, path, proxy_addr, proxy_port, code, match, ssl, timeout_limit = _parse(case_name,case_content)
+      host, port, path, proxy_addr, proxy_port, code, match, expect_header_key, expect_header_value, ssl, timeout_limit = _parse(case_name,case_content)
 
       # User
       user = Etc.getpwuid(Process.euid).name
-     
+
       response = nil
 
       if not proxy_addr.nil? and not proxy_port.nil?
@@ -87,7 +95,7 @@ class TDIPlan < TDI
         rescue Timeout::Error
           failure "HTTP (#{user}): #{case_name} - Timed out (#{timeout_limit}s)."
         end
-        
+
       else
         begin
           Resolv.getaddress(host)
@@ -114,19 +122,21 @@ class TDIPlan < TDI
         rescue Timeout::Error
           failure "HTTP (#{user}): #{case_name} - Timed out."
         end
-        
       end
 
       if not response.nil?
           if not match.nil? and not response.body.chomp.include?(match.chomp)
-            failure "HTTP (#{user}): #{case_name} - Expected string '#{match.chomp}'."
+            failure "HTTP (#{user}): #{case_name} - Expected string '#{match.chomp}'"
+          elsif not expect_header_key.nil? and not expect_header_value.nil? and not response[expect_header_key].eql?(expect_header_value)
+            failure "HTTP (#{user}): #{case_name} - Expected header with content '#{expect_header_key}: #{expect_header_value}'"
+          elsif not expect_header_key.nil? and response[expect_header_key].nil?
+            failure "HTTP (#{user}): #{case_name} - Expected header '#{expect_header_key}'"
           elsif not code.nil? and (response.code.to_i != code)
-            failure "HTTP (#{user}): #{case_name} - Expected HTTP #{code}."
+            failure "HTTP (#{user}): #{case_name} - Expected HTTP #{code}"
           else
             success "HTTP (#{user}): #{case_name}"
           end
       end
-      
     end
   end
 end

data/lib/tdi/version.rb

@@ -18,5 +18,5 @@
 # along with TDI.  If not, see <http://www.gnu.org/licenses/>.
 
 module Tdi
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdi
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Rogério Carvalho Schneider
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler