auxesis-cucumber-nagios 0.4.1 → 0.4.3

data/Rakefile

@@ -13,15 +13,6 @@ rescue LoadError
 end
 
 
-desc "freeze deps"
-task :deps do 
-  deps = ['cucumber', 'webrat', 'mechanize']
-  deps.each do |dep|
-    puts "installing #{dep}"
-    system("gem install #{dep} -i gems --no-rdoc --no-ri")
-  end
-end
-
 desc "build gem"
 task :build do 
   system("gem build cucumber-nagios.gemspec")

data/lib/generators/project/Rakefile

@@ -27,6 +27,9 @@ task :deps do
   puts "\ninstalling dependencies. this will take a few minutes."
 
   deps.each_pair do |dep, version|
+    if Dir.glob("gems/gems/#{dep}-#{version.split.last}").size > 0
+      next unless ENV["FORCE"]
+    end
     puts "\ninstalling #{dep} (#{version})"
     system("gem install #{dep} --version '#{version}' -i gems --no-rdoc --no-ri")
   end

data/lib/generators/project/bin/cucumber

@@ -7,5 +7,17 @@ rescue LoadError
   require 'bin/common'
 end
 
+require 'cucumber/rspec_neuter'
 require 'cucumber/cli/main'
-Cucumber::Cli::Main.execute(ARGV)
+
+begin
+  # The dup is to keep ARGV intact, so that tools like ruby-debug can respawn.
+  failure = Cucumber::Cli::Main.execute(ARGV.dup)
+  Kernel.exit(failure ? 1 : 0)
+rescue SystemExit => e
+  Kernel.exit(e.status)
+rescue Exception => e
+  STDERR.puts("#{e.message} (#{e.class})")
+  STDERR.puts(e.backtrace.join("\n"))
+  Kernel.exit 1
+end

data/lib/generators/project/features/support/nagios.rb

@@ -2,8 +2,9 @@ module Nagios
   class NagiosFormatter < Cucumber::Ast::Visitor
     def initialize(step_mother, io, options={})
       super(step_mother)
-      @failed = []
-      @passed = []
+      @failed  = []
+      @passed  = []
+      @warning = []
     end
 
     def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
@@ -13,6 +14,8 @@ module Nagios
           @passed << step_match
         when :failed
           @failed << step_match
+        when :undefined
+          @warning << step_match
       end
     end
 
@@ -23,14 +26,16 @@ module Nagios
 
     private
     def print_summary
-      @total = @failed.size + @passed.size
+      @total = @failed.size + @passed.size + @warning.size
       message = ""
       message += "Critical: #{@failed.size}, "
-      message += "Warning: 0, "
+      message += "Warning: #{@warning.size}, "
       message += "#{@passed.size} okay"
       # nagios performance data
       message += " | passed=#{@passed.size}"
-      message += ", failed=#{@failed.size}, total=#{@total}"
+      message += ", failed=#{@failed.size}"
+      message += ", nosteps=#{@warning.size}"
+      message += ", total=#{@total}"
       puts message
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auxesis-cucumber-nagios
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors: 
 - Lindsay Holmwood