taste_tester 0.0.8 → 0.0.9

data/README.md

@@ -1,5 +1,7 @@
 # Taste Tester
 
+[![Build Status](https://travis-ci.org/facebook/taste-tester.svg)](http://travis-ci.org/facebook/taste-tester)
+
 ## Intro
 Ohai!
 
@@ -38,8 +40,9 @@ See the help for futher information.
 
 ## Prerequisites
 
-* Taste Tester assumes that /etc/chef/client.rb on your servers is a symlink and
-that your real config is /etc/chef/client-prod.rb
+* Taste Tester assumes that /etc/chef/client.rb and /etc/chef/client.pem on your
+servers is a symlink and that your real config is /etc/chef/client-prod.rb and
+/etc/chef/client-prod.pem, respectively.
 
 * Taste Tester assumes that it's generally safe to "go back" to production. I.e.
 We set things up so you can set a cronjob to un-taste-test a server after the
@@ -47,7 +50,10 @@ desired amount of time, which means it must be (relatively) safe to revert
 back.
 
 * Taste Tester assumes you use a setup similar to grocery-delivery in
-production. Specifically that you don't use versions or environments. 
+production. Specifically that you don't use versions or environments.
+
+* Taste Tester assumes you have password-less SSH authentication to the hosts
+you want to test on, i.e. SSH public/private keys, SSH certificates, Kerberos
 
 ## Dependencies
 
@@ -79,7 +85,7 @@ standard Ruby.
 All command-line options are available in the config file:
 * debug (bool, default: `false`)
 * timestamp (bool, default: `false`)
-* config_file (string, default: `/etc/gd-config.rb`)
+* config_file (string, default: `/etc/taste-tester-config.rb`)
 * plugin_path (string, default: `/etc/taste-tester-plugin.rb`)
 * repo (string, default: `#{ENV['HOME']}/ops`)
 * testing_time (int, default: `3600`)

data/bin/taste-tester

@@ -1,14 +1,14 @@
-#!/opt/chef/embedded/bin/ruby
+#!/usr/bin/env ruby
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,10 +18,6 @@
 $LOAD_PATH.unshift(File.dirname(File.realpath(__FILE__)) + '/../lib')
 
 # rubocop:disable UnusedBlockArgument, AlignParameters
-if ENV['MY_RUBY_HOME'] && ENV['MY_RUBY_HOME'].include?('rvm')
-  puts 'Please disable RVM before running taste-tester'
-  exit(1)
-end
 
 require 'rubygems'
 require 'time'
@@ -43,6 +39,15 @@ end
 # Command line parsing and param descriptions
 module TasteTester
   verify = 'Verify your changes were actually applied as intended!'.red
+
+  # Do an initial read of the config file if it's in the default place, so
+  # that if people override chef_client_command the help message is correct.
+  if File.exists?(File.expand_path(TasteTester::Config.config_file))
+    TasteTester::Config.from_file(
+      File.expand_path(TasteTester::Config.config_file)
+    )
+  end
+
   cmd = TasteTester::Config.chef_client_command
   description = <<-EOF
 Welcome to taste-tester!
@@ -50,17 +55,17 @@ Welcome to taste-tester!
 Usage: taste-tester <mode> [<options>]
 
 TLDR; Most common usage is:
-  vi cookbooks/...             # Make your changes and commit locally
-  taste-tester test -s [host]  # Put host in test mode
-  ssh root@[host]              # Log on host
-  #{format('%-28s', "  #{cmd}")} # Run chef and watch it break
-  vi cookbooks/...             # Fix your cookbooks
-  taste-tester upload          # Upload the diff
-  ssh root@[host]              # Log on host
-  #{format('%-28s', "  #{cmd}")} # Run chef and watch it succeed
+  vi cookbooks/...              # Make your changes and commit locally
+  taste-tester test -s [host]   # Put host in test mode
+  ssh root@[host]               # Log on host
+  #{format('%-28s', "  #{cmd}")}  # Run chef and watch it break
+  vi cookbooks/...              # Fix your cookbooks
+  taste-tester upload           # Upload the diff
+  ssh root@[host]               # Log on host
+  #{format('%-28s', "  #{cmd}")}  # Run chef and watch it succeed
   <#{verify}>
-  taste-tester untest [host]   # Put host back in production
-                               #   (optional - will revert itself after 1 hour)
+  taste-tester untest -s [host] # Put host back in production
+                                #   (optional - will revert itself after 1 hour)
 
 And you're done! See the above wiki page for more details.
 
@@ -247,6 +252,13 @@ MODES:
       options[:repo] = dir
     end
 
+    opts.on(
+      '--repo-type TYPE',
+      'Override repo type, default is auto.'
+    ) do |type|
+      options[:repo_type] = type
+    end
+
     opts.on(
       '-R', '--roles ROLE[,ROLE]', Array,
       'Specific roles to upload. Intended mostly for debugging,' +
@@ -279,6 +291,12 @@ MODES:
       options[:use_ssh_tunnels] = s
     end
 
+    opts.on(
+      '-e', '--ssh CMD', 'SSH command to use, defaults to "ssh".'
+    ) do |c|
+      options[:ssh_command] = c
+    end
+
     opts.on('--skip-repo-checks', 'Skip repository sanity checks') do
       options[:skip_repo_checks] = true
     end

data/lib/taste_tester/client.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,6 +30,8 @@ module TasteTester
     attr_accessor :force, :skip_checks
 
     def initialize(server)
+      path = File.expand_path(TasteTester::Config.repo)
+      logger.warn("Using #{path}")
       @server = server
       @knife = BetweenMeals::Knife.new(
         :logger => logger,
@@ -62,7 +64,6 @@ module TasteTester
     def upload
       checks unless @skip_checks
 
-      logger.warn("Using #{TasteTester::Config.repo}")
       logger.info("Last commit: #{@repo.head_rev} " +
         "'#{@repo.last_msg.split("\n").first}'" +
         " by #{@repo.last_author[:email]}")

data/lib/taste_tester/commands.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -155,7 +155,7 @@ module TasteTester
         server.start
       end
       client = TasteTester::Client.new(server)
-      client.skip_checks = true if TasteTester::Config.skip_checks
+      client.skip_checks = true if TasteTester::Config.skip_repo_checks
       client.force = true if TasteTester::Config.force_upload
       client.upload
     rescue => exception
@@ -174,8 +174,9 @@ module TasteTester
           retry
         end
       end
-      logger.error("Upload failed")
+      logger.error('Upload failed')
       logger.error(exception.to_s)
+      logger.error(exception.backtrace.join("\n"))
       exit 1
     end
   end

data/lib/taste_tester/config.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@ module TasteTester
     extend BetweenMeals::Util
 
     repo "#{ENV['HOME']}/ops"
-    repo_type 'git'
+    repo_type 'auto'
     base_dir 'chef'
     cookbook_dirs ['cookbooks']
     role_dir 'roles'
@@ -48,8 +48,10 @@ module TasteTester
     tunnel_port 4001
     timestamp_file '/etc/chef/test_timestamp'
     use_ssh_tunnels false
+    ssh_command 'ssh'
     use_ssl true
     chef_zero_logging true
+    chef_config_path '/etc/chef'
 
     skip_pre_upload_hook false
     skip_post_upload_hook false
@@ -74,7 +76,7 @@ module TasteTester
     end
 
     def self.relative_role_dir
-      (base_dir && !base_dir.empty?) ? File.join(base_dir, role_dir) : x
+      (base_dir && !base_dir.empty?) ? File.join(base_dir, role_dir) : role_dir
     end
 
     def self.databags
@@ -82,7 +84,11 @@ module TasteTester
     end
 
     def self.relative_databag_dir
-      (base_dir && !base_dir.empty?) ? File.join(base_dir, databag_dir) : x
+      if base_dir && !base_dir.empty?
+        File.join(base_dir, databag_dir)
+      else
+        databag_dir
+      end
     end
 
     def self.chef_port

data/lib/taste_tester/hooks.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,6 +16,8 @@
 
 require 'taste_tester/logging'
 require 'between_meals/util'
+require 'between_meals/repo/hg'
+require 'between_meals/repo/git'
 
 module TasteTester
   # Hooks placeholders

data/lib/taste_tester/host.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -39,8 +39,10 @@ module TasteTester
     end
 
     def runchef
-      logger.warn("Running '#{TasteTester::Config.command}' on #{@name}")
-      cmd = "ssh #{TasteTester::Config.user}@#{@name} "
+      logger.warn("Running '#{TasteTester::Config.chef_client_command}' " +
+                  "on #{@name}")
+      cmd = "#{TasteTester::Config.ssh_command} " +
+            "#{TasteTester::Config.user}@#{@name} "
       if TasteTester::Config.user != 'root'
         cc = Base64.encode64(cmds).gsub(/\n/, '')
         cmd += "\"echo '#{cc}' | base64 --decode | sudo bash -x\""
@@ -58,12 +60,12 @@ module TasteTester
         io.close
         $CHILD_STATUS.to_i
       end
-      logger.warn("Finished #{TasteTester::Config.command}" +
+      logger.warn("Finished #{TasteTester::Config.chef_client_command}" +
                   " on #{@name} with status #{status}")
       if status == 0
-        msg = "#{TasteTester::Config.command} was successful" +
-          ' - please log to the host and confirm all the intended' +
-          ' changes were made'
+        msg = "#{TasteTester::Config.chef_client_command} was successful" +
+              ' - please log to the host and confirm all the intended' +
+              ' changes were made'
         logger.error msg.upcase
       end
     end
@@ -88,10 +90,11 @@ module TasteTester
       ssh << "touch -t #{TasteTester::Config.testing_end_time}" +
         " #{TasteTester::Config.timestamp_file}"
       ssh << "echo -n '#{@serialized_config}' | base64 --decode" +
-        ' > /etc/chef/client-taste-tester.rb'
-      ssh << 'rm -vf /etc/chef/client.rb'
-      ssh << '( ln -vs /etc/chef/client-taste-tester.rb' +
-        ' /etc/chef/client.rb; true )'
+        " > #{TasteTester::Config.chef_config_path}/client-taste-tester.rb"
+      ssh << "rm -vf #{TasteTester::Config.chef_config_path}/client.rb"
+      ssh << "( ln -vs #{TasteTester::Config.chef_config_path}" +
+        "/client-taste-tester.rb #{TasteTester::Config.chef_config_path}/" +
+        'client.rb; true )'
       ssh.run!
 
       # Then run any other stuff they wanted
@@ -113,19 +116,26 @@ module TasteTester
       if TasteTester::Config.use_ssh_tunnels
         TasteTester::Tunnel.kill(@name)
       end
-      ssh << 'rm -vf /etc/chef/client.rb'
-      ssh << 'rm -vf /etc/chef/client-taste-tester.rb'
-      ssh << 'ln -vs /etc/chef/client-prod.rb /etc/chef/client.rb'
-      ssh << 'rm -vf /etc/chef/client.pem'
-      ssh << 'ln -vs /etc/chef/client-prod.pem /etc/chef/client.pem'
-      ssh << "rm -vf #{TasteTester::Config.timestamp_file}"
-      ssh << 'logger -t taste-tester Returning server to production'
+      [
+        "rm -vf #{TasteTester::Config.chef_config_path}/client.rb",
+        "rm -vf #{TasteTester::Config.chef_config_path}/client-taste-tester.rb",
+        "ln -vs #{TasteTester::Config.chef_config_path}/client-prod.rb " +
+          "#{TasteTester::Config.chef_config_path}/client.rb",
+        "rm -vf #{TasteTester::Config.chef_config_path}/client.pem",
+        "ln -vs #{TasteTester::Config.chef_config_path}/client-prod.pem " +
+          "#{TasteTester::Config.chef_config_path}/client.pem",
+        "rm -vf #{TasteTester::Config.timestamp_file}",
+        'logger -t taste-tester Returning server to production',
+      ].each do |cmd|
+        ssh << cmd
+      end
       ssh.run!
     end
 
     def who_is_testing
       ssh = TasteTester::SSH.new(@name)
-      ssh << 'grep "^# TasteTester by" /etc/chef/client.rb'
+      ssh << 'grep "^# TasteTester by"' +
+        " #{TasteTester::Config.chef_config_path}/client.rb"
       output = ssh.run
       if output.first == 0
         user = output.last.match(/# TasteTester by (.*)$/)
@@ -136,7 +146,7 @@ module TasteTester
 
       # Legacy FB stuff, remove after migration. Safe for everyone else.
       ssh = TasteTester::SSH.new(@name)
-      ssh << 'file /etc/chef/client.rb'
+      ssh << "file #{TasteTester::Config.chef_config_path}/client.rb"
       output = ssh.run
       if output.first == 0
         user = output.last.match(/client-(.*)-(taste-tester|test).rb/)
@@ -182,6 +192,7 @@ module TasteTester
       else
         url = "#{scheme}://#{@server.host}:#{TasteTester::State.port}"
       end
+      # rubocop:disable Metrics/LineLength
       ttconfig = <<-eos
 # TasteTester by #{@user}
 # Prevent people from screwing up their permissions
@@ -194,9 +205,10 @@ log_level :info
 log_location STDOUT
 chef_server_url '#{url}'
 ssl_verify_mode :verify_none
-Ohai::Config[:plugin_path] << '/etc/chef/ohai_plugins'
+Ohai::Config[:plugin_path] << '#{TasteTester::Config.chef_config_path}/ohai_plugins'
 
 eos
+      # rubocop:enable Metrics/LineLength
 
       extra = TasteTester::Hooks.test_remote_client_rb_extra_code(@name)
       if extra

data/lib/taste_tester/logging.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/lib/taste_tester/server.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,8 +51,8 @@ module TasteTester
       # SSL and logging are obvious, but SSH is also required since it
       # determines if we listen only on localhost or not
       @need_restart = @state.ssl != TasteTester::Config.use_ssl ||
-        @state.logging != TasteTester::Config.chef_zero_logging ||
-        @state.ssh != TasteTester::Config.use_ssh_tunnels
+                      @state.logging != TasteTester::Config.chef_zero_logging ||
+                      @state.ssh != TasteTester::Config.use_ssh_tunnels
 
       # If we are using SSH tunneling listen on localhost, otherwise listen
       # on all addresses - both v4 and v6. Note that on localhost, ::1 is
@@ -146,11 +146,11 @@ module TasteTester
     def start_chef_zero
       File.unlink(@log_file) if File.exists?(@log_file)
       @state.update({
-        :port => TasteTester::Config.chef_port,
-        :ssl => TasteTester::Config.use_ssl,
-        :ssh => TasteTester::Config.use_ssh_tunnels,
-        :logging => TasteTester::Config.chef_zero_logging,
-      })
+                      :port => TasteTester::Config.chef_port,
+                      :ssl => TasteTester::Config.use_ssl,
+                      :ssh => TasteTester::Config.use_ssh_tunnels,
+                      :logging => TasteTester::Config.chef_zero_logging,
+                    })
       logger.info("Starting chef-zero of port #{@state.port}")
       cmd = "#{chef_zero_path} --host #{@addr} --port #{@state.port} -d"
       cmd << " --log-file #{@log_file}" if TasteTester::Config.chef_zero_logging
@@ -177,7 +177,7 @@ module TasteTester
       ].each do |path|
         return path if File.exist?(path)
       end
-      logger.error("chef-zero not found")
+      logger.error('chef-zero not found')
       exit(1)
     end
   end

data/lib/taste_tester/ssh.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -46,7 +46,9 @@ module TasteTester
       error = <<-MSG
 SSH returned error while connecting to #{TasteTester::Config.user}@#{@host}
 The host might be broken or your SSH access is not working properly
-Try doing 'ssh -v #{TasteTester::Config.user}@#{@host}' and come back once that works
+Try doing
+  #{TasteTester::Config.ssh_command} -v #{TasteTester::Config.user}@#{@host}
+and come back once that works
 MSG
       # rubocop:enable LineLength
       error.lines.each { |x| logger.error x.strip }
@@ -61,8 +63,9 @@ MSG
         logger.info("Will run: '#{cmd}' on #{@host}")
       end
       cmds = @cmds.join(' && ')
-      cmd = "ssh -T -o BatchMode=yes -o ConnectTimeout=#{@timeout} "
-      cmd += "#{TasteTester::Config.user}@#{@host} "
+      cmd = "#{TasteTester::Config.ssh_command} " +
+            "-T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
+            "#{TasteTester::Config.user}@#{@host} "
       if TasteTester::Config.user != 'root'
         cc = Base64.encode64(cmds).gsub(/\n/, '')
         cmd += "\"echo '#{cc}' | base64 --decode | sudo bash -x\""

data/lib/taste_tester/state.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -25,12 +25,12 @@ module TasteTester
   # State of taste-tester processes
   class State
     include TasteTester::Config
-    include TasteTester::Logging
+    extend TasteTester::Logging
     include ::BetweenMeals::Util
 
     def initialize
       ref_dir = File.dirname(File.expand_path(
-        TasteTester::Config.ref_file
+                               TasteTester::Config.ref_file
       ))
       unless File.directory?(ref_dir)
         begin
@@ -93,7 +93,7 @@ module TasteTester
 
     def wipe
       if TasteTester::Config.ref_file &&
-          File.exists?(TasteTester::Config.ref_file)
+         File.exists?(TasteTester::Config.ref_file)
         File.delete(TasteTester::Config.ref_file)
       end
     end
@@ -101,7 +101,7 @@ module TasteTester
     private
 
     def write(key, val)
-      merge({key => val})
+      merge({ key => val })
     end
 
     def merge(vals)

data/lib/taste_tester/tunnel.rb

@@ -1,13 +1,13 @@
 # vim: syntax=ruby:expandtab:shiftwidth=2:softtabstop=2:tabstop=2
 
 # Copyright 2013-present Facebook
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -28,7 +28,7 @@ module TasteTester
       @timeout = timeout
       if TasteTester::Config.testing_until
         @delta_secs = TasteTester::Config.testing_until.strftime('%s').to_i -
-          Time.now.strftime('%s').to_i
+                      Time.now.strftime('%s').to_i
       else
         @delta_secs = TasteTester::Config.testing_time
       end
@@ -49,23 +49,25 @@ module TasteTester
       else
         pid = '\\$\\$'
       end
-      cmds = "ps -p #{pid} -o pgid | grep -v PGID > #{TasteTester::Config.timestamp_file} &&" +
-        " touch -t #{TasteTester::Config.testing_end_time}" +
-        " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
+      cmds = "ps -p #{pid} -o pgid | grep -v PGID" +
+             " > #{TasteTester::Config.timestamp_file} &&" +
+             " touch -t #{TasteTester::Config.testing_end_time}" +
+             " #{TasteTester::Config.timestamp_file} && sleep #{@delta_secs}"
       # As great as it would be to have ExitOnForwardFailure=yes,
       # we had multiple cases of tunnels dying
       # if -f and ExitOnForwardFailure are used together.
       # In most cases the first request from chef was "breaking" the tunnel,
       # in a way that port was still open, but subsequent requests were hanging.
       # This is reproducible and should be looked into.
-      cmd = "ssh -T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
-        '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' +
-        '-o ServerAliveInterval=10 -o ServerAliveCountMax=6 ' +
-        "-f -R #{@port}:localhost:#{@server.port} "
+      cmd = "#{TasteTester::Config.ssh_command} " +
+            "-T -o BatchMode=yes -o ConnectTimeout=#{@timeout} " +
+            '-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no ' +
+            '-o ServerAliveInterval=10 -o ServerAliveCountMax=6 ' +
+            "-f -R #{@port}:localhost:#{@server.port} "
       if TasteTester::Config.user != 'root'
         cc = Base64.encode64(cmds).gsub(/\n/, '')
         cmd += "#{TasteTester::Config.user}@#{@host} \"echo '#{cc}' | base64" +
-          ' --decode | sudo bash -x"'
+               ' --decode | sudo bash -x"'
       else
         cmd += "root@#{@host} \"#{cmds}\""
       end
@@ -82,7 +84,8 @@ module TasteTester
         sudo = 'sudo '
       end
       cmd = "( [ -s #{TasteTester::Config.timestamp_file} ]" +
-        " && #{sudo}kill -9 -- -\$(cat #{TasteTester::Config.timestamp_file}); true )"
+            " && #{sudo}kill -9 -- " +
+            "-\$(cat #{TasteTester::Config.timestamp_file}); true )"
       ssh << cmd
       ssh.run!
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: taste_tester
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 0
-  - 8
-  version: 0.0.8
+  - 9
+  version: 0.0.9
 platform: ruby
 authors: 
 - Phil Dibowitz
@@ -16,10 +16,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-01-05 00:00:00 Z
+date: 2015-11-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mixlib-config
+  name: between_meals >= 0.0.6
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,7 +33,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: colorize
+  name: mixlib-config
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,7 +47,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: between_meals
+  name: colorize
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,6 +60,48 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rubocop
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: chef-zero
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: knife-solo
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: Utility for testing Chef changes using chef-zero
 email: 
 executables: 
@@ -73,15 +115,15 @@ files:
 - README.md
 - LICENSE
 - lib/taste_tester/host.rb
-- lib/taste_tester/ssh.rb
-- lib/taste_tester/tunnel.rb
-- lib/taste_tester/server.rb
 - lib/taste_tester/client.rb
 - lib/taste_tester/hooks.rb
-- lib/taste_tester/config.rb
-- lib/taste_tester/logging.rb
-- lib/taste_tester/state.rb
 - lib/taste_tester/commands.rb
+- lib/taste_tester/state.rb
+- lib/taste_tester/ssh.rb
+- lib/taste_tester/server.rb
+- lib/taste_tester/tunnel.rb
+- lib/taste_tester/logging.rb
+- lib/taste_tester/config.rb
 - bin/taste-tester
 - scripts/taste-untester
 homepage: https://github.com/facebook/taste-tester