knife-solo 0.3.0.pre2 → 0.3.0.pre3

data/CHANGELOG.md

@@ -1,24 +1,67 @@
-# 0.3.0: _In progress_
+# 0.3.0 / _In progress_
+
+**NOTE**: This release includes breaking changes. See [upgrade instructions](https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0) for more information.
 
 ## Changes and new features
 
-* Moved root path configuration into `knife[:solo_path]` and use $HOME/chef-solo by default (#197)
-* `--prerelease` option to allow pre-release versions of chef omnibus or rubygem to be installed (#205)
-* Prepare/bootstrap now installs the same version of Chef that the workstation is running (#186)
-* Switch `--omnibus-version` flag to `--bootstrap-version` (#185)
-* Support --override-runlist option (#204)
+* Automatically add librarian to cookbook paths when syncing ([226])
+* BREAKING: Generate solo.rb based on knife.rb settings ([199])
+    - `solo.rb` is not used and a warning is issued if it still found
+    - You have to specify the local cookbook etc. paths in `.chef/knife.rb`
+* BREAKING: Set root path with `--provisioning-path` or `knife[:provisioning_path]` and use ~/chef-solo by default ([1], [86], [125], [128], [177], [197])
+* BREAKING: Remove hard dependency on Librarian-Chef ([211])
+    - If you use Librarian integration you need to install the librarian-chef gem yourself
+* Add `--solo` option and `knife[:solo]` configuration option to `knife bootstrap` ([207])
+* `--prerelease` option to allow pre-release versions of chef omnibus or rubygem to be installed ([205])
+* Prepare/bootstrap now installs the same version of Chef that the workstation is running ([186])
+* Switch `--omnibus-version` flag to `--bootstrap-version` ([185])
+* Support `--override-runlist` option ([204])
+* Drop support for openSUSE 11
 
 ## Fixes
 
+* Read protect the provision directory from the world ([1])
 * FreeBSD 9.1 support
-* Clear yum cache before installing rsync (#200)
+* OS X (especially 10.8) support ([209], [210])
+* Clear yum cache before installing rsync ([200])
+* Make sure "ca-certificates" package is installed on Debian ([213])
+* Ensure rsync is installed on openSUSE ([f43ba4])
+* Clean up bootstrap classes ([213])
+* Rsync dot files by default, exclude only VCS dirs ([d21756], [1d3485])
+* Standardize messaging across commands [215]
+* Librarian-Chef was not run by default when knife-solo was invoked from ruby ([221])
 
 ## Thanks to our contributors!
 
 * [David Kinzer][dkinzer]
 * [Naoya Ito][naoya]
-
-# 0.2.0: February 12, 2013
+* [David Radcliffe][dwradcliffe]
+
+[1]: https://github.com/matschaffer/knife-solo/issues/1
+[86]: https://github.com/matschaffer/knife-solo/issues/86
+[125]: https://github.com/matschaffer/knife-solo/issues/125
+[128]: https://github.com/matschaffer/knife-solo/issues/128
+[177]: https://github.com/matschaffer/knife-solo/issues/177
+[185]: https://github.com/matschaffer/knife-solo/issues/185
+[186]: https://github.com/matschaffer/knife-solo/issues/186
+[197]: https://github.com/matschaffer/knife-solo/issues/197
+[199]: https://github.com/matschaffer/knife-solo/issues/199
+[200]: https://github.com/matschaffer/knife-solo/issues/200
+[204]: https://github.com/matschaffer/knife-solo/issues/204
+[205]: https://github.com/matschaffer/knife-solo/issues/205
+[207]: https://github.com/matschaffer/knife-solo/issues/207
+[209]: https://github.com/matschaffer/knife-solo/issues/209
+[210]: https://github.com/matschaffer/knife-solo/issues/210
+[211]: https://github.com/matschaffer/knife-solo/issues/211
+[213]: https://github.com/matschaffer/knife-solo/issues/213
+[215]: https://github.com/matschaffer/knife-solo/issues/215
+[221]: https://github.com/matschaffer/knife-solo/issues/221
+[226]: https://github.com/matschaffer/knife-solo/issues/221
+[d21756]: https://github.com/matschaffer/knife-solo/commit/d21756
+[1d3485]: https://github.com/matschaffer/knife-solo/commit/1d3485
+[f43ba4]: https://github.com/matschaffer/knife-solo/commit/f43ba4
+
+# 0.2.0 / 2013-02-12
 
 ## Changes and new features
 
@@ -36,7 +79,6 @@
 * Drop support for Debian 5.0 Lenny (#172)
 * Integration tests for Debian 6 and 7 (74c6ed1 - f299a6)
 * Travis tests for both Chef 10 and 11 (#183)
-* Remove solo.rb and transfer cookbooks to user-owned path (#1, #86, #125, #128, #177). See https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.2.0
 
 ## Fixes
 
@@ -55,7 +97,7 @@
 * [Shaun Dern][smdern]
 * [Mike Bain][TheAlphaTester]
 
-# 0.1.0: January 12, 2013
+# 0.1.0 / 2013-01-12
 
 ## Changes and new features
 
@@ -80,7 +122,7 @@
 ## Documentation
 
 * Include documentation and tests in the gem (e01c23)
-* [Home page](http://matschaffer.github.com/knife-solo/)
+* [Home page](http://matschaffer.github.io/knife-solo/)
   that reflects always the current release (#151)
 
 ## Thanks to our contributors!
@@ -92,7 +134,7 @@
 * [Hiten Parmar][hrp]
 * [Patrick Connolly][patcon]
 
-# 0.0.15: November 29th, 2012
+# 0.0.15 / 2012-11-29
 
 * Support for non-x86 omnibus (#137)
 * Validate hostname in wash\_up (7a9115)
@@ -118,7 +160,7 @@
 
 And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of direct colaborators!
 
-# 0.0.14: September 21st, 2012
+# 0.0.14 / 2012-09-21
 
 * Fix argument checks (#101)
 * Allow custom omnibus URLs (#99)
@@ -130,7 +172,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Ryan Walker][ryandub]
 * [Aaron Cruz][pferdefleisch]
 
-# 0.0.13: August 16th, 2012
+# 0.0.13 / 2012-08-16
 
 * Less agressive in-kitchen check (36a14161a1c)
 * New curl/wget selection during omnibus install (#84)
@@ -143,7 +185,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Deepak Kannan][deepak]
 * [Florian Unglaub][funglaub]
 
-# 0.0.12: June 25th, 2012
+# 0.0.12 / 2012-06-25
 
 * Better validation on CLI args (#68, #70)
 * Switch from wget to curl (#66)
@@ -156,7 +198,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Greg Fitzgerald][gregf]
 * [Deepak Kannan][deepak]
 
-# 0.0.11: June 16th, 2012
+# 0.0.11 / 2012-06-16
 
 * Encrypted data bag support (#22)
 * Updated dependency version (#63, #64)
@@ -168,7 +210,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Hector Castro][hectcastro]
 * [Sean Porter][portertech]
 
-# 0.0.10: May 30th, 2012
+# 0.0.10 / 2012-05-30
 
 * Include apache recipe during integration testing (#17)
 * Use omnibus installer on Ubuntu and RedHat (#40, #45, #58)
@@ -183,7 +225,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Justin Grevich][jgrevich]
 * [Ross Timson][rosstimson]
 
-# 0.0.9: May 13th, 2012
+# 0.0.9 / 2012-05-13
 
 * Chef 0.10.10 compatibility (b0fa50e9)
 * Finished support and integration testing for remaining key OSes (Issues #2 and #15)
@@ -199,7 +241,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Tyler Rick][TylerRick]
 * [Motiejus Jakštys][Motiejus]
 
-# 0.0.8: February 10, 2012
+# 0.0.8 / 2012-02-10
 
 * Add --startup-script which gets sourced before any command to setup env vars (e.g., ~/.bashrc) (d1489f94)
 * Use curl + rpm rather than rpm against direct URL for better proxy support (51ad9c51)
@@ -214,13 +256,13 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Jason Garber][jgarber]
 * [Greg Sterndale][gsterndale]
 
-# 0.0.7: Dec 9, 2011
+# 0.0.7 / 2011-12-09
 
 * BUG #9: Fix intelligent sudo handling for OSes that don't have it
 * Move integration tests into proper test cases
 * CentOS 5.6 integration test
 
-# 0.0.6: Dec 8, 2011
+# 0.0.6 / 2011-12-08
 
 * Support for Mac OS 10.5 and 10.6 (00921ebd1b93)
 * Parallel integration testing and SLES (167360d447..167360d447)
@@ -231,13 +273,13 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 * [Sergio Rubio][rubiojr]
 * [Nat Lownes][natlownes]
 
-# 0.0.5: Oct 31, 2011
+# 0.0.5 / 2011-10-31
 
 * Started on integration testing via EC2
 * Add openSuSE support. Installation via zypper. (64ff2edf42)
 * Upgraded Rubygems to 1.8.10 (8ac1f4d43a)
 
-# 0.0.4: Oct 7, 2011
+# 0.0.4 / 2011-10-07
 
 * Chef 0.10.4 based databag and search method (a800880e6d)
 * Proper path for roles (b143ae290a)
@@ -247,7 +289,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 
 * [John Dewey][retr0h]
 
-# 0.0.3: July 31, 2011
+# 0.0.3 / 2011-07-31
 
 * Kitchen directory generation
 * Prepare tested on ubuntu
@@ -269,6 +311,8 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [btm]:           https://github.com/btm
 [davidsch]:      https://github.com/davidsch
 [deepak]:        https://github.com/deepak
+[dkinzer]:       https://github.com/dkinzer
+[dwradcliffe]:   https://github.com/dwradcliffe
 [fnichol]:       https://github.com/fnichol
 [funglaub]:      https://github.com/funglaub
 [gregf]:         https://github.com/gregf
@@ -277,6 +321,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [hrp]:           https://github.com/hrp
 [jgarber]:       https://github.com/jgarber
 [jgrevich]:      https://github.com/jgrevich
+[naoya]:         https://github.com/naoya
 [natlownes]:     https://github.com/natlownes
 [patatepartie]:  https://github.com/patatepartie
 [patcon]:        https://github.com/patcon
@@ -294,5 +339,3 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [tmatilai]:      https://github.com/tmatilai
 [vjpr]:          https://github.com/vjpr
 [zeph]:          https://github.com/zeph
-[dkinzer]:       https://github.com/dkinzer
-[naoya]:         https://github.com/naoya

data/README.rdoc

@@ -10,7 +10,7 @@ knife-solo adds a handful of commands that aim to make working with chef-solo as
 
 - <tt>knife solo cook</tt> uploads the current kitchen (Chef repo) to the target host and runs chef-solo on that host.
 
-- <tt>knife solo bootstrap</tt> combines the two previous ones (prepare and cook).
+- <tt>knife solo bootstrap</tt> combines the two previous ones (prepare and cook). knife-solo also adds +--solo+ command line option and +knife[:solo]+ configuration parameter to <tt>knife bootstrap</tt> that can be used for triggering "knife solo bootstrap" instead of the normal template based chef-client bootstrap.
 
 - <tt>knife solo clean</tt> removes the uploaded kitchen from the target host.
 
@@ -35,12 +35,13 @@ The init command simply takes a name of the directory to store the kitchen struc
 Currently the directory structure looks like this, but could change as development continues.
 
     mychefrepo/
+    ├── .chef
+    │   └── knife.rb
     ├── cookbooks
     ├── data_bags
     ├── nodes
     ├── roles
-    ├── site-cookbooks
-    └── solo.rb
+    └── site-cookbooks
 
 === Prepare command
 
@@ -71,7 +72,7 @@ The cook command uploads the current kitchen to the server and runs chef-solo on
 
 This uploads all of your cookbooks in addition to a patch that allows you to use data_bags in a read-only fashion from the +data_bags+ folder.
 
-This also supports encrypted data bags. To use them, place your key in +data_bag_key+ in the root of your kitchen (or if you move it make sure to update +solo.rb+ to reflect the new path).
+This also supports encrypted data bags. To use them, set the path to your key with +encrypted_data_bag_secret+ in .chef/knife.rb.
 
 The knife command for creating encrypted data bags doesn't work well without a Chef server, so use {this gist}[https://gist.github.com/2896172] as an example on how to create encrypted data bag items on your local file system.
 
@@ -83,6 +84,10 @@ The bootstrap command takes the same arguments and most of the options as prepar
 
 Under the hood it first calls +knife solo prepare+ and then +knife solo cook+ with the specified arguments and options.
 
+==== Integration with knife bootstrap
+
+knife-solo also integrates with <tt>knife bootstrap</tt> by adding +--solo+ command line option and +knife[:solo]+ configuration parameter to it. When requested, "knife solo bootrap" is used instead of the normal template based chef-client bootstrap. This is especially useful with other knife plugins like {knife-ec2}[https://github.com/opscode/knife-ec2] that invoke "knife bootstrap" after creating an server instance. Even if these plugins do not have the "--solo" option, you can put <tt>knife[:solo] = true</tt> in knife.rb.
+
 === Clean command
 
 The clean command takes the same arguments like prepare and cook:
@@ -95,9 +100,9 @@ The clean command removes an uploaded kitchen completely from the target host. T
 
 The cook command will work on Windows node if you meet the following howto:
 
-==== Init then tweak
+==== Init as normally
 
-- run <tt>knife solo init</tt> then edit solo.rb to use Windows path-naming (see https://gist.github.com/1773854)
+- run <tt>knife solo init</tt>
 
 ==== Prepare the node manually
 

data/Rakefile

@@ -5,6 +5,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'knife-solo', 'info')
 MANIFEST_IGNORES = %w[
     .travis.yml
     .gitignore
+    .gitmodules
     Gemfile
     Gemfile.lock
     Manifest.txt
@@ -24,10 +25,11 @@ namespace :manifest do
 
   desc 'Updates Manifest.txt with a list of files from git'
   task :update do
-    git_files = `git ls-files`.split("\n")
+    git_files       = `git ls-files`.split("\n")
+    submodule_files = `git submodule foreach -q 'for f in $(git ls-files); do echo $path/$f; done'`.split("\n")
 
     File.open('Manifest.txt', 'w') do |f|
-      f.puts((git_files - MANIFEST_IGNORES).join("\n"))
+      f.puts((git_files + submodule_files - MANIFEST_IGNORES).join("\n"))
     end
   end
 end

data/lib/chef/knife/bootstrap_solo.rb

@@ -0,0 +1,40 @@
+require 'chef/knife/bootstrap'
+
+class Chef
+  class Knife
+    class Bootstrap
+
+      def self.load_deps
+        super
+        require 'chef/knife/solo_bootstrap'
+        require 'knife-solo/tools'
+        SoloBootstrap.load_deps
+      end
+
+      option :solo,
+        :long        => '--[no-]solo',
+        :description => 'Bootstrap using knife-solo'
+
+      # Rename and override run method
+      alias_method :run_with_chef_client, :run
+
+      def run
+        if KnifeSolo::Tools.config_value(config, :solo)
+          run_with_knife_solo
+        else
+          run_with_chef_client
+        end
+      end
+
+      # Bootstraps Chef on the node using knife-solo
+      def run_with_knife_solo
+        validate_name_args!
+
+        bootstrap = SoloBootstrap.new
+        bootstrap.name_args = @name_args
+        bootstrap.config.merge! config
+        bootstrap.run
+      end
+    end
+  end
+end

data/lib/chef/knife/solo_bootstrap.rb

@@ -40,7 +40,7 @@ class Chef
         cmd = klass.new
         cmd.ui = ui
         cmd.name_args = @name_args
-        cmd.config = config
+        cmd.config.merge! config
         cmd
       end
     end

data/lib/chef/knife/solo_clean.rb

@@ -1,24 +1,36 @@
 require 'chef/knife'
 
 require 'knife-solo/ssh_command'
-require 'knife-solo/config'
 
 class Chef
   class Knife
     class SoloClean < Knife
       include KnifeSolo::SshCommand
 
+      deps do
+        require 'knife-solo/tools'
+        KnifeSolo::SshCommand.load_deps
+      end
+
       banner "knife solo clean [USER@]HOSTNAME"
 
+      option :provisioning_path,
+        :long        => '--provisioning-path path',
+        :description => 'Where to store kitchen data on the node'
+        # TODO de-duplicate this option with solo cook
+
       def run
-        @solo_config = KnifeSolo::Config.new
         validate!
-        run_command "rm -rf #{@solo_config.chef_path}"
+        run_command "rm -rf #{provisioning_path}"
       end
 
       def validate!
         validate_ssh_options!
-        @solo_config.validate!
+      end
+
+      def provisioning_path
+        # TODO de-duplicate this method with solo cook
+        KnifeSolo::Tools.config_value(config, :provisioning_path, '~/chef-solo')
       end
     end
   end

data/lib/chef/knife/solo_cook.rb

@@ -4,7 +4,6 @@ require 'knife-solo'
 require 'knife-solo/ssh_command'
 require 'knife-solo/node_config_command'
 require 'knife-solo/tools'
-require 'knife-solo/config'
 
 class Chef
   class Knife
@@ -19,9 +18,9 @@ class Chef
 
       deps do
         require 'chef/cookbook/chefignore'
-        require 'librarian/action'
-        require 'librarian/chef'
+        require 'erubis'
         require 'pathname'
+        require 'tempfile'
         KnifeSolo::SshCommand.load_deps
         KnifeSolo::NodeConfigCommand.load_deps
       end
@@ -43,8 +42,7 @@ class Chef
 
       option :librarian,
         :long        => '--no-librarian',
-        :description => 'Skip librarian-chef install',
-        :default    => true
+        :description => 'Skip librarian-chef install'
 
       option :why_run,
         :short       => '-W',
@@ -56,34 +54,76 @@ class Chef
         :long        => '--override-runlist',
         :description => 'Replace current run list with specified items'
 
-      def run
-        @solo_config = KnifeSolo::Config.new
+      option :provisioning_path,
+        :long        => '--provisioning-path path',
+        :description => 'Where to store kitchen data on the node'
 
+      def run
         time('Run') do
+
           if config[:skip_chef_check]
             ui.warn '`--skip-chef-check` is deprecated, please use `--no-chef-check`.'
             config[:chef_check] = false
           end
 
           validate!
+
+          ui.msg "Running Chef on #{host}..."
+
           check_chef_version if config[:chef_check]
           generate_node_config
-          librarian_install if config[:librarian]
-          rsync_kitchen
-          add_patches
-          add_solo_config unless using_custom_solorb?
+          librarian_install if config_value(:librarian, true)
+          sync_kitchen
+          generate_solorb
           cook unless config[:sync_only]
         end
       end
 
-      def_delegators :@solo_config,
-        :chef_path,
-        :using_custom_solorb?,
-        :patch_path
-
       def validate!
         validate_ssh_options!
-        @solo_config.validate!
+
+        if File.exist? 'solo.rb'
+          ui.warn "solo.rb found, but since knife-solo v0.3.0 it is not used any more"
+          ui.warn "Please read the upgrade instructions: https://github.com/matschaffer/knife-solo/wiki/Upgrading-to-0.3.0"
+        end
+      end
+
+      def provisioning_path
+        # TODO ~ will likely break on cmd.exe based windows sessions
+        config_value(:provisioning_path, '~/chef-solo')
+      end
+
+      def sync_kitchen
+        ui.msg "Uploading the kitchen..."
+        run_portable_mkdir_p(provisioning_path, '0700')
+
+        cookbook_paths.each_with_index do |path, i|
+          upload_to_provision_path(path, "/cookbooks-#{i + 1}", 'cookbook_path')
+        end
+        upload_to_provision_path(nodes_path, 'nodes')
+        upload_to_provision_path(:role_path, 'roles')
+        upload_to_provision_path(:data_bag_path, 'data_bags')
+        upload_to_provision_path(:encrypted_data_bag_secret, 'data_bag_key')
+      end
+
+      def expanded_config_paths(key)
+        Array(Chef::Config[key]).map { |path| Pathname.new(path).expand_path }
+      end
+
+      def cookbook_paths
+        @cookbook_paths ||= expanded_config_paths(:cookbook_path) + [patch_cookbooks_path]
+      end
+
+      def add_cookbook_path(path)
+        cookbook_paths.unshift(path) unless cookbook_paths.include?(path)
+      end
+
+      def patch_cookbooks_path
+        KnifeSolo.resource('patch_cookbooks')
+      end
+
+      def nodes_path
+        'nodes'
       end
 
       def chefignore
@@ -112,7 +152,7 @@ class Chef
       end
 
       def rsync_excludes
-        (%w{revision-deploys tmp '.*'} + chefignore.ignores).uniq
+        (%w{revision-deploys tmp .git .hg .svn .bzr} + chefignore.ignores).uniq
       end
 
       def debug?
@@ -129,36 +169,70 @@ class Chef
       end
 
       def librarian_install
-        return unless File.exist? 'Cheffile'
-        Chef::Log.debug("Installing Librarian cookbooks")
-        Librarian::Action::Resolve.new(librarian_env).run
-        Librarian::Action::Install.new(librarian_env).run
+        if !File.exist? 'Cheffile'
+          Chef::Log.debug "Cheffile not found"
+        elsif !load_librarian
+          ui.warn "Librarian-Chef could not be loaded"
+          ui.warn "Please add the librarian-chef gem to your Gemfile or install it manually with `gem install librarian-chef`"
+        else
+          ui.msg "Installing Librarian cookbooks..."
+          Librarian::Action::Resolve.new(librarian_env).run
+          Librarian::Action::Install.new(librarian_env).run
+          add_cookbook_path librarian_env.install_path
+        end
+      end
+
+      def load_librarian
+        begin
+          require 'librarian/action'
+          require 'librarian/chef'
+        rescue LoadError
+          false
+        else
+          true
+        end
       end
 
       def librarian_env
         @librarian_env ||= Librarian::Chef::Environment.new
       end
 
-      def rsync_kitchen
-        time('Rsync kitchen') do
-          rsync('./', chef_path, '--delete')
-        end
+      def generate_solorb
+        ui.msg "Generating solo config..."
+        template = Erubis::Eruby.new(KnifeSolo.resource('solo.rb.erb').read)
+        write(template.result(binding), provisioning_path + '/solo.rb')
       end
 
-      def add_patches
-        run_portable_mkdir_p(patch_path)
-        Dir[Pathname.new(__FILE__).dirname.join("patches", "*.rb").to_s].each do |patch|
-          time(patch) do
-            rsync(patch, patch_path)
-          end
+      def upload(src, dest)
+        rsync(src, dest)
+      end
+
+      def upload_to_provision_path(src, dest, key_name = 'path')
+        if src.is_a? Symbol
+          key_name = src.to_s
+          src = Chef::Config[src]
+        end
+
+        if src.nil?
+          Chef::Log.debug "'#{key_name}' not set"
+        elsif !File.exist?(src)
+          ui.warn "Local #{key_name} '#{src}' does not exist"
+        else
+          upload("#{src}#{'/' if File.directory?(src)}", File.join(provisioning_path, dest))
         end
       end
 
-      def add_solo_config
-        rsync(KnifeSolo.resource('solo.rb'), chef_path)
+      # TODO probably can get Net::SSH to do this directly
+      def write(content, dest)
+        file = Tempfile.new(File.basename(dest))
+        file.write(content)
+        file.close
+        upload(file.path, dest)
+      ensure
+        file.unlink
       end
 
-      def rsync(source_path, target_path, extra_opts = '')
+      def rsync(source_path, target_path, extra_opts = '--delete')
         cmd = %Q{rsync -rl #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts} #{rsync_excludes.collect{ |ignore| "--exclude #{ignore} " }.join} #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
         ui.msg cmd if debug?
         system! cmd
@@ -178,7 +252,8 @@ class Chef
       end
 
       def cook
-        cmd = "sudo chef-solo -c #{chef_path}/solo.rb -j #{chef_path}/#{node_config}"
+        ui.msg "Running Chef..."
+        cmd = "sudo chef-solo -c #{provisioning_path}/solo.rb -j #{provisioning_path}/#{node_config}"
         cmd << " -l debug" if debug?
         cmd << " -N #{config[:chef_node_name]}" if config[:chef_node_name]
         cmd << " -W" if config[:why_run]