summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs/file_system/chef_server
diff options
context:
space:
mode:
Diffstat (limited to 'lib/chef/chef_fs/file_system/chef_server')
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb8
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb3
-rw-r--r--lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb3
3 files changed, 3 insertions, 11 deletions
diff --git a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
index 3477278c96..0900a033d0 100644
--- a/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/chef_server_root_dir.rb
@@ -86,13 +86,7 @@ class Chef
@cookbook_version = options[:cookbook_version] # Used in knife diff and download for server cookbook version
end
- attr_reader :chef_server_url
- attr_reader :chef_username
- attr_reader :chef_private_key
- attr_reader :environment
- attr_reader :repo_mode
- attr_reader :cookbook_version
- attr_reader :versioned_cookbooks
+ attr_reader :chef_server_url, :chef_username, :chef_private_key, :environment, :repo_mode, :cookbook_version, :versioned_cookbooks
def fs_description
"Chef server at #{chef_server_url} (user #{chef_username}), repo_mode = #{repo_mode}"
diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb
index 91b5e47d66..c037d8ce25 100644
--- a/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_subdir.rb
@@ -30,8 +30,7 @@ class Chef
@recursive = recursive
end
- attr_reader :versions
- attr_reader :children
+ attr_reader :versions, :children
def add_child(child)
@children << child
diff --git a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb
index 0a1ee83c36..a96cdbbf9a 100644
--- a/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb
+++ b/lib/chef/chef_fs/file_system/chef_server/rest_list_dir.rb
@@ -31,8 +31,7 @@ class Chef
@data_handler = data_handler
end
- attr_reader :api_path
- attr_reader :data_handler
+ attr_reader :api_path, :data_handler
def can_have_child?(name, is_dir)
!is_dir