tdi 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b8898f508f627e740b007ad50d900d6e4c4ae5d
-  data.tar.gz: b8eebdef3edd43ab89b508ff9020e260dd483cdd
+  metadata.gz: 6e5c1d4fca793f870fa9903d2c4a4f53a9a549cc
+  data.tar.gz: 45dc36c3ae00fed07ebd5c8bd41e78193191aa56
 SHA512:
-  metadata.gz: 5a38f4bd18507d935778ce36accdccad54e4472091e5e205c361923d776dd9e768b3aab1d4cb56c18fea57cb26a1171ead5c52b21ba6fdab64a4b1b6d7abdf54
-  data.tar.gz: e3932200c469a3662994fadf132bf7d21770fed18bc6a44897063a9a72ad9471bfb7004f24c78d9a6852b776a96ee6969f88201a11041ad90adaee3c060f9bda
+  metadata.gz: f51b22a4c87dacd8c0bc692b9754c84730375c310aaaf1de4b9e77f89fc4842909662dc36237a08d827fb2968df3e9a5e90d982702fd9444fccc74d73ac0b5fc
+  data.tar.gz: 5709e6bbfc9f2a9ffd8512ae80a83ecc1de802510d0c37c07a85df931dccdf2f41f70521dbc94859e16d44ca81a8e566371a97e0a129266d45db254dc3773072

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    tdi (0.1.3)
+    tdi (0.1.5)
       colorize
       etc
       net-ssh
       os
-      slop
+      slop (~> 3.6)
       timeout
 
 GEM

data/bin/tdi

@@ -184,8 +184,8 @@ EOS
     on :v, :verbose, 'Verbose mode.', :as => :count
     on :version, 'Version.'
   end
-rescue
-  puts 'ERR: Invalid option. Try -h or --help for help.'.light_magenta
+rescue => e
+  puts "ERR: Invalid option. Try -h or --help for help. (#{e.message})".light_magenta
   exit 1
 end
 

data/helper/acl.rb

@@ -50,7 +50,7 @@ class TDIPlan < TDI
               failure "ACL (#{user}): Connection Refused #{host}:#{port}"
             rescue Resolv::ResolvError => re
               failure "ACL (#{user}): #{re.message}"
-            rescue Resolv::ResolvTimeou => rt
+            rescue Resolv::ResolvTimeout => rt
               failure "ACL (#{user}): #{rt.message}"
             end
           end

data/helper/file.rb

@@ -39,7 +39,7 @@ class TDIPlan < TDI
       begin
         Process.euid = 0
       rescue => e
-        puts "ERR: Must run as root to change user credentials #{e}).".light_magenta
+        puts "ERR: Must run as root to change user credentials (#{e.message}).".light_magenta
         exit 1
       end
 
@@ -47,7 +47,7 @@ class TDIPlan < TDI
       begin
         Process.euid = Etc.getpwnam(user).uid
       rescue => e
-        puts "ERR: User \"#{user}\" not found (#{e}).".light_magenta
+        puts "ERR: User \"#{user}\" not found (#{e.message}).".light_magenta
         exit 1
       end
 

data/helper/ssh.rb

@@ -42,7 +42,7 @@ class TDIPlan < TDI
         begin
           Process.euid = 0
         rescue => e
-          puts "ERR: Must run as root to change user credentials #{e}).".light_magenta
+          puts "ERR: Must run as root to change user credentials (#{e.message}).".light_magenta
           exit 1
         end
 
@@ -53,7 +53,7 @@ class TDIPlan < TDI
           # private/public key pair to authenticate.
           ENV['HOME'] = Etc.getpwnam(local_user).dir
         rescue => e
-          puts "ERR: User \"#{local_user}\" not found (#{e}).".light_magenta
+          puts "ERR: User \"#{local_user}\" not found (#{e.message}).".light_magenta
           exit 1
         end
 
@@ -70,8 +70,8 @@ class TDIPlan < TDI
           failure "SSH (#{local_user}): #{re.message}"
         rescue Resolv::ResolvTimeout => rt
           failure "SSH (#{local_user}): #{rt.message}"
-        rescue
-          failure "SSH (#{local_user}): #{remote_user}@#{host}"
+        rescue => e
+          failure "SSH (#{local_user}): #{remote_user}@#{host} (#{e.message})"
         end
       end
     end

data/lib/runner.rb

@@ -115,7 +115,7 @@ def runner(opts, filename, plan)
 
   puts 'Running tests... done.'.green if opts[:verbose] > 1
 
-  ret = tdiplan.passed? ? 0 : 1
+  ret = tdiplan.plan_passed? ? 0 : 1
   ret = 0 if opts.nofail?
   ret
 end

data/lib/tdi.rb

@@ -20,12 +20,14 @@
 require_relative 'tdi/version'
 
 class TDI
-  attr_accessor :passed
-  alias :passed? :passed
+  attr_accessor :plan_passed, :case_passed
+  alias :plan_passed? :plan_passed
+  alias :case_passed? :case_passed
   attr_accessor :skip, :pass, :warn, :fail
 
   def initialize
-    @passed = true
+    @plan_passed = true
+    @case_passed = true
     @skip = 0
     @pass = 0
     @warn = 0
@@ -34,21 +36,19 @@ class TDI
 
   def success(msg)
     # I like the seventies.
-    printf('%-70s', msg)
-    puts ' [ ' + 'PASS'.light_green + ' ]'
+    printf("%-70s [ %s ]\n", msg, 'PASS'.light_green )
     @pass += 1
   end
 
   def warning(msg)
-    printf('%-70s', msg)
-    puts ' [ ' + 'WARN'.light_yellow + ' ]'
+    printf("%-70s [ %s ]\n", msg, 'WARN'.light_yellow )
     @warn += 1
   end
 
   def failure(msg)
-    printf('%-70s', msg)
-    puts ' [ ' + 'FAIL'.light_red + ' ]'
-    @passed = false
+    printf("%-70s [ %s ]\n", msg, 'FAIL'.light_red )
+    @plan_passed = false
+    @case_passed = false
     @fail += 1
   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.3'
+  VERSION = '0.1.5'
 end

data/tdi.gemspec

@@ -25,7 +25,7 @@ validating your deployed infrastructure and external dependencies.)
 
   spec.add_runtime_dependency 'os'
   spec.add_runtime_dependency 'etc'
-  spec.add_runtime_dependency 'slop'
+  spec.add_runtime_dependency 'slop', '~> 3.6'
   spec.add_runtime_dependency 'colorize'
   spec.add_runtime_dependency 'timeout'
   spec.add_runtime_dependency 'net-ssh'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdi
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Rogério Carvalho Schneider
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,16 +72,16 @@ dependencies:
   name: slop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement