summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2015-02-23 17:35:42 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2015-02-23 17:35:42 -0800
commite5bd51fb9c14d8bd96aca4d90a2dc1438da5a33e (patch)
tree19730450d6c51fa0f18ab97212b3298617e0adf7
parent0e01c33eb861fc31fc63e15b9c59173e373aec2d (diff)
downloadchef-e5bd51fb9c14d8bd96aca4d90a2dc1438da5a33e.tar.gz
fix specs
reverts #get_default_attributes and #create_ace_with_mask_and_sid back to public methods, removes some redundant selfs
-rw-r--r--lib/chef/resource/powershell_script.rb2
-rw-r--r--lib/chef/whitelist.rb4
-rw-r--r--lib/chef/win32/security/ace.rb3
3 files changed, 2 insertions, 7 deletions
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb
index a40f2e66e6..1b8aef94a2 100644
--- a/lib/chef/resource/powershell_script.rb
+++ b/lib/chef/resource/powershell_script.rb
@@ -44,8 +44,6 @@ class Chef
def self.get_default_attributes(opts)
{:convert_boolean_return => true}
end
-
- private_class_method :get_default_attributes
end
end
end
diff --git a/lib/chef/whitelist.rb b/lib/chef/whitelist.rb
index 587baa6a3e..3682f7187e 100644
--- a/lib/chef/whitelist.rb
+++ b/lib/chef/whitelist.rb
@@ -32,7 +32,7 @@ class Chef
new_data = {}
whitelist.each do |item|
- self.add_data(data, new_data, item)
+ add_data(data, new_data, item)
end
new_data
end
@@ -40,7 +40,7 @@ class Chef
# Walk the data has according to the keys provided by the whitelisted item
# and add the data to the whitelisting result.
def self.add_data(data, new_data, item)
- parts = self.to_array(item)
+ parts = to_array(item)
all_data = data
filtered_data = new_data
diff --git a/lib/chef/win32/security/ace.rb b/lib/chef/win32/security/ace.rb
index e754589024..1f54b1cafb 100644
--- a/lib/chef/win32/security/ace.rb
+++ b/lib/chef/win32/security/ace.rb
@@ -117,9 +117,6 @@ class Chef
Chef::ReservedNames::Win32::Memory.memcpy(struct.pointer + struct.offset_of(:SidStart), sid.pointer, sid.size)
ACE.new(struct.pointer)
end
-
- private_class_method :create_ace_with_mask_and_sid
-
end
end
end