chef 12.7.2-universal-mingw32 → 12.8.1-universal-mingw32

data/lib/chef/chef_fs/file_system/chef_server/data_bag_dir.rb

@@ -1,71 +1,71 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/chef_fs/file_system/chef_server/rest_list_dir"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/must_delete_recursively_error"
-require "chef/chef_fs/data_handler/data_bag_item_data_handler"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      module ChefServer
-        class DataBagDir < RestListDir
-          def initialize(name, parent, exists = nil)
-            super(name, parent, nil, Chef::ChefFS::DataHandler::DataBagItemDataHandler.new)
-            @exists = nil
-          end
-
-          def dir?
-            exists?
-          end
-
-          def read
-            # This will only be called if dir? is false, which means exists? is false.
-            raise Chef::ChefFS::FileSystem::NotFoundError.new(self)
-          end
-
-          def exists?
-            if @exists.nil?
-              @exists = parent.children.any? { |child| child.name == name }
-            end
-            @exists
-          end
-
-          def delete(recurse)
-            if !recurse
-              raise NotFoundError.new(self) if !exists?
-              raise MustDeleteRecursivelyError.new(self, "#{path_for_printing} must be deleted recursively")
-            end
-            begin
-              rest.delete(api_path)
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "Timeout deleting: #{e}")
-            rescue Net::HTTPServerException => e
-              if e.response.code == "404"
-                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "HTTP error deleting: #{e}")
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/file_system/chef_server/rest_list_dir"
+require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/must_delete_recursively_error"
+require "chef/chef_fs/data_handler/data_bag_item_data_handler"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module ChefServer
+        class DataBagDir < RestListDir
+          def initialize(name, parent, exists = nil)
+            super(name, parent, nil, Chef::ChefFS::DataHandler::DataBagItemDataHandler.new)
+            @exists = nil
+          end
+
+          def dir?
+            exists?
+          end
+
+          def read
+            # This will only be called if dir? is false, which means exists? is false.
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self)
+          end
+
+          def exists?
+            if @exists.nil?
+              @exists = parent.children.any? { |child| child.name == name }
+            end
+            @exists
+          end
+
+          def delete(recurse)
+            if !recurse
+              raise NotFoundError.new(self) if !exists?
+              raise MustDeleteRecursivelyError.new(self, "#{path_for_printing} must be deleted recursively")
+            end
+            begin
+              rest.delete(api_path)
+            rescue Timeout::Error => e
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "Timeout deleting: #{e}")
+            rescue Net::HTTPServerException => e
+              if e.response.code == "404"
+                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
+              else
+                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:delete, self, e, "HTTP error deleting: #{e}")
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/chef_server/data_bags_dir.rb

@@ -1,69 +1,69 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/chef_fs/file_system/chef_server/rest_list_dir"
-require "chef/chef_fs/file_system/chef_server/data_bag_dir"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      module ChefServer
-        class DataBagsDir < RestListDir
-          def make_child_entry(name, exists = false)
-            result = @children.select { |child| child.name == name }.first if @children
-            result || DataBagDir.new(name, self, exists)
-          end
-
-          def children
-            begin
-              @children ||= root.get_json(api_path).keys.sort.map { |entry| make_child_entry(entry, true) }
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout getting children: #{e}")
-            rescue Net::HTTPServerException => e
-              if e.response.code == "404"
-                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error getting children: #{e}")
-              end
-            end
-          end
-
-          def can_have_child?(name, is_dir)
-            is_dir
-          end
-
-          def create_child(name, file_contents)
-            begin
-              rest.post(api_path, { "name" => name })
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating child '#{name}': #{e}")
-            rescue Net::HTTPServerException => e
-              if e.response.code == "409"
-                raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e, "Cannot create #{name} under #{path}: already exists")
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "HTTP error creating child '#{name}': #{e}")
-              end
-            end
-            @children = nil
-            DataBagDir.new(name, self, true)
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/file_system/chef_server/rest_list_dir"
+require "chef/chef_fs/file_system/chef_server/data_bag_dir"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module ChefServer
+        class DataBagsDir < RestListDir
+          def make_child_entry(name, exists = false)
+            result = @children.find { |child| child.name == name } if @children
+            result || DataBagDir.new(name, self, exists)
+          end
+
+          def children
+            begin
+              @children ||= root.get_json(api_path).keys.sort.map { |entry| make_child_entry(entry, true) }
+            rescue Timeout::Error => e
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout getting children: #{e}")
+            rescue Net::HTTPServerException => e
+              if e.response.code == "404"
+                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
+              else
+                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error getting children: #{e}")
+              end
+            end
+          end
+
+          def can_have_child?(name, is_dir)
+            is_dir
+          end
+
+          def create_child(name, file_contents)
+            begin
+              rest.post(api_path, { "name" => name })
+            rescue Timeout::Error => e
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "Timeout creating child '#{name}': #{e}")
+            rescue Net::HTTPServerException => e
+              if e.response.code == "409"
+                raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e, "Cannot create #{name} under #{path}: already exists")
+              else
+                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e, "HTTP error creating child '#{name}': #{e}")
+              end
+            end
+            @children = nil
+            DataBagDir.new(name, self, true)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/chef_server/environments_dir.rb

