Updating the script provider to set the ownership of the tempfile via a Chef::Resource::File; adding a Chef::Resource#run_action method. Closes CHEF-57

Author: adamhjk

chef/lib/chef/provider/script.rb

@@ -27,6 +27,12 @@ def action_run
         tf = Tempfile.new("chef-script")
         tf.puts(@new_resource.code)
         tf.close
+        
+        fr = Chef::Resource::File.new(tf.path, nil, @node)
+        fr.owner(@new_resource.user)
+        fr.group(@new_resource.group)
+        fr.run_action(:create)
+        
         @new_resource.command("#{@new_resource.interpreter} #{tf.path}") 
         super
       end

chef/lib/chef/resource.rb

@@ -221,6 +221,13 @@ def not_if(arg=nil, &blk)
       @not_if
     end
 
+    def run_action(action)
+      provider_class = Chef::Platform.find_provider_for_node(@node, self)
+      provider = provider_class.new(@node, self)
+      provider.load_current_resource
+      provider.send("action_#{action}")
+    end
+    
     private
 
       def check_timing(timing)

chef/spec/unit/provider/script_spec.rb

@@ -0,0 +1,87 @@
+#
+# Author:: Adam Jacob (adam@opscode.com)
+# Copyright:: Copyright (c) 2009 Opscode
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+
+describe Chef::Provider::Script, "action_run" do  
+  before(:each) do
+    @node = mock("Chef::Node", :null_object => true)
+    @new_resource = mock("Chef::Resource::Script",
+      :null_object => true,
+      :code => "$| = 1; print 'i like beans'",
+      :interpreter => 'perl',
+      :user => nil,
+      :group => nil
+    )
+    @tempfile = mock("Tempfile", 
+      :null_object => true, 
+      :puts => true, 
+      :close => true,
+      :path => "/tmp/perlscript"
+    )
+    @fr = Chef::Resource::File.new(@tempfile.path, nil, @node)
+    Chef::Resource::File.stub!(:new).and_return(@fr)
+    @fr.stub!(:run_action).and_return(true)
+    Tempfile.stub!(:new).with("chef-script").and_return(@tempfile)
+    File.stub!(:chown).and_return(true)
+    @provider = Chef::Provider::Script.new(@node, @new_resource)
+    @provider.stub!(:run_command).and_return(true)
+  end
+
+  it "should create a new temp file for the script" do
+    Tempfile.should_receive(:new).with("chef-script").and_return(@tempfile)
+    @provider.action_run
+  end
+
+  it "should put the contents of the script in the temp file" do
+    @tempfile.should_receive(:puts).with(@new_resource.code)
+    @provider.action_run
+  end
+  
+  it "should close the tempfile" do
+    @tempfile.should_receive(:close)
+    @provider.action_run
+  end
+
+  it "should create a new Chef::Resource::File for the tempfile" do
+    Chef::Resource::File.should_receive(:new).with(@tempfile.path, nil, @node).and_return(@fr)
+    @provider.action_run
+  end
+  
+  it "should set the owner attribute on the file resource from the script user" do
+    @fr.should_receive(:owner).with(@new_resource.user)
+    @provider.action_run
+  end
+  
+  it "should set the group attribute on the file resource from the script group" do
+    @fr.should_receive(:group).with(@new_resource.group)
+    @provider.action_run
+  end
+  
+  it "should run the create action on the file resouce" do
+    @fr.should_receive(:run_action).with(:create)
+    @provider.action_run
+  end
+  
+  it "should set the command to 'interpreter tempfile'" do
+    @new_resource.should_receive(:command).with("#{@new_resource.interpreter} #{@tempfile.path}")
+    @provider.action_run
+  end
+
+end
+

example-repository/cookbooks/CHEF-57/recipes/default.rb

@@ -0,0 +1,24 @@
+#
+# Cookbook Name:: CHEF-57
+# Recipe:: default
+#
+# Copyright 2009, Example Com
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+script "boo" do
+  user 'adam'
+  code "print 'I like cheese';"
+  interpreter "perl"
+end