cookbooks/windows/providers/path.rb in madscience-0.0.4 vs cookbooks/windows/providers/path.rb in madscience-0.0.5

@@ -1,7 +1,7 @@
 #
-# Author:: Paul Morotn (<[e-mail]>)
+# Author:: Paul Morton (<[e-mail]>)
 # Cookbook Name:: windows
 # Provider:: path
 #
 # Copyright:: 2011, Business Intelligence Associates, Inc
 #
@@ -15,21 +15,38 @@
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+use_inline_resources if defined?(use_inline_resources)
 
+include Windows::Helper
+
 action :add do
-  env "PATH" do
+  env "path" do
     action :modify
     delim ::File::PATH_SEPARATOR
     value new_resource.path
+    notifies :run, "ruby_block[fix ruby ENV['PATH']]", :immediately
   end
+
+  # The windows Env provider does not correctly expand variables in 
+  # the PATH environment variable. Ruby expects these to be expanded.
+  # This is a temporary fix for that.
+  #
+  # Follow at https://github.com/opscode/chef/pull/1876
+  #
+  ruby_block "fix ruby ENV['PATH']" do
+    block do
+      ENV['PATH'] = expand_env_vars(ENV['PATH'])
+    end
+    action :nothing
+  end
 end
 
 action :remove do
-  env "PATH" do
+  env "path" do
     action :delete
     delim ::File::PATH_SEPARATOR
     value new_resource.path
   end
-end
\ No newline at end of file
+end