summaryrefslogtreecommitdiff
path: root/lib/chef/user.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/user.rb')
-rw-r--r--lib/chef/user.rb27
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/chef/user.rb b/lib/chef/user.rb
index 7791b56cb5..cdca8dafb5 100644
--- a/lib/chef/user.rb
+++ b/lib/chef/user.rb
@@ -36,7 +36,6 @@ require "chef/server_api"
# should be removed once client support for Open Source Chef Server 11 expires.
class Chef
class User
-
include Chef::Mixin::FromFile
include Chef::Mixin::ParamsValidate
@@ -49,30 +48,30 @@ class Chef
end
def chef_rest_v0
- @chef_rest_v0 ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], {:api_version => "0"})
+ @chef_rest_v0 ||= Chef::ServerAPI.new(Chef::Config[:chef_server_url], { :api_version => "0" })
end
- def name(arg=nil)
+ def name(arg = nil)
set_or_return(:name, arg,
:regex => /^[a-z0-9\-_]+$/)
end
- def admin(arg=nil)
+ def admin(arg = nil)
set_or_return(:admin,
arg, :kind_of => [TrueClass, FalseClass])
end
- def public_key(arg=nil)
+ def public_key(arg = nil)
set_or_return(:public_key,
arg, :kind_of => String)
end
- def private_key(arg=nil)
+ def private_key(arg = nil)
set_or_return(:private_key,
arg, :kind_of => String)
end
- def password(arg=nil)
+ def password(arg = nil)
set_or_return(:password,
arg, :kind_of => String)
end
@@ -97,21 +96,21 @@ class Chef
end
def create
- payload = {:name => self.name, :admin => self.admin, :password => self.password }
+ payload = { :name => self.name, :admin => self.admin, :password => self.password }
payload[:public_key] = public_key if public_key
new_user = chef_rest_v0.post("users", payload)
Chef::User.from_hash(self.to_hash.merge(new_user))
end
- def update(new_key=false)
- payload = {:name => name, :admin => admin}
+ def update(new_key = false)
+ payload = { :name => name, :admin => admin }
payload[:private_key] = new_key if new_key
payload[:password] = password if password
updated_user = chef_rest_v0.put("users/#{name}", payload)
Chef::User.from_hash(self.to_hash.merge(updated_user))
end
- def save(new_key=false)
+ def save(new_key = false)
begin
create
rescue Net::HTTPServerException => e
@@ -159,8 +158,8 @@ class Chef
Chef::User.from_json(json)
end
- def self.list(inflate=false)
- response = Chef::ServerAPI.new(Chef::Config[:chef_server_url], {:api_version => "0"}).get("users")
+ def self.list(inflate = false)
+ response = Chef::ServerAPI.new(Chef::Config[:chef_server_url], { :api_version => "0" }).get("users")
users = if response.is_a?(Array)
transform_ohc_list_response(response) # OHC/OPC
else
@@ -177,7 +176,7 @@ class Chef
end
def self.load(name)
- response = Chef::ServerAPI.new(Chef::Config[:chef_server_url], {:api_version => "0"}).get("users/#{name}")
+ response = Chef::ServerAPI.new(Chef::Config[:chef_server_url], { :api_version => "0" }).get("users/#{name}")
Chef::User.from_hash(response)
end