cheffish 1.4.0 → 1.4.1

data/lib/chef/provider/chef_environment.rb

@@ -1,83 +1,83 @@
-require 'cheffish/chef_provider_base'
-require 'chef/resource/chef_environment'
-require 'chef/chef_fs/data_handler/environment_data_handler'
-
-class Chef
-  class Provider
-    class ChefEnvironment < Cheffish::ChefProviderBase
-      provides :chef_environment
-
-      def whyrun_supported?
-        true
-      end
-
-      action :create do
-        differences = json_differences(current_json, new_json)
-
-        if current_resource_exists?
-          if differences.size > 0
-            description = [ "update environment #{new_resource.name} at #{rest.url}" ] + differences
-            converge_by description do
-              rest.put("environments/#{new_resource.name}", normalize_for_put(new_json))
-            end
-          end
-        else
-          description = [ "create environment #{new_resource.name} at #{rest.url}" ] + differences
-          converge_by description do
-            rest.post("environments", normalize_for_post(new_json))
-          end
-        end
-      end
-
-      action :delete do
-        if current_resource_exists?
-          converge_by "delete environment #{new_resource.name} at #{rest.url}" do
-            rest.delete("environments/#{new_resource.name}")
-          end
-        end
-      end
-
-      def load_current_resource
-        begin
-          @current_resource = json_to_resource(rest.get("environments/#{new_resource.name}"))
-        rescue Net::HTTPServerException => e
-          if e.response.code == "404"
-            @current_resource = not_found_resource
-          else
-            raise
-          end
-        end
-      end
-
-      def augment_new_json(json)
-        # Apply modifiers
-        json['default_attributes'] = apply_modifiers(new_resource.default_attribute_modifiers, json['default_attributes'])
-        json['override_attributes'] = apply_modifiers(new_resource.override_attribute_modifiers, json['override_attributes'])
-        json
-      end
-
-      #
-      # Helpers
-      #
-
-      def resource_class
-        Chef::Resource::ChefEnvironment
-      end
-
-      def data_handler
-        Chef::ChefFS::DataHandler::EnvironmentDataHandler.new
-      end
-
-      def keys
-        {
-          'name' => :name,
-          'description' => :description,
-          'cookbook_versions' => :cookbook_versions,
-          'default_attributes' => :default_attributes,
-          'override_attributes' => :override_attributes
-        }
-      end
-
-    end
-  end
-end
+require 'cheffish/chef_provider_base'
+require 'chef/resource/chef_environment'
+require 'chef/chef_fs/data_handler/environment_data_handler'
+
+class Chef
+  class Provider
+    class ChefEnvironment < Cheffish::ChefProviderBase
+      provides :chef_environment
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        differences = json_differences(current_json, new_json)
+
+        if current_resource_exists?
+          if differences.size > 0
+            description = [ "update environment #{new_resource.name} at #{rest.url}" ] + differences
+            converge_by description do
+              rest.put("environments/#{new_resource.name}", normalize_for_put(new_json))
+            end
+          end
+        else
+          description = [ "create environment #{new_resource.name} at #{rest.url}" ] + differences
+          converge_by description do
+            rest.post("environments", normalize_for_post(new_json))
+          end
+        end
+      end
+
+      action :delete do
+        if current_resource_exists?
+          converge_by "delete environment #{new_resource.name} at #{rest.url}" do
+            rest.delete("environments/#{new_resource.name}")
+          end
+        end
+      end
+
+      def load_current_resource
+        begin
+          @current_resource = json_to_resource(rest.get("environments/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
+          end
+        end
+      end
+
+      def augment_new_json(json)
+        # Apply modifiers
+        json['default_attributes'] = apply_modifiers(new_resource.default_attribute_modifiers, json['default_attributes'])
+        json['override_attributes'] = apply_modifiers(new_resource.override_attribute_modifiers, json['override_attributes'])
+        json
+      end
+
+      #
+      # Helpers
+      #
+
+      def resource_class
+        Chef::Resource::ChefEnvironment
+      end
+
+      def data_handler
+        Chef::ChefFS::DataHandler::EnvironmentDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'description' => :description,
+          'cookbook_versions' => :cookbook_versions,
+          'default_attributes' => :default_attributes,
+          'override_attributes' => :override_attributes
+        }
+      end
+
+    end
+  end
+end

data/lib/chef/provider/chef_group.rb

@@ -1,83 +1,83 @@
-require 'cheffish/chef_provider_base'
-require 'chef/resource/chef_group'
-require 'chef/chef_fs/data_handler/group_data_handler'
-
-class Chef
-  class Provider
-    class ChefGroup < Cheffish::ChefProviderBase
-      provides :chef_group
-
-      def whyrun_supported?
-        true
-      end
-
-      action :create do
-        differences = json_differences(current_json, new_json)
-
-        if current_resource_exists?
-          if differences.size > 0
-            description = [ "update group #{new_resource.name} at #{rest.url}" ] + differences
-            converge_by description do
-              rest.put("groups/#{new_resource.name}", normalize_for_put(new_json))
-            end
-          end
-        else
-          description = [ "create group #{new_resource.name} at #{rest.url}" ] + differences
-          converge_by description do
-            rest.post("groups", normalize_for_post(new_json))
-          end
-        end
-      end
-
-      action :delete do
-        if current_resource_exists?
-          converge_by "delete group #{new_resource.name} at #{rest.url}" do
-            rest.delete("groups/#{new_resource.name}")
-          end
-        end
-      end
-
-      def load_current_resource
-        begin
-          @current_resource = json_to_resource(rest.get("groups/#{new_resource.name}"))
-        rescue Net::HTTPServerException => e
-          if e.response.code == "404"
-            @current_resource = not_found_resource
-          else
-            raise
-          end
-        end
-      end
-
-      def augment_new_json(json)
-        # Apply modifiers
-        json['users']   |= new_resource.users
-        json['clients'] |= new_resource.clients
-        json['groups']  |= new_resource.groups
-        json['users']   -= new_resource.remove_users
-        json['clients'] -= new_resource.remove_clients
-        json['groups']  -= new_resource.remove_groups
-        json
-      end
-
-      #
-      # Helpers
-      #
-
-      def resource_class
-        Chef::Resource::ChefGroup
-      end
-
-      def data_handler
-        Chef::ChefFS::DataHandler::GroupDataHandler.new
-      end
-
-      def keys
-        {
-          'name' => :name,
-          'groupname' => :name
-        }
-      end
-    end
-  end
-end
+require 'cheffish/chef_provider_base'
+require 'chef/resource/chef_group'
+require 'chef/chef_fs/data_handler/group_data_handler'
+
+class Chef
+  class Provider
+    class ChefGroup < Cheffish::ChefProviderBase
+      provides :chef_group
+
+      def whyrun_supported?
+        true
+      end
+
+      action :create do
+        differences = json_differences(current_json, new_json)
+
+        if current_resource_exists?
+          if differences.size > 0
+            description = [ "update group #{new_resource.name} at #{rest.url}" ] + differences
+            converge_by description do
+              rest.put("groups/#{new_resource.name}", normalize_for_put(new_json))
+            end
+          end
+        else
+          description = [ "create group #{new_resource.name} at #{rest.url}" ] + differences
+          converge_by description do
+            rest.post("groups", normalize_for_post(new_json))
+          end
+        end
+      end
+
+      action :delete do
+        if current_resource_exists?
+          converge_by "delete group #{new_resource.name} at #{rest.url}" do
+            rest.delete("groups/#{new_resource.name}")
+          end
+        end
+      end
+
+      def load_current_resource
+        begin
+          @current_resource = json_to_resource(rest.get("groups/#{new_resource.name}"))
+        rescue Net::HTTPServerException => e
+          if e.response.code == "404"
+            @current_resource = not_found_resource
+          else
+            raise
+          end
+        end
+      end
+
+      def augment_new_json(json)
+        # Apply modifiers
+        json['users']   |= new_resource.users
+        json['clients'] |= new_resource.clients
+        json['groups']  |= new_resource.groups
+        json['users']   -= new_resource.remove_users
+        json['clients'] -= new_resource.remove_clients
+        json['groups']  -= new_resource.remove_groups
+        json
+      end
+
+      #
+      # Helpers
+      #
+
+      def resource_class
+        Chef::Resource::ChefGroup
+      end
+
+      def data_handler
+        Chef::ChefFS::DataHandler::GroupDataHandler.new
+      end
+
+      def keys
+        {
+          'name' => :name,
+          'groupname' => :name
+        }
+      end
+    end
+  end
+end

data/lib/chef/provider/chef_mirror.rb

@@ -1,169 +1,169 @@
-require 'chef/provider/lwrp_base'
-require 'chef/chef_fs/file_pattern'
-require 'chef/chef_fs/file_system'
-require 'chef/chef_fs/parallelizer'
-require 'chef/chef_fs/file_system/chef_server_root_dir'
-require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
-
-class Chef
-  class Provider
-    class ChefMirror < Chef::Provider::LWRPBase
-      provides :chef_mirror
-
-      def whyrun_supported?
-        true
-      end
-
-      action :upload do
-        with_modified_config do
-          copy_to(local_fs, remote_fs)
-        end
-      end
-
-      action :download do
-        with_modified_config do
-          copy_to(remote_fs, local_fs)
-        end
-      end
-
-      def with_modified_config
-        # pre-Chef-12 ChefFS reads versioned_cookbooks out of Chef::Config instead of
-        # taking it as an input, so we need to modify it for the duration of copy_to
-        @old_versioned_cookbooks = Chef::Config.versioned_cookbooks
-        # If versioned_cookbooks is explicitly set, set it.
-        if !new_resource.versioned_cookbooks.nil?
-          Chef::Config.versioned_cookbooks = new_resource.versioned_cookbooks
-
-        # If new_resource.chef_repo_path is set, versioned_cookbooks defaults to true.
-        # Otherwise, it stays at its current Chef::Config value.
-        elsif new_resource.chef_repo_path
-          Chef::Config.versioned_cookbooks = true
-        end
-
-        begin
-          yield
-        ensure
-          Chef::Config.versioned_cookbooks = @old_versioned_cookbooks
-        end
-      end
-
-      def copy_to(src_root, dest_root)
-        if new_resource.concurrency && new_resource.concurrency <= 0
-          raise "chef_mirror.concurrency must be above 0!  Was set to #{new_resource.concurrency}"
-        end
-        # Honor concurrency
-        Chef::ChefFS::Parallelizer.threads = (new_resource.concurrency || 10) - 1
-
-        # We don't let the user pass absolute paths; we want to reserve those for
-        # multi-org support (/organizations/foo).
-        if new_resource.path[0] == '/'
-          raise "Absolute paths in chef_mirror not yet supported."
-        end
-        # Copy!
-        path = Chef::ChefFS::FilePattern.new("/#{new_resource.path}")
-        ui = CopyListener.new(self)
-        error = Chef::ChefFS::FileSystem.copy_to(path, src_root, dest_root, nil, options, ui, proc { |p| p.path })
-
-        if error
-          raise "Errors while copying:#{ui.errors.map { |e| "#{e}\n" }.join('')}"
-        end
-      end
-
-      def local_fs
-        # If chef_repo_path is set to a string, put it in the form it usually is in
-        # chef config (:chef_repo_path, :node_path, etc.)
-        path_config = new_resource.chef_repo_path
-        if path_config.is_a?(Hash)
-          chef_repo_path = path_config.delete(:chef_repo_path)
-        elsif path_config
-          chef_repo_path = path_config
-          path_config = {}
-        else
-          chef_repo_path = Chef::Config.chef_repo_path
-          path_config = Chef::Config
-        end
-        chef_repo_path = Array(chef_repo_path).flatten
-
-        # Go through the expected object paths and figure out the local paths for each.
-        case repo_mode
-        when 'hosted_everything'
-          object_names = %w(acls clients cookbooks containers data_bags environments groups nodes roles)
-        else
-          object_names = %w(clients cookbooks data_bags environments nodes roles users)
-        end
-
-        object_paths = {}
-        object_names.each do |object_name|
-          variable_name = "#{object_name[0..-2]}_path" # cookbooks -> cookbook_path
-          if path_config[variable_name.to_sym]
-            paths = Array(path_config[variable_name.to_sym]).flatten
-          else
-            paths = chef_repo_path.map { |path| ::File.join(path, object_name) }
-          end
-          object_paths[object_name] = paths.map { |path| ::File.expand_path(path) }
-        end
-
-        # Set up the root dir
-        Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(object_paths)
-      end
-
-      def remote_fs
-        config = {
-          :chef_server_url => new_resource.chef_server[:chef_server_url],
-          :node_name => new_resource.chef_server[:options][:client_name],
-          :client_key => new_resource.chef_server[:options][:signing_key_filename],
-          :repo_mode => repo_mode,
-          :versioned_cookbooks => Chef::Config.versioned_cookbooks
-        }
-        Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", config)
-      end
-
-      def repo_mode
-        new_resource.chef_server[:chef_server_url] =~ /\/organizations\// ? 'hosted_everything' : 'everything'
-      end
-
-      def options
-        result = {
-          :purge => new_resource.purge,
-          :freeze => new_resource.freeze,
-          :diff => new_resource.no_diff,
-          :dry_run => whyrun_mode?
-        }
-        result[:diff] = !result[:diff]
-        result[:repo_mode] = repo_mode
-        result[:concurrency] = new_resource.concurrency if new_resource.concurrency
-        result
-      end
-
-      def load_current_resource
-      end
-
-      class CopyListener
-        def initialize(mirror)
-          @mirror = mirror
-          @errors = []
-        end
-
-        attr_reader :mirror
-        attr_reader :errors
-
-        # TODO output is not *always* indicative of a change.  We may want to give
-        # ChefFS the ability to tell us that info.  For now though, assuming any output
-        # means change is pretty damn close to the truth.
-        def output(str)
-          mirror.converge_by str do
-          end
-        end
-        def warn(str)
-          mirror.converge_by "WARNING: #{str}" do
-          end
-        end
-        def error(str)
-          mirror.converge_by "ERROR: #{str}" do
-          end
-          @errors << str
-        end
-      end
-    end
-  end
-end
+require 'chef/provider/lwrp_base'
+require 'chef/chef_fs/file_pattern'
+require 'chef/chef_fs/file_system'
+require 'chef/chef_fs/parallelizer'
+require 'chef/chef_fs/file_system/chef_server_root_dir'
+require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
+
+class Chef
+  class Provider
+    class ChefMirror < Chef::Provider::LWRPBase
+      provides :chef_mirror
+
+      def whyrun_supported?
+        true
+      end
+
+      action :upload do
+        with_modified_config do
+          copy_to(local_fs, remote_fs)
+        end
+      end
+
+      action :download do
+        with_modified_config do
+          copy_to(remote_fs, local_fs)
+        end
+      end
+
+      def with_modified_config
+        # pre-Chef-12 ChefFS reads versioned_cookbooks out of Chef::Config instead of
+        # taking it as an input, so we need to modify it for the duration of copy_to
+        @old_versioned_cookbooks = Chef::Config.versioned_cookbooks
+        # If versioned_cookbooks is explicitly set, set it.
+        if !new_resource.versioned_cookbooks.nil?
+          Chef::Config.versioned_cookbooks = new_resource.versioned_cookbooks
+
+        # If new_resource.chef_repo_path is set, versioned_cookbooks defaults to true.
+        # Otherwise, it stays at its current Chef::Config value.
+        elsif new_resource.chef_repo_path
+          Chef::Config.versioned_cookbooks = true
+        end
+
+        begin
+          yield
+        ensure
+          Chef::Config.versioned_cookbooks = @old_versioned_cookbooks
+        end
+      end
+
+      def copy_to(src_root, dest_root)
+        if new_resource.concurrency && new_resource.concurrency <= 0
+          raise "chef_mirror.concurrency must be above 0!  Was set to #{new_resource.concurrency}"
+        end
+        # Honor concurrency
+        Chef::ChefFS::Parallelizer.threads = (new_resource.concurrency || 10) - 1
+
+        # We don't let the user pass absolute paths; we want to reserve those for
+        # multi-org support (/organizations/foo).
+        if new_resource.path[0] == '/'
+          raise "Absolute paths in chef_mirror not yet supported."
+        end
+        # Copy!
+        path = Chef::ChefFS::FilePattern.new("/#{new_resource.path}")
+        ui = CopyListener.new(self)
+        error = Chef::ChefFS::FileSystem.copy_to(path, src_root, dest_root, nil, options, ui, proc { |p| p.path })
+
+        if error
+          raise "Errors while copying:#{ui.errors.map { |e| "#{e}\n" }.join('')}"
+        end
+      end
+
+      def local_fs
+        # If chef_repo_path is set to a string, put it in the form it usually is in
+        # chef config (:chef_repo_path, :node_path, etc.)
+        path_config = new_resource.chef_repo_path
+        if path_config.is_a?(Hash)
+          chef_repo_path = path_config.delete(:chef_repo_path)
+        elsif path_config
+          chef_repo_path = path_config
+          path_config = {}
+        else
+          chef_repo_path = Chef::Config.chef_repo_path
+          path_config = Chef::Config
+        end
+        chef_repo_path = Array(chef_repo_path).flatten
+
+        # Go through the expected object paths and figure out the local paths for each.
+        case repo_mode
+        when 'hosted_everything'
+          object_names = %w(acls clients cookbooks containers data_bags environments groups nodes roles)
+        else
+          object_names = %w(clients cookbooks data_bags environments nodes roles users)
+        end
+
+        object_paths = {}
+        object_names.each do |object_name|
+          variable_name = "#{object_name[0..-2]}_path" # cookbooks -> cookbook_path
+          if path_config[variable_name.to_sym]
+            paths = Array(path_config[variable_name.to_sym]).flatten
+          else
+            paths = chef_repo_path.map { |path| ::File.join(path, object_name) }
+          end
+          object_paths[object_name] = paths.map { |path| ::File.expand_path(path) }
+        end
+
+        # Set up the root dir
+        Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(object_paths)
+      end
+
+      def remote_fs
+        config = {
+          :chef_server_url => new_resource.chef_server[:chef_server_url],
+          :node_name => new_resource.chef_server[:options][:client_name],
+          :client_key => new_resource.chef_server[:options][:signing_key_filename],
+          :repo_mode => repo_mode,
+          :versioned_cookbooks => Chef::Config.versioned_cookbooks
+        }
+        Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", config)
+      end
+
+      def repo_mode
+        new_resource.chef_server[:chef_server_url] =~ /\/organizations\// ? 'hosted_everything' : 'everything'
+      end
+
+      def options
+        result = {
+          :purge => new_resource.purge,
+          :freeze => new_resource.freeze,
+          :diff => new_resource.no_diff,
+          :dry_run => whyrun_mode?
+        }
+        result[:diff] = !result[:diff]
+        result[:repo_mode] = repo_mode
+        result[:concurrency] = new_resource.concurrency if new_resource.concurrency
+        result
+      end
+
+      def load_current_resource
+      end
+
+      class CopyListener
+        def initialize(mirror)
+          @mirror = mirror
+          @errors = []
+        end
+
+        attr_reader :mirror
+        attr_reader :errors
+
+        # TODO output is not *always* indicative of a change.  We may want to give
+        # ChefFS the ability to tell us that info.  For now though, assuming any output
+        # means change is pretty damn close to the truth.
+        def output(str)
+          mirror.converge_by str do
+          end
+        end
+        def warn(str)
+          mirror.converge_by "WARNING: #{str}" do
+          end
+        end
+        def error(str)
+          mirror.converge_by "ERROR: #{str}" do
+          end
+          @errors << str
+        end
+      end
+    end
+  end
+end