Merge branch 'CHEF-1157'

Author: danielsdeleo

chef/lib/chef.rb

@@ -34,7 +34,7 @@ class Chef
 end
 
 # Adds a Dir.glob to Ruby 1.8.5, for compat
-if RUBY_VERSION < "1.8.6" 
+if RUBY_VERSION < "1.8.6" || RUBY_PLATFORM =~ /mswin|mingw32|windows/
   class Dir 
     class << self 
       alias_method :glob_, :glob 
@@ -44,6 +44,7 @@ def glob(pattern, flags=0)
             pattern.is_a? Array and !pattern.empty?
           ) or pattern.is_a? String
         )
+        pattern.gsub!(/\\/, "/") if RUBY_PLATFORM =~ /mswin|mingw32|windows/
         [pattern].flatten.inject([]) { |r, p| r + glob_(p, flags) }
       end
       alias_method :[], :glob 

chef/lib/chef/application.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -22,38 +22,40 @@
 
 class Chef::Application
   include Mixlib::CLI
-   
-  def initialize   
+
+  def initialize
     super
-    
+
     trap("TERM") do
       Chef::Application.fatal!("SIGTERM received, stopping", 1)
     end
 
     trap("INT") do
       Chef::Application.fatal!("SIGINT received, stopping", 2)
     end
-    
-    trap("HUP") do 
-      Chef::Log.info("SIGHUP received, reconfiguring")
-      reconfigure
+
+    unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+      trap("HUP") do
+        Chef::Log.info("SIGHUP received, reconfiguring")
+        reconfigure
+      end
     end
-    
+
     at_exit do
-      # tear down the logger 
+      # tear down the logger
     end
 
     # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
     # from failing due to permissions when launched as a less privileged user.
     Dir.chdir("/")
   end
-  
+
   # Reconfigure the application. You'll want to override and super this method.
   def reconfigure
     configure_chef
     configure_logging
   end
-  
+
   # Get this party started
   def run
     reconfigure
@@ -64,25 +66,25 @@ def run
   # Parse the configuration file
   def configure_chef
     parse_options
-    
+
     Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
     Chef::Config.merge!(config)
   end
-  
+
   # Initialize and configure the logger
   def configure_logging
     Chef::Log.init(Chef::Config[:log_location])
     Chef::Log.level = Chef::Config[:log_level]
   end
-  
+
   # Called prior to starting the application, by the run method
   def setup_application
-    raise Chef::Exceptions::Application, "#{self.to_s}: you must override setup_application"      
+    raise Chef::Exceptions::Application, "#{self.to_s}: you must override setup_application"
   end
-  
+
   # Actually run the application
   def run_application
-    raise Chef::Exceptions::Application, "#{self.to_s}: you must override run_application"  
+    raise Chef::Exceptions::Application, "#{self.to_s}: you must override run_application"
   end
 
   class << self

chef/lib/chef/file_cache.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -26,7 +26,7 @@ class FileCache
     class << self
       include Chef::Mixin::ParamsValidate
       include Chef::Mixin::CreatePath
-      
+
       # Write a file to the File Cache.
       #
       # === Parameters
@@ -47,7 +47,7 @@ def store(path, contents)
             :contents => { :kind_of => String },
           }
         )
-      
+
         file_path_array = File.split(path)
         file_name = file_path_array.pop
         cache_path = create_cache_path(File.join(file_path_array))
@@ -56,7 +56,7 @@ def store(path, contents)
         io.close
         true
       end
-      
+
       # Move a file in to the cache.  Useful with the REST raw file output.
       #
       # === Parameteres
@@ -73,19 +73,19 @@ def move_to(file, path)
             :path => { :kind_of => String },
           }
         )
-        
+
         file_path_array = File.split(path)
         file_name = file_path_array.pop
         if File.exists?(file) && File.writable?(file)
           FileUtils.mv(
-            file, 
+            file,
             File.join(create_cache_path(File.join(file_path_array), true), file_name)
           )
         else
           raise RuntimeError, "Cannot move #{file} to #{path}!"
         end
       end
-    
+
       # Read a file from the File Cache
       #
       # === Parameters
@@ -116,7 +116,7 @@ def load(path, read=true)
           cache_path
         end
       end
-      
+
       # Delete a file from the File Cache
       #
       # === Parameters
@@ -140,7 +140,7 @@ def delete(path)
         end
         true
       end
-      
+
       # List all the files in the Cache
       #
       # === Returns
@@ -149,19 +149,19 @@ def list()
         keys = Array.new
         Dir[File.join(Chef::Config[:file_cache_path], '**', '*')].each do |f|
           if File.file?(f)
-            path = f.match("^#{Chef::Config[:file_cache_path]}\/(.+)")[1]
+            path = f.match("^#{Dir[Chef::Config[:file_cache_path]].first}\/(.+)")[1]
             keys << path
           end
         end
         keys
       end
-      
+
       # Whether or not this file exists in the Cache
       #
       # === Parameters
-      # path:: The path to the file you want to check - is relative 
+      # path:: The path to the file you want to check - is relative
       #   to Chef::Config[:file_cache_path]
