cheffish 1.4.1 → 1.4.2

data/lib/chef/resource/chef_environment.rb

@@ -1,77 +1,77 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-require 'chef/environment'
-
-class Chef
-  class Resource
-    class ChefEnvironment < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_environment'
-
-      actions :create, :delete, :nothing
-      default_action :create
-
-      def initialize(*args)
-        super
-        chef_server run_context.cheffish.current_chef_server
-      end
-
-      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
-      attribute :description, :kind_of => String
-      attribute :cookbook_versions, :kind_of => Hash, :callbacks => {
-        "should have valid cookbook versions" => lambda { |value| Chef::Environment.validate_cookbook_versions(value) }
-      }
-      attribute :default_attributes, :kind_of => Hash
-      attribute :override_attributes, :kind_of => Hash
-
-      # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
-      # reset to their defaults)
-      attribute :complete, :kind_of => [TrueClass, FalseClass]
-
-      attribute :raw_json, :kind_of => Hash
-      attribute :chef_server, :kind_of => Hash
-
-      # `NOT_PASSED` is defined in chef-12.5.0, this guard will ensure we
-      # don't redefine it if it's already there
-      NOT_PASSED=Object.new unless defined?(NOT_PASSED)
-
-      # default 'ip_address', '127.0.0.1'
-      # default [ 'pushy', 'port' ], '9000'
-      # default 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # default 'ip_address', :delete
-      attr_reader :default_attribute_modifiers
-      def default(attribute_path, value=NOT_PASSED, &block)
-        @default_attribute_modifiers ||= []
-        if value != NOT_PASSED
-          @default_attribute_modifiers << [ attribute_path, value ]
-        elsif block
-          @default_attribute_modifiers << [ attribute_path, block ]
-        else
-          raise "default requires either a value or a block"
-        end
-      end
-
-      # override 'ip_address', '127.0.0.1'
-      # override [ 'pushy', 'port' ], '9000'
-      # override 'ip_addresses' do |existing_value|
-      #   (existing_value || []) + [ '127.0.0.1' ]
-      # end
-      # override 'ip_address', :delete
-      attr_reader :override_attribute_modifiers
-      def override(attribute_path, value=NOT_PASSED, &block)
-        @override_attribute_modifiers ||= []
-        if value != NOT_PASSED
-          @override_attribute_modifiers << [ attribute_path, value ]
-        elsif block
-          @override_attribute_modifiers << [ attribute_path, block ]
-        else
-          raise "override requires either a value or a block"
-        end
-      end
-
-      alias :attributes :default_attributes
-      alias :attribute :default
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+require 'chef/environment'
+
+class Chef
+  class Resource
+    class ChefEnvironment < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_environment'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      def initialize(*args)
+        super
+        chef_server run_context.cheffish.current_chef_server
+      end
+
+      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
+      attribute :description, :kind_of => String
+      attribute :cookbook_versions, :kind_of => Hash, :callbacks => {
+        "should have valid cookbook versions" => lambda { |value| Chef::Environment.validate_cookbook_versions(value) }
+      }
+      attribute :default_attributes, :kind_of => Hash
+      attribute :override_attributes, :kind_of => Hash
+
+      # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
+      # reset to their defaults)
+      attribute :complete, :kind_of => [TrueClass, FalseClass]
+
+      attribute :raw_json, :kind_of => Hash
+      attribute :chef_server, :kind_of => Hash
+
+      # `NOT_PASSED` is defined in chef-12.5.0, this guard will ensure we
+      # don't redefine it if it's already there
+      NOT_PASSED=Object.new unless defined?(NOT_PASSED)
+
+      # default 'ip_address', '127.0.0.1'
+      # default [ 'pushy', 'port' ], '9000'
+      # default 'ip_addresses' do |existing_value|
+      #   (existing_value || []) + [ '127.0.0.1' ]
+      # end
+      # default 'ip_address', :delete
+      attr_reader :default_attribute_modifiers
+      def default(attribute_path, value=NOT_PASSED, &block)
+        @default_attribute_modifiers ||= []
+        if value != NOT_PASSED
+          @default_attribute_modifiers << [ attribute_path, value ]
+        elsif block
+          @default_attribute_modifiers << [ attribute_path, block ]
+        else
+          raise "default requires either a value or a block"
+        end
+      end
+
+      # override 'ip_address', '127.0.0.1'
+      # override [ 'pushy', 'port' ], '9000'
+      # override 'ip_addresses' do |existing_value|
+      #   (existing_value || []) + [ '127.0.0.1' ]
+      # end
+      # override 'ip_address', :delete
+      attr_reader :override_attribute_modifiers
+      def override(attribute_path, value=NOT_PASSED, &block)
+        @override_attribute_modifiers ||= []
+        if value != NOT_PASSED
+          @override_attribute_modifiers << [ attribute_path, value ]
+        elsif block
+          @override_attribute_modifiers << [ attribute_path, block ]
+        else
+          raise "override requires either a value or a block"
+        end
+      end
+
+      alias :attributes :default_attributes
+      alias :attribute :default
+    end
+  end
+end

