Make Bills Kitchen better "Git-bash"-able

CHANGELOG.md

@@ -2,14 +2,18 @@
 # 2.4 (unreleased)
 
  * tool updates:
-  * update to ChefDK 0.5.0-rc.2
+  * update to ChefDK 0.4.0
   * update to Terraform 0.3.7
   * update to Consul 0.5.0
   * update to ConEmu 20150305
   * update to clink 0.4.4
  * vagrant plugin updates:
   * update to vagrant-toplevel-cookbooks 0.2.4
   * update to vagrant-berkshelf 4.0.3
+ * improvements:
+  * cache busser gems only during test-kitchen runs and add compatibility with test-kitchen 1.4 (see [#78](https://github.com/tknerr/bills-kitchen/pull/78))
+  * fix remaining hardcoded references to "C:\opscode\.." in ChefDK, allowing to use the ChefDK binaries from within `git-bash` (see [#87](https://github.com/tknerr/bills-kitchen/pull/87))
+  * add `git-bash.bat` to the PATH so it is easier accessible (see [#85](https://github.com/tknerr/bills-kitchen/issues/85), thanks @paul42 for the suggestion)
 
 **Please note:** SublimeText has been replaced by [Atom](https://atom.io/) (see [#67](https://github.com/tknerr/bills-kitchen/issues/67)):
 
@@ -25,9 +29,6 @@
   * `autocomplete-plus` - for better auto-completion
   * `autocomplete-snippets` - to enable auto-completion for snippets
 
-  * `autocomplete-snippets` - to enable auto-completion for snippets
-
-
 # 2.3 (January 23, 2015)
 
  * tool updates:

Rakefile

@@ -118,14 +118,17 @@ def move_chefdk
   FileUtils.rm_rf "#{BUILD_DIR}/tools/chef-dk"
 end
 
+# ensure omnibus / chef-dk use the embedded ruby, see opscode/chef#1512
 def fix_chefdk
+  Dir.glob("#{BUILD_DIR}/tools/chefdk/bin/*").each do |file|
+    if File.extname(file).empty?  # do this only for the extensionless files
+      File.write(file, File.read(file).gsub('#!C:/opscode/chefdk/embedded/bin/ruby.exe', '#!/usr/bin/env ruby'))
+    end
+  end
   Dir.glob("#{BUILD_DIR}/tools/chefdk/embedded/bin/*.bat").each do |file|
-    # ensure omnibus / chef-dk use the embedded ruby, see opscode/chef#1512
     File.write(file, File.read(file).gsub('@"C:\opscode\chefdk\embedded\bin\ruby.exe" "%~dpn0" %*', '@"%~dp0ruby.exe" "%~dpn0" %*'))
   end
-  # XXX: why are these .bat files even in there? -- the gem .bats should be in embedded/bin
   Dir.glob("#{BUILD_DIR}/tools/chefdk/embedded/lib/ruby/gems/2.0.0/bin/*.bat").each do |file|
-    # ensure omnibus / chef-dk use the embedded ruby, see opscode/chef#1512
     File.write(file, File.read(file).gsub('@"C:\opscode\chefdk\embedded\bin\ruby.exe" "%~dpn0" %*', '@"%~dp0\..\..\..\..\..\bin\ruby.exe" "%~dpn0" %*'))
   end
 end

files/set-env.bat

@@ -123,4 +123,4 @@ echo HTTP_PROXY=%HTTP_PROXY%
 @doskey vi=atom.cmd $*
 @doskey be=bundle exec $*
 
-set PATH=%CHEFDK_PATH_ENTRIES%;%CONSULDIR%;%PACKERDIR%;%TERRAFORMDIR%;%VAGRANTDIR%\bin;%GITDIR%\cmd;%KDIFF3DIR%;%CYGWINRSYNCDIR%;%CYGWINSSHDIR%;%VAGRANTDIR%\embedded\bin;%CONEMUDIR%;%ATOMDIR%;%APMDIR%;%PUTTYDIR%;%VBOX_MSI_INSTALL_PATH%;%VBOX_INSTALL_PATH%;%PATH%
+set PATH=%CHEFDK_PATH_ENTRIES%;%CONSULDIR%;%PACKERDIR%;%TERRAFORMDIR%;%VAGRANTDIR%\bin;%GITDIR%\cmd;%GITDIR%;%KDIFF3DIR%;%CYGWINRSYNCDIR%;%CYGWINSSHDIR%;%VAGRANTDIR%\embedded\bin;%CONEMUDIR%;%ATOMDIR%;%APMDIR%;%PUTTYDIR%;%VBOX_MSI_INSTALL_PATH%;%VBOX_INSTALL_PATH%;%PATH%

files/set-env.ps1

@@ -43,7 +43,7 @@ $env:CHEFDK_PATH_ENTRIES = "$env:CHEFDKDIR\bin;$env:CHEFDKHOMEDIR\gem\ruby\2.0.0
 
 if($env:GITDIR -eq $NULL) {
 	$env:GITDIR = Join-Path $pwd tools\portablegit
-	$env:Path = "$env:Path;$(Join-Path $env:GITDIR "cmd")"
+	$env:Path = "$env:Path;$(Join-Path $env:GITDIR "cmd");$env:GITDIR"
 }
 
 ## set git executable path