-      # 
+      #
       # === Returns
       # True:: If the file exists
       # False:: If it does not
@@ -181,25 +181,25 @@ def has_key?(path)
           false
         end
       end
-      
+
       # Create a full path to a given file in the cache. By default,
       # also creates the path if it does not exist.
       #
       # === Parameters
       # path:: The path to create, relative to Chef::Config[:file_cache_path]
       # create_if_missing:: True by default - whether to create the path if it does not exist
-      # 
+      #
       # === Returns
       # String:: The fully expanded path
       def create_cache_path(path, create_if_missing=true)
         cache_dir = File.expand_path(File.join(Chef::Config[:file_cache_path], path))
         if create_if_missing
-          create_path(cache_dir) 
+          create_path(cache_dir)
         else
           cache_dir
         end
       end
-  
+
     end
   end
 end

chef/lib/chef/provider/file.rb

@@ -46,6 +46,7 @@ def octal_mode(mode)
 
       def load_current_resource
         @current_resource = Chef::Resource::File.new(@new_resource.name)
+        @new_resource.path.gsub!(/\\/, "/") # for Windows
         @current_resource.path(@new_resource.path)
         if ::File.exist?(@current_resource.path) && ::File.readable?(@current_resource.path)
           cstats = ::File.stat(@current_resource.path)

chef/spec/unit/file_cache_spec.rb

@@ -6,9 +6,9 @@
 # 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.
@@ -26,7 +26,7 @@
     @io = mock("IO", { :print => true, :close => true })
     File.stub!(:open).and_return(@io)
   end
-  
+
   it "should create the directories leading up to bang" do
     File.stub!(:directory?).and_return(false)
     Dir.should_receive(:mkdir).with("/tmp").and_return(true)
@@ -35,17 +35,17 @@
     Dir.should_not_receive(:mkdir).with("/tmp/foo/whiz/bang").and_return(true)
     Chef::FileCache.store("whiz/bang", "I found a poop")
   end
-  
+
   it "should create a file at /tmp/foo/whiz/bang" do
     File.should_receive(:open).with("/tmp/foo/whiz/bang", "w").and_return(@io)
     Chef::FileCache.store("whiz/bang", "I found a poop")
   end
-  
+
   it "should print the contents to the file" do
     @io.should_receive(:print).with("I found a poop")
     Chef::FileCache.store("whiz/bang", "I found a poop")
   end
-  
+
   it "should close the file" do
     @io.should_receive(:close)
     Chef::FileCache.store("whiz/bang", "I found a poop")
@@ -61,18 +61,18 @@
     File.stub!(:exists?).and_return(true)
     File.stub!(:read).and_return("I found a poop")
   end
-  
+
   it "should find the full path to whiz/bang" do
     File.should_receive(:read).with("/tmp/foo/whiz/bang").and_return(true)
     Chef::FileCache.load('whiz/bang')
   end
-  
+
   it "should raise a Chef::Exceptions::FileNotFound if the file doesn't exist" do
     File.stub!(:exists?).and_return(false)
     lambda { Chef::FileCache.load('whiz/bang') }.should raise_error(Chef::Exceptions::FileNotFound)
   end
 end
- 
+
 describe Chef::FileCache, "delete method" do
   before(:each) do
     Chef::Config[:file_cache_path] = "/tmp/foo"
@@ -81,21 +81,22 @@
     File.stub!(:exists?).and_return(true)
     File.stub!(:unlink).and_return(true)
   end
-  
+
   it "should unlink the full path to whiz/bang" do
     File.should_receive(:unlink).with("/tmp/foo/whiz/bang").and_return(true)
     Chef::FileCache.delete("whiz/bang")
   end
-  
+
 end
 
 describe Chef::FileCache, "list method" do
   before(:each) do
     Chef::Config[:file_cache_path] = "/tmp/foo"
-    Dir.stub!(:[]).and_return(["/tmp/foo/whiz/bang", "/tmp/foo/snappy/patter"])
+    Dir.stub!(:[]).with(File.join(Chef::Config[:file_cache_path], '**', '*')).and_return(["/tmp/foo/whiz/bang", "/tmp/foo/snappy/patter"])
+    Dir.stub!(:[]).with(Chef::Config[:file_cache_path]).and_return(["/tmp/foo"])
     File.stub!(:file?).and_return(true)
   end
-  
+
   it "should return the relative paths" do
     Chef::FileCache.list.should eql([ "whiz/bang", "snappy/patter" ])
   end
@@ -105,17 +106,17 @@
   before(:each) do
     Chef::Config[:file_cache_path] = "/tmp/foo"
   end
-  
+
   it "should check the full path to the file" do
     File.should_receive(:exists?).with("/tmp/foo/whiz/bang")
     Chef::FileCache.has_key?("whiz/bang")
   end
-  
+
   it "should return true if the file exists" do
     File.stub!(:exists?).and_return(true)
     Chef::FileCache.has_key?("whiz/bang").should eql(true)
   end
-  
+
   it "should return false if the file does not exist" do
     File.stub!(:exists?).and_return(false)
     Chef::FileCache.has_key?("whiz/bang").should eql(false)