data/lib/chef/resource/chef_group.rb

@@ -1,53 +1,53 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-require 'chef/run_list/run_list_item'
-
-class Chef
-  class Resource
-    class ChefGroup < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_group'
-
-      actions :create, :delete, :nothing
-      default_action :create
-
-      # Grab environment from with_environment
-      def initialize(*args)
-        super
-        chef_server run_context.cheffish.current_chef_server
-        @users = []
-        @clients = []
-        @groups = []
-        @remove_users = []
-        @remove_clients = []
-        @remove_groups = []
-      end
-
-      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
-      def users(*users)
-        users.size == 0 ? @users : (@users |= users.flatten)
-      end
-      def clients(*clients)
-        clients.size == 0 ? @clients : (@clients |= clients.flatten)
-      end
-      def groups(*groups)
-        groups.size == 0 ? @groups : (@groups |= groups.flatten)
-      end
-      def remove_users(*remove_users)
-        remove_users.size == 0 ? @remove_users : (@remove_users |= remove_users.flatten)
-      end
-      def remove_clients(*remove_clients)
-        remove_clients.size == 0 ? @remove_clients : (@remove_clients |= remove_clients.flatten)
-      end
-      def remove_groups(*remove_groups)
-        remove_groups.size == 0 ? @remove_groups : (@remove_groups |= remove_groups.flatten)
-      end
-
-      # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
-      # reset to their defaults)
-      attribute :complete, :kind_of => [TrueClass, FalseClass]
-
-      attribute :raw_json, :kind_of => Hash
-      attribute :chef_server, :kind_of => Hash
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+require 'chef/run_list/run_list_item'
+
+class Chef
+  class Resource
+    class ChefGroup < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_group'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      # Grab environment from with_environment
+      def initialize(*args)
+        super
+        chef_server run_context.cheffish.current_chef_server
+        @users = []
+        @clients = []
+        @groups = []
+        @remove_users = []
+        @remove_clients = []
+        @remove_groups = []
+      end
+
+      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
+      def users(*users)
+        users.size == 0 ? @users : (@users |= users.flatten)
+      end
+      def clients(*clients)
+        clients.size == 0 ? @clients : (@clients |= clients.flatten)
+      end
+      def groups(*groups)
+        groups.size == 0 ? @groups : (@groups |= groups.flatten)
+      end
+      def remove_users(*remove_users)
+        remove_users.size == 0 ? @remove_users : (@remove_users |= remove_users.flatten)
+      end
+      def remove_clients(*remove_clients)
+        remove_clients.size == 0 ? @remove_clients : (@remove_clients |= remove_clients.flatten)
+      end
+      def remove_groups(*remove_groups)
+        remove_groups.size == 0 ? @remove_groups : (@remove_groups |= remove_groups.flatten)
+      end
+
+      # Specifies that this is a complete specification for the environment (i.e. attributes you don't specify will be
+      # reset to their defaults)
+      attribute :complete, :kind_of => [TrueClass, FalseClass]
+
+      attribute :raw_json, :kind_of => Hash
+      attribute :chef_server, :kind_of => Hash
+    end
+  end
+end

data/lib/chef/resource/chef_mirror.rb

