diff options
Diffstat (limited to 'lib/chef/chef_fs')
14 files changed, 16 insertions, 50 deletions
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb index 8237729e89..8fd537f2ee 100644 --- a/lib/chef/chef_fs/chef_fs_data_store.rb +++ b/lib/chef/chef_fs/chef_fs_data_store.rb @@ -164,8 +164,7 @@ class Chef "Reading and writing data to #{chef_fs.fs_description}" end - attr_reader :chef_fs - attr_reader :repo_mode + attr_reader :chef_fs, :repo_mode def create_dir(path, name, *options) if use_memory_store?(path) diff --git a/lib/chef/chef_fs/config.rb b/lib/chef/chef_fs/config.rb index 6f9183f40b..3890229ae7 100644 --- a/lib/chef/chef_fs/config.rb +++ b/lib/chef/chef_fs/config.rb @@ -159,9 +159,7 @@ class Chef end end - attr_reader :chef_config - attr_reader :cwd - attr_reader :cookbook_version + attr_reader :chef_config, :cwd, :cookbook_version def is_hosted? @chef_config[:chef_server_url] =~ %r{/+organizations/.+} diff --git a/lib/chef/chef_fs/file_system.rb b/lib/chef/chef_fs/file_system.rb index aadfc9807c..b1e5de4b73 100644 --- a/lib/chef/chef_fs/file_system.rb +++ b/lib/chef/chef_fs/file_system.rb @@ -43,8 +43,7 @@ class Chef @pattern = pattern end - attr_reader :root - attr_reader :pattern + attr_reader :root, :pattern def each(&block) list_from(root, &block) @@ -179,9 +178,7 @@ class Chef @b_root = b_root end - attr_reader :pattern - attr_reader :a_root - attr_reader :b_root + attr_reader :pattern, :a_root, :b_root def each # Make sure everything on the server is also on the filesystem, and diff diff --git a/lib/chef/chef_fs/file_system/base_fs_object.rb b/lib/chef/chef_fs/file_system/base_fs_object.rb index a0bcf3ff65..e24ae7e2e0 100644 --- a/lib/chef/chef_fs/file_system/base_fs_object.rb +++ b/lib/chef/chef_fs/file_system/base_fs_object.rb @@ -37,9 +37,7 @@ class Chef end end - attr_reader :name - attr_reader :parent - attr_reader :path + attr_reader :name, :parent, :path alias_method :display_path, :path alias_method :display_name, :name 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 diff --git a/lib/chef/chef_fs/file_system/exceptions.rb b/lib/chef/chef_fs/file_system/exceptions.rb index 8f6ce64f02..9c1c4dbfe3 100644 --- a/lib/chef/chef_fs/file_system/exceptions.rb +++ b/lib/chef/chef_fs/file_system/exceptions.rb @@ -78,8 +78,8 @@ class Chef @operation = operation end - attr_reader :operation - attr_reader :entry + attr_reader :operation, :entry + end class AlreadyExistsError < OperationFailedError; end diff --git a/lib/chef/chef_fs/file_system/repository/base_file.rb b/lib/chef/chef_fs/file_system/repository/base_file.rb index 94b52b9201..1a7e5e7d1b 100644 --- a/lib/chef/chef_fs/file_system/repository/base_file.rb +++ b/lib/chef/chef_fs/file_system/repository/base_file.rb @@ -25,11 +25,7 @@ class Chef class BaseFile - attr_reader :name - attr_reader :parent - attr_reader :path - attr_reader :file_path - attr_reader :data_handler + attr_reader :name, :parent, :path, :file_path, :data_handler alias_method :display_path, :path alias_method :display_name, :name diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb index 99deddae41..1a2e9289d2 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb @@ -30,12 +30,7 @@ class Chef # methods/if branches for each. class ChefRepositoryFileSystemCookbookEntry - attr_reader :name - attr_reader :parent - attr_reader :path - attr_reader :ruby_only - attr_reader :recursive - attr_reader :file_path + attr_reader :name, :parent, :path, :ruby_only, :recursive, :file_path alias_method :display_path, :path alias_method :display_name, :name diff --git a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb index 431b9ecb22..8cb2273790 100644 --- a/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb +++ b/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb @@ -80,9 +80,7 @@ class Chef attr_accessor :write_pretty_json - attr_reader :root_paths - attr_reader :child_paths - attr_reader :versioned_cookbooks + attr_reader :root_paths, :child_paths, :versioned_cookbooks CHILDREN = %w{org.json invitations.json members.json}.freeze diff --git a/lib/chef/chef_fs/file_system/repository/directory.rb b/lib/chef/chef_fs/file_system/repository/directory.rb index 8d227fd9d2..29d9f5c7d7 100644 --- a/lib/chef/chef_fs/file_system/repository/directory.rb +++ b/lib/chef/chef_fs/file_system/repository/directory.rb @@ -25,10 +25,7 @@ class Chef class Directory - attr_reader :name - attr_reader :parent - attr_reader :path - attr_reader :file_path + attr_reader :name, :parent, :path, :file_path alias_method :display_path, :path alias_method :display_name, :name diff --git a/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb b/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb index 84db2c2053..5146b607de 100644 --- a/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb +++ b/lib/chef/chef_fs/parallelizer/flatten_enumerable.rb @@ -9,8 +9,7 @@ class Chef @levels = levels end - attr_reader :enum - attr_reader :levels + attr_reader :enum, :levels def each(&block) enum.each do |value| diff --git a/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb b/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb index 5fafc5c88f..dee4fc3053 100644 --- a/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb +++ b/lib/chef/chef_fs/parallelizer/parallel_enumerable.rb @@ -28,10 +28,7 @@ class Chef @unconsumed_output = Queue.new end - attr_reader :parent_task_queue - attr_reader :input_enumerable - attr_reader :options - attr_reader :block + attr_reader :parent_task_queue, :input_enumerable, :options, :block def each each_with_input do |output, index, input, type| |