test-kitchen 1.4.0.beta.2 → 1.4.0.rc.1

data/spec/kitchen/provisioner/shell_spec.rb

@@ -49,6 +49,16 @@ describe Kitchen::Provisioner::Shell do
     }.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 2" do
+    provisioner = Kitchen::Provisioner::Shell.new(config).finalize_config!(instance)
+    provisioner.diagnose_plugin[:api_version].must_equal 2
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    provisioner = Kitchen::Provisioner::Shell.new(config).finalize_config!(instance)
+    provisioner.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "configuration" do
 
     describe "for bourne shells" do

data/spec/kitchen/shell_out_spec.rb

@@ -112,6 +112,13 @@ describe Kitchen::ShellOut do
       subject.run_command("yo", :use_sudo => true)
     end
 
+    it "prepends with custom :sudo_command if :use_sudo is truthy" do
+      Mixlib::ShellOut.unstub(:new)
+      Mixlib::ShellOut.expects(:new).with("wat yo", opts).returns(command)
+
+      subject.run_command("yo", :use_sudo => true, :sudo_command => "wat")
+    end
+
     it "logs a debug BEGIN message" do
       subject.run_command("echo whoopa\ndoopa\ndo")
 

data/spec/kitchen/transport/ssh_spec.rb

@@ -127,6 +127,14 @@ describe Kitchen::Transport::Ssh do
     Kitchen::Transport::Ssh.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 1" do
+    transport.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    transport.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "default_config" do
 
     it "sets :port to 22 by default" do
@@ -137,6 +145,33 @@ describe Kitchen::Transport::Ssh do
       transport[:username].must_equal "root"
     end
 