@@ -1,52 +1,52 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class ChefMirror < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_mirror'
-
-      actions :upload, :download, :nothing
-      default_action :nothing
-
-      def initialize(*args)
-        super
-        chef_server run_context.cheffish.current_chef_server
-      end
-
-      # Path of the data to mirror, e.g. nodes, nodes/*, nodes/mynode,
-      # */*, **, roles/base, data/secrets, cookbooks/apache2, etc.
-      attribute :path, :kind_of => String, :name_attribute => true
-
-      # Local path.  Can be a string (top level of repository) or hash
-      # (:chef_repo_path, :node_path, etc.)
-      # If neither chef_repo_path nor versioned_cookbooks are set, they default to their
-      # Chef::Config values.  If chef_repo_path is set but versioned_cookbooks is not,
-      # versioned_cookbooks defaults to true.
-      attribute :chef_repo_path, :kind_of => [ String, Hash ]
-
-      # Whether the repo path should contain cookbooks with versioned names,
-      # i.e. cookbooks/mysql-1.0.0, cookbooks/mysql-1.2.0, etc.
-      # Defaults to true if chef_repo_path is specified, or to Chef::Config.versioned_cookbooks otherwise.
-      attribute :versioned_cookbooks, :kind_of => [ TrueClass, FalseClass ]
-
-      # Chef server
-      attribute :chef_server, :kind_of => Hash
-
-      # Whether to purge deleted things: if we do not have cookbooks/x locally and we
-      # *do* have cookbooks/x remotely, then :upload with purge will delete it.
-      # Defaults to false.
-      attribute :purge, :kind_of => [ TrueClass, FalseClass ]
-
-      # Whether to freeze cookbooks on upload
-      attribute :freeze, :kind_of => [ TrueClass, FalseClass ]
-
-      # If this is true, only new files will be copied.  File contents will not be
-      # diffed, so changed files will never be uploaded.
-      attribute :no_diff, :kind_of => [ TrueClass, FalseClass ]
-
-      # Number of parallel threads to list/upload/download with.  Defaults to 10.
-      attribute :concurrency, :kind_of => Integer
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class ChefMirror < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_mirror'
+
+      actions :upload, :download, :nothing
+      default_action :nothing
+
+      def initialize(*args)
+        super
+        chef_server run_context.cheffish.current_chef_server
+      end
+
+      # Path of the data to mirror, e.g. nodes, nodes/*, nodes/mynode,
+      # */*, **, roles/base, data/secrets, cookbooks/apache2, etc.
+      attribute :path, :kind_of => String, :name_attribute => true
+
+      # Local path.  Can be a string (top level of repository) or hash
+      # (:chef_repo_path, :node_path, etc.)
+      # If neither chef_repo_path nor versioned_cookbooks are set, they default to their
+      # Chef::Config values.  If chef_repo_path is set but versioned_cookbooks is not,
+      # versioned_cookbooks defaults to true.
+      attribute :chef_repo_path, :kind_of => [ String, Hash ]
+
+      # Whether the repo path should contain cookbooks with versioned names,
+      # i.e. cookbooks/mysql-1.0.0, cookbooks/mysql-1.2.0, etc.
+      # Defaults to true if chef_repo_path is specified, or to Chef::Config.versioned_cookbooks otherwise.
+      attribute :versioned_cookbooks, :kind_of => [ TrueClass, FalseClass ]
+
+      # Chef server
+      attribute :chef_server, :kind_of => Hash
+
+      # Whether to purge deleted things: if we do not have cookbooks/x locally and we
+      # *do* have cookbooks/x remotely, then :upload with purge will delete it.
+      # Defaults to false.
+      attribute :purge, :kind_of => [ TrueClass, FalseClass ]
+
+      # Whether to freeze cookbooks on upload
+      attribute :freeze, :kind_of => [ TrueClass, FalseClass ]
+
+      # If this is true, only new files will be copied.  File contents will not be
+      # diffed, so changed files will never be uploaded.
+      attribute :no_diff, :kind_of => [ TrueClass, FalseClass ]
+
+      # Number of parallel threads to list/upload/download with.  Defaults to 10.
+      attribute :concurrency, :kind_of => Integer
+    end
+  end
+end

data/lib/chef/resource/chef_node.rb

@@ -1,22 +1,22 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class ChefNode < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_node'
-
-      actions :create, :delete, :nothing
-      default_action :create
-
-      # Grab environment from with_environment
-      def initialize(*args)
-        super
-        chef_environment run_context.cheffish.current_environment
-        chef_server run_context.cheffish.current_chef_server
-      end
-
-      Cheffish.node_attributes(self)
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class ChefNode < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_node'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      # Grab environment from with_environment
+      def initialize(*args)
+        super
+        chef_environment run_context.cheffish.current_environment
+        chef_server run_context.cheffish.current_chef_server
+      end
+
+      Cheffish.node_attributes(self)
+    end
+  end
+end

data/lib/chef/resource/chef_organization.rb

