From 0406d627bcd7e24d181944b4d2c70a7b6e50ccf5 Mon Sep 17 00:00:00 2001
From: John Duarte <john.duarte@puppetlabs.com>
Date: Fri, 16 May 2014 14:58:17 -0700
Subject: Fix calls to ruby

---
 spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb    | 2 +-
 spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb    | 4 ++--
 spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb   | 4 ++--
 spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb      | 4 ++--
 spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb     | 4 ++--
 .../acceptance/beaker/git/revision_checkout/revision_checkout_http.rb | 4 ++--
 .../beaker/git/revision_checkout/revision_checkout_https.rb           | 4 ++--
 .../beaker/git/shallow_clone/negative/shallow_clone_http.rb           | 2 +-
 spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb       | 2 +-
 spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb          | 4 ++--
 spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb         | 4 ++--
 spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb        | 4 ++--
 spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb       | 4 ++--
 13 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'spec/acceptance')

diff --git a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
index 67a6f73..67a7ed9 100644
--- a/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
+++ b/spec/acceptance/beaker/git/basic_auth/basic_auth_checkout_https.rb
@@ -7,7 +7,7 @@ password  = 'bar'
 http_server_script = 'basic_auth_https_daemon.rb'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
index 9fea700..6da34e8 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_http.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_branch_checkout'
 branch = 'a_branch'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -27,7 +27,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'checkout a branch with puppet' do
diff --git a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
index 4d6a4ab..6ebd9fd 100644
--- a/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
+++ b/spec/acceptance/beaker/git/branch_checkout/branch_checkout_https.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_branch_checkout'
 branch = 'a_branch'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -34,7 +34,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'checkout a branch with puppet' do
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
index 4888bd2..0c86c77 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_http.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_group_checkout'
 group = 'mygroup'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -31,7 +31,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
     apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
index 3a72cc8..0bcbd97 100644
--- a/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
+++ b/spec/acceptance/beaker/git/group_checkout/group_checkout_https.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_group_checkout'
 group = 'mygroup'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -38,7 +38,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
     apply_manifest_on(host, "group { '#{group}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
index 5f5d9e5..9755d8e 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_http.rb
@@ -4,7 +4,7 @@ test_name 'C3455 - checkout a revision (http protocol)'
 repo_name = 'testrepo_revision_checkout'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -26,7 +26,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'get revision sha from repo' do
diff --git a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
index 0a935aa..16b5145 100644
--- a/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
+++ b/spec/acceptance/beaker/git/revision_checkout/revision_checkout_https.rb
@@ -4,7 +4,7 @@ test_name 'C3456 - checkout a revision (https protocol)'
 repo_name = 'testrepo_revision_checkout'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -33,7 +33,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'get revision sha from repo' do
diff --git a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
index 4c43be1..ecd51ad 100644
--- a/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/negative/shallow_clone_http.rb
@@ -4,7 +4,7 @@ test_name 'C3479 - shallow clone repo minimal depth = 1 (http protocol)'
 repo_name = 'testrepo_shallow_clone'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
diff --git a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
index 1a34521..6254865 100644
--- a/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
+++ b/spec/acceptance/beaker/git/shallow_clone/shallow_clone_https.rb
@@ -4,7 +4,7 @@ test_name 'C3480 - shallow clone repo minimal depth = 1 (https protocol)'
 repo_name = 'testrepo_shallow_clone'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
index f2f721a..cff6071 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_http.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_tag_checkout'
 tag = '0.0.2'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -27,7 +27,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'get tag sha from repo' do
diff --git a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
index fdfa02c..1e3cc51 100644
--- a/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
+++ b/spec/acceptance/beaker/git/tag_checkout/tag_checkout_https.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_tag_checkout'
 tag = '0.0.2'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -34,7 +34,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
   end
 
   step 'get tag sha from repo' do
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
index 379425b..07f5c1c 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_http.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_user_checkout'
 user = 'myuser'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -31,7 +31,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/http_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/http_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
     apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
   end
 
diff --git a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
index bd9b498..7187586 100644
--- a/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
+++ b/spec/acceptance/beaker/git/user_checkout/user_checkout_https.rb
@@ -5,7 +5,7 @@ repo_name = 'testrepo_user_checkout'
 user = 'myuser'
 
 hosts.each do |host|
-  ruby = '/opt/puppet/bin/ruby' if host.is_pe? || 'ruby'
+  ruby = (host.is_pe? && '/opt/puppet/bin/ruby') || 'ruby'
   tmpdir = host.tmpdir('vcsrepo')
   step 'setup - create repo' do
     install_package(host, 'git')
@@ -38,7 +38,7 @@ hosts.each do |host|
 
   teardown do
     on(host, "rm -fr #{tmpdir}")
-    on(host, 'ps ax | grep "#{ruby} /tmp/https_daemon.rb" | grep -v grep | awk \'{print "kill -9 " $1}\' | sh')
+    on(host, "ps ax | grep '#{ruby} /tmp/https_daemon.rb' | grep -v grep | awk '{print \"kill -9 \" $1}' | sh")
     apply_manifest_on(host, "user { '#{user}': ensure => absent, }")
   end
 
-- 
cgit v1.2.3