From 93961fb71bfdb608188696bb214a60079c8b9e83 Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Tue, 14 Jun 2011 21:32:30 +1000 Subject: [PATCH 1/6] Cleaned up whitespace --- lib/cucumber/nagios/steps/ssh_steps.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/cucumber/nagios/steps/ssh_steps.rb b/lib/cucumber/nagios/steps/ssh_steps.rb index 7334eb3..9df61a3 100644 --- a/lib/cucumber/nagios/steps/ssh_steps.rb +++ b/lib/cucumber/nagios/steps/ssh_steps.rb @@ -4,7 +4,7 @@ Then /^I can ssh to "([^\"]*)" with the following credentials:$/ do |host, table| @auth_methods ||= %w(publickey password) - + credentials = table.hashes credentials.each do |creds| lambda { @@ -19,19 +19,19 @@ session_details = table.hashes session_details.each do |session| - # initialize a list of keys and auth methods for just this session, as + # initialize a list of keys and auth methods for just this session, as # session can have session-specific keys mixed with global keys session_keys = Array.new(@keys) - session_auth_methods = Array.new(@auth_methods) + session_auth_methods = Array.new(@auth_methods) - # you can pass in a keyfile in the session details, so we need to + # you can pass in a keyfile in the session details, so we need to if session["keyfile"] session_keys << session["keyfile"] session_auth_methods << "publickey" end - + lambda { - Net::SSH.start(session["hostname"], session["username"], :password => session["password"], + Net::SSH.start(session["hostname"], session["username"], :password => session["password"], :auth_methods => session_auth_methods, :keys => session_keys) }.should_not raise_error @@ -56,14 +56,14 @@ @auth_methods ||= %w(password) session = table.hashes.first session_keys = Array.new(@keys) - session_auth_methods = Array.new(@auth_methods) + session_auth_methods = Array.new(@auth_methods) if session["keyfile"] session_keys << session["keyfile"] session_auth_methods << "publickey" end lambda { - @connection = Net::SSH.start(hostname, session["username"], :password => session["password"], + @connection = Net::SSH.start(hostname, session["username"], :password => session["password"], :auth_methods => session_auth_methods, :keys => session_keys) }.should_not raise_error From 2816c92f4b67b660d2262b5cc6cfd97936c9c103 Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Tue, 14 Jun 2011 21:34:02 +1000 Subject: [PATCH 2/6] Assign the Net::SSH instance to a @connection object --- lib/cucumber/nagios/steps/ssh_steps.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/cucumber/nagios/steps/ssh_steps.rb b/lib/cucumber/nagios/steps/ssh_steps.rb index 9df61a3..bfc542d 100644 --- a/lib/cucumber/nagios/steps/ssh_steps.rb +++ b/lib/cucumber/nagios/steps/ssh_steps.rb @@ -8,7 +8,9 @@ credentials = table.hashes credentials.each do |creds| lambda { - Net::SSH.start(host, creds["username"], :password => creds["password"], :auth_methods => @auth_methods) + @connection = Net::SSH.start(host, creds["username"], + :password => creds["password"], + :auth_methods => @auth_methods) }.should_not raise_error end end @@ -31,9 +33,11 @@ end lambda { - Net::SSH.start(session["hostname"], session["username"], :password => session["password"], - :auth_methods => session_auth_methods, - :keys => session_keys) + @connection = Net::SSH.start(session["hostname"], + session["username"], + :password => session["password"], + :auth_methods => session_auth_methods, + :keys => session_keys) }.should_not raise_error end end From 161ddc18f416d2363cec177c190e7a1f9bf460dd Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Tue, 14 Jun 2011 21:34:46 +1000 Subject: [PATCH 3/6] Bumped the patch version of cucumber-nagios --- lib/cucumber/nagios/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cucumber/nagios/version.rb b/lib/cucumber/nagios/version.rb index 70c1d1f..791cd94 100644 --- a/lib/cucumber/nagios/version.rb +++ b/lib/cucumber/nagios/version.rb @@ -1,5 +1,5 @@ module Cucumber module Nagios - VERSION = '0.9.0' + VERSION = '0.9.1' end end From c3cc44d3393e63795f3c433988b83420499a62cd Mon Sep 17 00:00:00 2001 From: Lindsay Holmwood Date: Tue, 14 Jun 2011 22:10:25 +1000 Subject: [PATCH 4/6] Bumped the patch version of cucumber-nagios --- lib/cucumber/nagios/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cucumber/nagios/version.rb b/lib/cucumber/nagios/version.rb index 791cd94..6a49412 100644 --- a/lib/cucumber/nagios/version.rb +++ b/lib/cucumber/nagios/version.rb @@ -1,5 +1,5 @@ module Cucumber module Nagios - VERSION = '0.9.1' + VERSION = '0.9.2' end end From cf0daa01766729bd91739301b7ee8d0d67bd7e93 Mon Sep 17 00:00:00 2001 From: tkn Date: Tue, 28 Aug 2012 15:21:29 +0200 Subject: [PATCH 5/6] relax dependency versions a bit so we can use cucumber-nagios with recent versions of bundler and Chef --- cucumber-nagios.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cucumber-nagios.gemspec b/cucumber-nagios.gemspec index 5a909cf..56ebd67 100644 --- a/cucumber-nagios.gemspec +++ b/cucumber-nagios.gemspec @@ -24,8 +24,8 @@ Gem::Specification.new do |s| s.add_runtime_dependency "webrat", "= 0.7.2" s.add_runtime_dependency "mechanize", "= 1.0.0" s.add_runtime_dependency "templater", ">= 1.0.0" - s.add_runtime_dependency "net-ssh", "~> 2.1.0" + s.add_runtime_dependency "net-ssh", "~> 2.2.0" s.add_runtime_dependency "amqp", "= 0.6.7" - s.add_runtime_dependency "bundler", "~> 1.0.7" + s.add_runtime_dependency "bundler", "~> 1.1.5" s.add_development_dependency "rake", ">= 0.8.3" end From 9d42019bdfefbd5361243ecdc3730d202ea7b2ac Mon Sep 17 00:00:00 2001 From: tkn Date: Wed, 26 Sep 2012 12:13:29 +0200 Subject: [PATCH 6/6] relax bundler version to `>= 1.0.7` so that it stays backwards compatible and works both with bundler 1.1.x and 1.2.x --- cucumber-nagios.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cucumber-nagios.gemspec b/cucumber-nagios.gemspec index 56ebd67..65513b1 100644 --- a/cucumber-nagios.gemspec +++ b/cucumber-nagios.gemspec @@ -26,6 +26,6 @@ Gem::Specification.new do |s| s.add_runtime_dependency "templater", ">= 1.0.0" s.add_runtime_dependency "net-ssh", "~> 2.2.0" s.add_runtime_dependency "amqp", "= 0.6.7" - s.add_runtime_dependency "bundler", "~> 1.1.5" + s.add_runtime_dependency "bundler", ">= 1.0.7" s.add_development_dependency "rake", ">= 0.8.3" end