@@ -1,57 +1,57 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/chef_fs/file_system/base_fs_dir"
-require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/file_system/default_environment_cannot_be_modified_error"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      module ChefServer
-        class EnvironmentsDir < RestListDir
-          def make_child_entry(name, exists = nil)
-            if name == "_default.json"
-              DefaultEnvironmentEntry.new(name, self, exists)
-            else
-              super
-            end
-          end
-
-          class DefaultEnvironmentEntry < RestListEntry
-            def initialize(name, parent, exists = nil)
-              super(name, parent)
-              @exists = exists
-            end
-
-            def delete(recurse)
-              raise NotFoundError.new(self) if !exists?
-              raise DefaultEnvironmentCannotBeModifiedError.new(:delete, self)
-            end
-
-            def write(file_contents)
-              raise NotFoundError.new(self) if !exists?
-              raise DefaultEnvironmentCannotBeModifiedError.new(:write, self)
-            end
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/file_system/base_fs_dir"
+require "chef/chef_fs/file_system/chef_server/rest_list_entry"
+require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/file_system/default_environment_cannot_be_modified_error"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module ChefServer
+        class EnvironmentsDir < RestListDir
+          def make_child_entry(name, exists = nil)
+            if name == "_default.json"
+              DefaultEnvironmentEntry.new(name, self, exists)
+            else
+              super
+            end
+          end
+
+          class DefaultEnvironmentEntry < RestListEntry
+            def initialize(name, parent, exists = nil)
+              super(name, parent)
+              @exists = exists
+            end
+
+            def delete(recurse)
+              raise NotFoundError.new(self) if !exists?
+              raise DefaultEnvironmentCannotBeModifiedError.new(:delete, self)
+            end
+
+            def write(file_contents)
+              raise NotFoundError.new(self) if !exists?
+              raise DefaultEnvironmentCannotBeModifiedError.new(:write, self)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/chef_server/nodes_dir.rb

@@ -1,53 +1,53 @@
-#
-# Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "chef/chef_fs/file_system/base_fs_dir"
-require "chef/chef_fs/file_system/chef_server/rest_list_entry"
-require "chef/chef_fs/file_system/not_found_error"
-require "chef/chef_fs/data_handler/node_data_handler"
-
-class Chef
-  module ChefFS
-    module FileSystem
-      module ChefServer
-        class NodesDir < RestListDir
-          # Identical to RestListDir.children, except supports environments
-          def children
-            begin
-              @children ||= root.get_json(env_api_path).keys.sort.map do |key|
-                make_child_entry("#{key}.json", true)
-              end
-            rescue Timeout::Error => e
-              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
-            rescue Net::HTTPServerException => e
-              if $!.response.code == "404"
-                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-              else
-                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
-              end
-            end
-          end
-
-          def env_api_path
-            environment ? "environments/#{environment}/#{api_path}" : api_path
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "chef/chef_fs/file_system/base_fs_dir"
+require "chef/chef_fs/file_system/chef_server/rest_list_entry"
+require "chef/chef_fs/file_system/not_found_error"
+require "chef/chef_fs/data_handler/node_data_handler"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module ChefServer
+        class NodesDir < RestListDir
+          # Identical to RestListDir.children, except supports environments
+          def children
+            begin
+              @children ||= root.get_json(env_api_path).keys.sort.map do |key|
+                make_child_entry("#{key}.json", true)
+              end
+            rescue Timeout::Error => e
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "Timeout retrieving children: #{e}")
+            rescue Net::HTTPServerException => e
+              if $!.response.code == "404"
+                raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
+              else
+                raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e, "HTTP error retrieving children: #{e}")
+              end
+            end
+          end
+
+          def env_api_path
+            environment ? "environments/#{environment}/#{api_path}" : api_path
+          end
+        end
+      end
+    end
+  end
+end