+    it "sets :compression to zlib by default" do
+      transport[:compression].must_equal "zlib"
+    end
+
+    it "sets :compression to none if set to none" do
+      config[:compression] = "none"
+
+      transport[:compression].must_equal "none"
+    end
+
+    it "raises a UserError if :compression is set to a bogus value" do
+      config[:compression] = "boom"
+
+      err = proc { transport }.must_raise Kitchen::UserError
+      err.message.must_match(%r{value may only be set to `none' or `zlib'})
+    end
+
+    it "sets :compression_level to 6 by default" do
+      transport[:compression_level].must_equal 6
+    end
+
+    it "sets :compression_level to 0 if :compression is set to none" do
+      config[:compression] = "none"
+
+      transport[:compression_level].must_equal 0
+    end
+
     it "sets :keepalive to true by default" do
       transport[:keepalive].must_equal true
     end
@@ -160,6 +195,17 @@ describe Kitchen::Transport::Ssh do
     it "sets :max_wait_until_ready to 600 by default" do
       transport[:max_wait_until_ready].must_equal 600
     end
+
+    it "sets :ssh_key to nil by default" do
+      transport[:ssh_key].must_equal nil
+    end
+
+    it "expands :ssh_path path if set" do
+      config[:kitchen_root] = "/rooty"
+      config[:ssh_key] = "my_key"
+
+      transport[:ssh_key].must_equal "/rooty/my_key"
+    end
   end
 
   describe "#connection" do
@@ -259,6 +305,48 @@ describe Kitchen::Transport::Ssh do
         make_connection
       end
 
+      it "sets :compression from config" do
+        config[:compression] = "none"
+
+        klass.expects(:new).with do |hash|
+          hash[:compression] == "none"
+        end
+
+        make_connection
+      end
+
+      it "sets :compression from state over config data" do
+        state[:compression] = "none"
+        config[:compression] = "zlib"
+
+        klass.expects(:new).with do |hash|
+          hash[:compression] == "none"
+        end
+
+        make_connection
+      end
+
+      it "sets :compression_level from config" do
+        config[:compression_level] = 9999
+
+        klass.expects(:new).with do |hash|
+          hash[:compression_level] == 9999
+        end
+
+        make_connection
+      end
+
+      it "sets :compression_level from state over config data" do
+        state[:compression_level] = 9999
+        config[:compression_level] = 1111
+
+        klass.expects(:new).with do |hash|
+          hash[:compression_level] == 9999
+        end
+
+        make_connection
+      end
+
       it "sets :timeout from :connection_timeout in config" do
         config[:connection_timeout] = "timeout_from_config"
 
@@ -407,10 +495,11 @@ describe Kitchen::Transport::Ssh do
       end
 
       it "sets :keys to an array if :ssh_key is set in config" do
+        config[:kitchen_root] = "/r"
         config[:ssh_key] = "ssh_key_from_config"
 
         klass.expects(:new).with do |hash|
-          hash[:keys] == ["ssh_key_from_config"]
+          hash[:keys] == ["/r/ssh_key_from_config"]
         end
 
         make_connection

data/spec/kitchen/transport/winrm_spec.rb

@@ -19,6 +19,10 @@
 require_relative "../../spec_helper"
 
 require "kitchen/transport/winrm"
+require "winrm"
+require "winrm/transport/command_executor"
+require "winrm/transport/shell_closer"
+require "winrm/transport/file_transporter"
 
 describe Kitchen::Transport::Winrm do
 
@@ -35,6 +39,14 @@ describe Kitchen::Transport::Winrm do
     Kitchen::Transport::Winrm.new(config).finalize_config!(instance)
   end
 
+  it "provisioner api_version is 1" do
+    transport.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    transport.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "default_config" do
 
     it "sets :port to 5985 by default" do
@@ -345,9 +357,77 @@ describe Kitchen::Transport::Winrm do
     end
   end
 
+  describe "#load_needed_dependencies" do
+
+    before do
+      # force loading of winrm-transport to get the version constant
+      require "winrm/transport/version"
+    end
+
+    it "logs a message to debug that code will be loaded" do
+      transport
+
+      logged_output.string.must_match debug_line_with(
+        "Winrm Transport requested, loading WinRM::Transport gem")
+    end
+
+    it "logs a message to debug when library is initially loaded" do
+      transport = Kitchen::Transport::Winrm.new(config)
+      transport.stubs(:require)
+      transport.stubs(:require).with("winrm/transport/version").returns(true)
+      transport.finalize_config!(instance)
+
+      logged_output.string.must_match(
+        %r{^D, .* : WinRM::Transport [^\s]+ library loaded$}
+      )
+    end
+
+    it "logs a message to debug when library is previously loaded" do
+      transport = Kitchen::Transport::Winrm.new(config)
+      transport.stubs(:require)
+      transport.stubs(:require).with("winrm/transport/version").returns(false)
+      transport.finalize_config!(instance)
+
+      logged_output.string.must_match(
+        %r{^D, .* : WinRM::Transport [^\s]+ previously loaded$}
+      )
+    end
+
+    it "logs a message to fatal when libraries cannot be loaded" do
+      transport = Kitchen::Transport::Winrm.new(config)
+      transport.stubs(:require)
+      transport.stubs(:require).with("winrm/transport/version").
+        raises(LoadError, "uh oh")
+      begin
+        transport.finalize_config!(instance)
+      rescue # rubocop:disable Lint/HandleExceptions
+        # we are interested in the log output, not this exception
+      end
+
+      logged_output.string.must_match fatal_line_with(
+        "The `winrm-transport' gem is missing and must be installed")
+    end
+
+    it "raises a UserError when libraries cannot be loaded" do
+      transport = Kitchen::Transport::Winrm.new(config)
+      transport.stubs(:require)
+      transport.stubs(:require).with("winrm/transport/version").
+        raises(LoadError, "uh oh")
+
+      err = proc {
+        transport.finalize_config!(instance)
+      }.must_raise Kitchen::UserError
+      err.message.must_match(/^Could not load or activate WinRM::Transport /)
+    end
+  end
+
   def debug_line_with(msg)
     %r{^D, .* : #{Regexp.escape(msg)}}
   end
+
+  def fatal_line_with(msg)
+    %r{^F, .* : #{Regexp.escape(msg)}}
+  end
 end
 
 describe Kitchen::Transport::Winrm::Connection do
@@ -375,7 +455,7 @@ describe Kitchen::Transport::Winrm::Connection do
 
   let(:executor) do
     s = mock("command_executor")
-    s.responds_like_instance_of(Kitchen::Transport::Winrm::CommandExecutor)
+    s.responds_like_instance_of(WinRM::Transport::CommandExecutor)
     s
   end
 
@@ -397,7 +477,7 @@ describe Kitchen::Transport::Winrm::Connection do
     end
 
     before do
-      Kitchen::Transport::Winrm::CommandExecutor.stubs(:new).returns(executor)
+      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
       # disable finalizer as service is a fake anyway
       ObjectSpace.stubs(:define_finalizer).
         with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
@@ -433,7 +513,7 @@ describe Kitchen::Transport::Winrm::Connection do
   describe "#execute" do
 
     before do
-      Kitchen::Transport::Winrm::CommandExecutor.stubs(:new).returns(executor)
+      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
       # disable finalizer as service is a fake anyway
       ObjectSpace.stubs(:define_finalizer).
         with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
@@ -871,7 +951,7 @@ MSG
 
     let(:transporter) do
       t = mock("file_transporter")
-      t.responds_like_instance_of(Kitchen::Transport::Winrm::FileTransporter)
+      t.responds_like_instance_of(WinRM::Transport::FileTransporter)
       t
     end
 
@@ -880,10 +960,10 @@ MSG
       ObjectSpace.stubs(:define_finalizer).
         with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }
 
-      Kitchen::Transport::Winrm::CommandExecutor.stubs(:new).returns(executor)
+      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
       executor.stubs(:open)
 
-      Kitchen::Transport::Winrm::FileTransporter.stubs(:new).
+      WinRM::Transport::FileTransporter.stubs(:new).
         with(executor, logger).returns(transporter)
       transporter.stubs(:upload)
     end
@@ -891,18 +971,18 @@ MSG
     # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
     def self.common_specs_for_upload
       it "builds a Winrm::FileTransporter" do
-        Kitchen::Transport::Winrm::FileTransporter.unstub(:new)
+        WinRM::Transport::FileTransporter.unstub(:new)
 
-        Kitchen::Transport::Winrm::FileTransporter.expects(:new).
+        WinRM::Transport::FileTransporter.expects(:new).
           with(executor, logger).returns(transporter)
 
         upload
       end
 
       it "reuses the Winrm::FileTransporter" do
-        Kitchen::Transport::Winrm::FileTransporter.unstub(:new)
+        WinRM::Transport::FileTransporter.unstub(:new)
 
-        Kitchen::Transport::Winrm::FileTransporter.expects(:new).
+        WinRM::Transport::FileTransporter.expects(:new).
           with(executor, logger).returns(transporter).once
 
         upload
@@ -934,7 +1014,7 @@ MSG
   describe "#wait_until_ready" do
 
     before do
-      Kitchen::Transport::Winrm::CommandExecutor.stubs(:new).returns(executor)
+      WinRM::Transport::CommandExecutor.stubs(:new).returns(executor)
       # disable finalizer as service is a fake anyway
       ObjectSpace.stubs(:define_finalizer).
         with { |obj, _| obj.class == Kitchen::Transport::Winrm::Connection }

data/spec/kitchen/verifier/base_spec.rb

@@ -102,6 +102,10 @@ describe Kitchen::Verifier::Base do
         verifier[:sudo].must_equal true
       end
 
+      it ":sudo_command defaults to sudo -E" do
+        verifier[:sudo_command].must_equal "sudo -E"
+      end
+
       it ":root_path defaults to '/tmp/verifier'" do
         verifier[:root_path].must_equal "/tmp/verifier"
       end
@@ -115,6 +119,10 @@ describe Kitchen::Verifier::Base do
         verifier[:sudo].must_equal nil
       end
 
+      it ":sudo_command defaults to nil" do
+        verifier[:sudo_command].must_equal nil
+      end
+
       it ":root_path defaults to $env:TEMP\\verifier" do
         verifier[:root_path].must_equal "$env:TEMP\\verifier"
       end
@@ -295,16 +303,34 @@ describe Kitchen::Verifier::Base do
 
   describe "#sudo" do
 
-    it "if :sudo is set, prepend sudo command" do
-      config[:sudo] = true
+    describe "with :sudo set" do
+
+      before { config[:sudo] = true }
+
+      it "prepends sudo command" do
+        verifier.send(:sudo, "wakka").must_equal("sudo -E wakka")
+      end
+
+      it "customizes sudo when :sudo_command is set" do
+        config[:sudo_command] = "blueto -Ohai"
 
-      verifier.send(:sudo, "wakka").must_equal("sudo -E wakka")
+        verifier.send(:sudo, "wakka").must_equal("blueto -Ohai wakka")
+      end
     end
 
-    it "if :sudo is falsy, do not include sudo command" do
-      config[:sudo] = false
+    describe "with :sudo falsey" do
 
-      verifier.send(:sudo, "wakka").must_equal("wakka")
+      before { config[:sudo] = false }
+
+      it "does not include sudo command" do
+        verifier.send(:sudo, "wakka").must_equal("wakka")
+      end
+
+      it "does not include sudo command, even when :sudo_command is set" do
+        config[:sudo_command] = "blueto -Ohai"
+
+        verifier.send(:sudo, "wakka").must_equal("wakka")
+      end
     end
   end
 end

data/spec/kitchen/verifier/busser_spec.rb

@@ -89,6 +89,14 @@ describe Kitchen::Verifier::Busser do
   #   }.must_raise Kitchen::UserError
   # end
 
+  it "verifier api_version is 1" do
+    verifier.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    verifier.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "configuration" do
 
     describe "for unix operating systems" do

data/spec/kitchen/verifier/dummy_spec.rb

@@ -49,6 +49,14 @@ describe Kitchen::Verifier::Dummy do
     Kitchen::Verifier::Dummy.new(config).finalize_config!(instance)
   end
 
+  it "verifier api_version is 1" do
+    verifier.diagnose_plugin[:api_version].must_equal 1
+  end
+
+  it "plugin_version is set to Kitchen::VERSION" do
+    verifier.diagnose_plugin[:version].must_equal Kitchen::VERSION
+  end
+
   describe "configuration" do
 
     it "sets :sleep to 0 by default" do

data/support/chef_base_install_command.sh

@@ -1,137 +1,220 @@
-# Check whether a command exists - returns 0 if it does, 1 if it does not
-exists() {
-  if command -v $1 >/dev/null 2>&1
-  then
-    return 0
-  else
-    return 1
+tmp_stderr="/tmp/stderr";
+
+# capture_tmp_stderr SOURCE
+capture_tmp_stderr() {
+  # spool up $tmp_stderr from all the commands we called
+  if test -f "$tmp_stderr"; then
+    output="`cat $tmp_stderr`";
+    stderr_results="${stderr_results}\nSTDERR from $1:\n\n${output}\n";
+    rm $tmp_stderr;
   fi
 }
 
-# do_wget URL FILENAME
-do_wget() {
-  echo "trying wget..."
-  wget -O "$2" "$1" 2>/tmp/stderr
-  # check for bad return status
-  test $? -ne 0 && return 1
-  # check for 404 or empty file
-  grep "ERROR 404" /tmp/stderr 2>&1 >/dev/null
-  if test $? -eq 0 || test ! -s "$2"; then
-    return 1
-  fi
-  return 0
-}
-
 # do_curl URL FILENAME
 do_curl() {
-  echo "trying curl..."
-  curl -L "$1" > "$2"
-  # check for bad return status
-  [ $? -ne 0 ] && return 1
-  # check for bad output or empty file
-  grep "The specified key does not exist." "$2" 2>&1 >/dev/null
-  if test $? -eq 0 || test ! -s "$2"; then
-    return 1
-  fi
-  return 0
+  echo "Trying curl...";
+  curl -sL -D "$tmp_stderr" "$1" > "$2";
+  ec=$?;
+  # check for 404
+  grep "404 Not Found" "$tmp_stderr" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    http_404_error "$1";
+  fi
+
+  # check for bad return status or empty output
+  if test $ec -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "curl";
+    return 1;
+  else
+    echo "Download complete.";
+    return 0;
+  fi
+}
+
+# do_download URL FILENAME
+do_download() {
+  echo "Downloading ${1} to file ${2}";
+
+  exists wget;
+  if test $? -eq 0; then
+    do_wget "$1" "$2" && return 0;
+  fi
+
+  exists curl;
+  if test $? -eq 0; then
+    do_curl "$1" "$2" && return 0;
+  fi
+
+  exists fetch;
+  if test $? -eq 0; then
+    do_fetch "$1" "$2" && return 0;
+  fi
+
+  exists python;
+  if test $? -eq 0; then
+    do_python "$1" "$2" && return 0;
+  fi
+
+  exists perl;
+  if test $? -eq 0; then
+    do_perl "$1" "$2" && return 0;
+  fi
+
+  unable_to_download "$1" "$2";
 }
 
 # do_fetch URL FILENAME
 do_fetch() {
-  echo "trying fetch..."
-  fetch -o "$2" "$1" 2>/tmp/stderr
-  # check for bad return status
-  test $? -ne 0 && return 1
-  return 0
+  echo "Trying fetch...";
+  fetch -o "$2" "$1" 2>"$tmp_stderr";
+  ec=$?;
+  # check for 404
+  grep "Not Found" "$tmp_stderr" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    http_404_error "$1";
+  fi
+
+  # check for bad return status or empty output
+  if test $ec -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "fetch";
+    return 1;
+  else
+    echo "Download complete.";
+    return 0;
+  fi
 }
 
 # do_perl URL FILENAME
 do_perl() {
-  echo "trying perl..."
-  perl -e "use LWP::Simple; getprint($ARGV[0]);" "$1" > "$2"
-  # check for bad return status
-  test $? -ne 0 && return 1
-  # check for bad output or empty file
-  # grep "The specified key does not exist." "$2" 2>&1 >/dev/null
-  # if test $? -eq 0 || test ! -s "$2"; then
-  #   unable_to_retrieve_package
-  # fi
-  return 0
+  echo "Trying perl...";
+  perl -e "use LWP::Simple; getprint(\$ARGV[0]);" "$1" > "$2" 2>"$tmp_stderr";
+  ec=$?;
+  # check for 404
+  grep "404 Not Found" "$tmp_stderr" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    http_404_error "$1";
+  fi
+
+  # check for bad return status or empty output
+  if test $ec -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "perl";
+    return 1;
+  else
+    echo "Download complete.";
+    return 0;
+  fi
 }
 
 # do_python URL FILENAME
 do_python() {
-  echo "trying python..."
-  python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2"
-  # check for bad return status
-  test $? -ne 0 && return 1
-  # check for bad output or empty file
-  #grep "The specified key does not exist." "$2" 2>&1 >/dev/null
-  #if test $? -eq 0 || test ! -s "$2"; then
-  #  unable_to_retrieve_package
-  #fi
-  return 0
-}
-
-# do_download URL FILENAME
-do_download() {
-  PATH=/opt/local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-  export PATH
-
-  echo "downloading $1"
-  echo "  to file $2"
-
-  # we try all of these until we get success.
-  # perl, in particular may be present but LWP::Simple may not be installed
-
-  if exists wget; then
-    do_wget $1 $2 && return 0
+  echo "Trying python...";
+  python -c "import sys,urllib2 ; sys.stdout.write(urllib2.urlopen(sys.argv[1]).read())" "$1" > "$2" 2>"$tmp_stderr";
+  ec=$?;
+  # check for 404
+  grep "HTTP Error 404" "$tmp_stderr" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    http_404_error "$1";
   fi
 
-  if exists curl; then
-    do_curl $1 $2 && return 0
+  # check for bad return status or empty output
+  if test $ec -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "python";
+    return 1;
+  else
+    echo "Download complete.";
+    return 0;
   fi
+}
 
-  if exists fetch; then
-    do_fetch $1 $2 && return 0
+# do_wget URL FILENAME
+do_wget() {
+  echo "Trying wget...";
+  wget -O "$2" "$1" 2>"$tmp_stderr";
+  ec=$?;
+  # check for 404
+  grep "ERROR 404" "$tmp_stderr" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    http_404_error "$1";
   fi
 
-  if exists perl; then
-    do_perl $1 $2 && return 0
+  # check for bad return status or empty output
+  if test $ec -ne 0 || test ! -s "$2"; then
+    capture_tmp_stderr "wget";
+    return 1;
+  else
+    echo "Download complete.";
+    return 0;
   fi
+}
 
-  if exists python; then
-    do_python $1 $2 && return 0
+# exists COMMAND
+exists() {
+  if command -v "$1" >/dev/null 2>&1; then
+    return 0;
+  else
+    return 1;
   fi
+}
 
-  echo ">>>>>> wget, curl, fetch, perl or python not found on this instance."
-  return 16
+# http_404_error URL
+http_404_error() {
+  echo ">>>>>> Downloading ${1} resulted in an HTTP/404, aborting";
+  exit 40;
 }
 
-# @param $1 the omnibus root directory
-# @param $2 the requested version of omnibus package
-# @return 0 if omnibus needs to be installed, non-zero otherwise
+# should_update_chef ROOT VERSION
 should_update_chef() {
-  if test ! -d "$1" ; then return 0
-  elif test "$2" = "true" ; then return 1
-  elif test "$2" = "latest" ; then return 0
+  if test ! -d "$1"; then
+    return 0;
+  elif test "$2" = "true"; then
+    return 1;
+  elif test "$2" = "latest"; then
+    return 0;
+  fi
+
+  chef_version="`${1}/bin/chef-solo -v | cut -d \" \" -f 2`";
+
+  echo "$chef_version" | grep "^${2}" 2>&1 >/dev/null;
+  if test $? -eq 0; then
+    return 1;
+  else
+    return 0;
   fi
+}
 
-  local version="`$1/bin/chef-solo -v | cut -d " " -f 2`"
+# unable_to_download URL FILE
+unable_to_download() {
+  echo "Unable to download $1 to $2, aborting";
+
+  if test "x${stderr_results}" != "x"; then
+    echo "\nDEBUG OUTPUT FOLLOWS:\n${stderr_results}";
+  fi
 
-  echo "$version" | grep "^$2" 2>&1 >/dev/null
-  if test $? -eq 0 ; then
-    return 1
+  exit 10;
+}
+
+# main
+main() {
+  should_update_chef "$chef_omnibus_root" "$version"
+  if test $? -eq 0; then
+    echo "-----> Installing Chef Omnibus (${pretty_version})";
+
+    # solaris 10 lacks recent enough credentials, so http url is used
+    platform="`/usr/bin/uname -s 2>/dev/null`";
+    platform_version="`/usr/bin/uname -r 2>/dev/null`";
+    if test "x${platform}" = "xSunOS" && test "x${platform_version}" = "x5.10"; then
+      chef_omnibus_url=`echo "$chef_omnibus_url" | sed -e "s/https/http/"`;
+    fi
+
+    do_download "$chef_omnibus_url" /tmp/install.sh;
+    $sudo_sh /tmp/install.sh $install_flags;
   else
-    return 0
+    echo "-----> Chef Omnibus installation detected (${pretty_version})";
   fi
 }
 
-should_update_chef "$chef_omnibus_root" "$version"
-if test $? -eq 0 ; then
-  echo "-----> Installing Chef Omnibus ($pretty_version)"
-  do_download "$chef_omnibus_url" /tmp/install.sh
-  $sudo_sh /tmp/install.sh $install_flags
-else
-  echo "-----> Chef Omnibus installation detected ($pretty_version)"
-fi
+# augment path in an attempt to find a download program
+PATH="${PATH}:/opt/local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/sfw/bin";
+export PATH;
+
+main