@@ -1,69 +1,69 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-require 'chef/run_list/run_list_item'
-
-class Chef
-  class Resource
-    class ChefOrganization < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_organization'
-
-      actions :create, :delete, :nothing
-      default_action :create
-
-      # Grab environment from with_environment
-      def initialize(*args)
-        super
-        chef_server run_context.cheffish.current_chef_server
-        @invites = nil
-        @members = nil
-        @remove_members = []
-      end
-
-      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
-      attribute :full_name, :kind_of => String
-
-      # A list of users who must at least be invited to the org (but may already be
-      # members).  Invites will be sent to users who are not already invited/in the org.
-      def invites(*users)
-        if users.size == 0
-          @invites || []
-        else
-          @invites ||= []
-          @invites |= users.flatten
-        end
-      end
-
-      def invites_specified?
-        !!@invites
-      end
-
-      # A list of users who must be members of the org.  This will use the
-      # new Chef 12 POST /organizations/ORG/users endpoint to add them
-      # directly to the org.  If you do not have permission to perform
-      # this operation, and the users are not a part of the org, the
-      # resource update will fail.
-      def members(*users)
-        if users.size == 0
-          @members || []
-        else
-          @members ||= []
-          @members |= users.flatten
-        end
-      end
-
-      def members_specified?
-        !!@members
-      end
-
-      # A list of users who must not be members of the org.  These users will be removed
-      # from the org and invites will be revoked (if any).
-      def remove_members(*users)
-        users.size == 0 ? @remove_members : (@remove_members |= users.flatten)
-      end
-
-      attribute :complete, :kind_of => [ TrueClass, FalseClass ]
-      attribute :raw_json, :kind_of => Hash
-      attribute :chef_server, :kind_of => Hash
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+require 'chef/run_list/run_list_item'
+
+class Chef
+  class Resource
+    class ChefOrganization < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_organization'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      # Grab environment from with_environment
+      def initialize(*args)
+        super
+        chef_server run_context.cheffish.current_chef_server
+        @invites = nil
+        @members = nil
+        @remove_members = []
+      end
+
+      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
+      attribute :full_name, :kind_of => String
+
+      # A list of users who must at least be invited to the org (but may already be
+      # members).  Invites will be sent to users who are not already invited/in the org.
+      def invites(*users)
+        if users.size == 0
+          @invites || []
+        else
+          @invites ||= []
+          @invites |= users.flatten
+        end
+      end
+
+      def invites_specified?
+        !!@invites
+      end
+
+      # A list of users who must be members of the org.  This will use the
+      # new Chef 12 POST /organizations/ORG/users endpoint to add them
+      # directly to the org.  If you do not have permission to perform
+      # this operation, and the users are not a part of the org, the
+      # resource update will fail.
+      def members(*users)
+        if users.size == 0
+          @members || []
+        else
+          @members ||= []
+          @members |= users.flatten
+        end
+      end
+
+      def members_specified?
+        !!@members
+      end
+
+      # A list of users who must not be members of the org.  These users will be removed
+      # from the org and invites will be revoked (if any).
+      def remove_members(*users)
+        users.size == 0 ? @remove_members : (@remove_members |= users.flatten)
+      end
+
+      attribute :complete, :kind_of => [ TrueClass, FalseClass ]
+      attribute :raw_json, :kind_of => Hash
+      attribute :chef_server, :kind_of => Hash
+    end
+  end
+end

data/lib/chef/resource/chef_resolved_cookbooks.rb

@@ -1,35 +1,35 @@
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class ChefResolvedCookbooks < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_resolved_cookbooks'
-
-      actions :resolve, :nothing
-      default_action :resolve
-
-      def initialize(*args)
-        super
-        require 'berkshelf'
-        berksfile Berkshelf::Berksfile.new('/tmp/Berksfile')
-        chef_server run_context.cheffish.current_chef_server
-        @cookbooks_from = []
-      end
-
-      extend Forwardable
-
-      def_delegators :@berksfile, :cookbook, :extension, :group, :metadata, :source
-
-      def cookbooks_from(path = nil)
-        if path
-          @cookbooks_from << path
-        else
-          @cookbooks_from
-        end
-      end
-
-      attribute :berksfile
-      attribute :chef_server
-    end
-  end
-end
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class ChefResolvedCookbooks < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_resolved_cookbooks'
+
+      actions :resolve, :nothing
+      default_action :resolve
+
+      def initialize(*args)
+        super
+        require 'berkshelf'
+        berksfile Berkshelf::Berksfile.new('/tmp/Berksfile')
+        chef_server run_context.cheffish.current_chef_server
+        @cookbooks_from = []
+      end
+
+      extend Forwardable
+
+      def_delegators :@berksfile, :cookbook, :extension, :group, :metadata, :source
+
+      def cookbooks_from(path = nil)
+        if path
+          @cookbooks_from << path
+        else
+          @cookbooks_from
+        end
+      end
+
+      attribute :berksfile
+      attribute :chef_server
+    end
+  end
+end