Merge branch 'CHEF-1803'

Author: danielsdeleo

chef/lib/chef/resource/file.rb

@@ -67,7 +67,14 @@ def mode(arg=nil)
         set_or_return(
           :mode,
           arg,
-          :regex => /^0?\d{3,4}$/
+          :callbacks => { 
+            "not in valid numeric range" => lambda { |m| 
+              if m.kind_of?(String)
+                m =~ /^0/ || m="0#{m}"
+              end 
+              Integer(m)<=07777 && Integer(m)>=0
+            }
+          }
         )
       end
 

chef/spec/unit/resource/file_spec.rb

@@ -77,11 +77,47 @@
     lambda { @resource.group "root*goo" }.should raise_error(ArgumentError)
   end
 
-  it "should accept a valid unix file mode" do
+  it "should accept a unix file mode in string form as an octal number" do
+    lambda { @resource.mode "0" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "0000" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "0111" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "0444" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "07777" }.should_not raise_error(ArgumentError)
+
+    lambda { @resource.mode "0" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "111" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "444" }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode "7777" }.should_not raise_error(ArgumentError)
+
+    lambda { @resource.mode "-01" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "010000" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "-1" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "10000" }.should raise_error(ArgumentError)
+
+    lambda { @resource.mode "07778" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "7778" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "4095" }.should raise_error(ArgumentError)
+
+    lambda { @resource.mode "0foo1234" }.should raise_error(ArgumentError)
+    lambda { @resource.mode "foo1234" }.should raise_error(ArgumentError)
+  end
+
+  it "should accept a unix file mode in numeric form as a ruby-interpreted integer" do
+    lambda { @resource.mode 0 }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode 0000 }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode 0111 }.should_not raise_error(ArgumentError)
     lambda { @resource.mode 0444 }.should_not raise_error(ArgumentError)
-    @resource.mode.should eql(0444)
-    lambda { @resource.mode 444 }.should_not raise_error(ArgumentError)
-    lambda { @resource.mode 4 }.should raise_error(ArgumentError)
+    lambda { @resource.mode 07777 }.should_not raise_error(ArgumentError)
+
+    lambda { @resource.mode 0 }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode 73 }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode 292 }.should_not raise_error(ArgumentError)
+    lambda { @resource.mode 4095 }.should_not raise_error(ArgumentError)
+
+    lambda { @resource.mode -01 }.should raise_error(ArgumentError)
+    lambda { @resource.mode 010000 }.should raise_error(ArgumentError)
+    lambda { @resource.mode -1 }.should raise_error(ArgumentError)
+    lambda { @resource.mode 4096 }.should raise_error(ArgumentError)
   end
 
   it "should accept a user name or id for owner" do

features/data/cookbooks/manage_files/recipes/set_the_accessibility_of_a_created_file.rb

@@ -17,6 +17,12 @@
 # limitations under the License.
 #
 
+file "#{node[:tmpdir]}/octal0111.txt" do
+  owner 'nobody'
+  mode 0111
+  action :create
+end
+
 file "#{node[:tmpdir]}/octal0644.txt" do
   owner 'nobody'
   mode 0644
@@ -29,6 +35,12 @@
   action :create
 end
 
+file "#{node[:tmpdir]}/decimal73.txt" do
+  owner 'nobody'
+  mode 73
+  action :create
+end
+
 file "#{node[:tmpdir]}/decimal644.txt" do
   owner 'nobody'
   mode 644
@@ -41,6 +53,12 @@
   action :create
 end
 
+file "#{node[:tmpdir]}/string111.txt" do
+  owner 'nobody'
+  mode "111"
+  action :create
+end
+
 file "#{node[:tmpdir]}/string644.txt" do
   owner 'nobody'
   mode "644"

features/provider/file/manage_files.feature

@@ -46,10 +46,13 @@ Feature: Manage Files
       And it includes the recipe 'manage_files::set_the_accessibility_of_a_created_file'
      When I run the chef-client
      Then the run should exit '0'
+      And the file named 'octal0111.txt' should have octal mode '0111'
       And the file named 'octal0644.txt' should have octal mode '0644'
       And the file named 'octal2644.txt' should have octal mode '2644'
+      And the file named 'decimal73.txt' should have decimal mode '73'
       And the file named 'decimal644.txt' should have decimal mode '644'
       And the file named 'decimal2644.txt' should have decimal mode '2644'
+      And the file named 'string111.txt' should have octal mode '111'
       And the file named 'string644.txt' should have octal mode '644'
       And the file named 'string0644.txt' should have octal mode '0644'
       And the file named 'string2644.txt' should have octal mode '2644'