cheffish 1.3.1 → 1.4.0

data/lib/chef/resource/chef_mirror.rb

@@ -1,48 +1,52 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-
-class Chef::Resource::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
+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,18 +1,22 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-
-class Chef::Resource::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
+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,64 +1,69 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-require 'chef/run_list/run_list_item'
-
-class Chef::Resource::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/NAME 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
+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,31 +1,35 @@
-require 'chef/resource/lwrp_base'
-
-class Chef::Resource::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
+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

data/lib/chef/resource/chef_role.rb

@@ -1,104 +1,110 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-require 'chef/run_list/run_list_item'
-
-class Chef::Resource::ChefRole < Chef::Resource::LWRPBase
-  self.resource_name = 'chef_role'
-
-  actions :create, :delete, :nothing
-  default_action :create
-
-  # Grab environment from with_environment
-  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 :run_list, :kind_of => Array # We should let them specify it as a series of parameters too
-  attribute :env_run_lists, :kind_of => Hash
-  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=Object.new
-
-  # default_attribute 'ip_address', '127.0.0.1'
-  # default_attribute [ 'pushy', 'port' ], '9000'
-  # default_attribute 'ip_addresses' do |existing_value|
-  #   (existing_value || []) + [ '127.0.0.1' ]
-  # end
-  # default_attribute 'ip_address', :delete
-  attr_reader :default_attribute_modifiers
-  def default_attribute(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_attribute requires either a value or a block"
-    end
-  end
-
-  # override_attribute 'ip_address', '127.0.0.1'
-  # override_attribute [ 'pushy', 'port' ], '9000'
-  # override_attribute 'ip_addresses' do |existing_value|
-  #   (existing_value || []) + [ '127.0.0.1' ]
-  # end
-  # override_attribute 'ip_address', :delete
-  attr_reader :override_attribute_modifiers
-  def override_attribute(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_attribute requires either a value or a block"
-    end
-  end
-
-  # Order matters--if two things here are in the wrong order, they will be flipped in the run list
-  # recipe 'apache', 'mysql'
-  # recipe 'recipe@version'
-  # recipe 'recipe'
-  # role ''
-  attr_reader :run_list_modifiers
-  attr_reader :run_list_removers
-  def recipe(*recipes)
-    if recipes.size == 0
-      raise ArgumentError, "At least one recipe must be specified"
-    end
-    @run_list_modifiers ||= []
-    @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
-  end
-  def role(*roles)
-    if roles.size == 0
-      raise ArgumentError, "At least one role must be specified"
-    end
-    @run_list_modifiers ||= []
-    @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
-  end
-  def remove_recipe(*recipes)
-    if recipes.size == 0
-      raise ArgumentError, "At least one recipe must be specified"
-    end
-    @run_list_removers ||= []
-    @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
-  end
-  def remove_role(*roles)
-    if roles.size == 0
-      raise ArgumentError, "At least one role must be specified"
-    end
-    @run_list_removers ||= []
-    @run_list_removers += roles.map { |recipe| Chef::RunList::RunListItem.new("role[#{role}]") }
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+require 'chef/run_list/run_list_item'
+
+class Chef
+  class Resource
+    class ChefRole < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_role'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      # Grab environment from with_environment
+      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 :run_list, :kind_of => Array # We should let them specify it as a series of parameters too
+      attribute :env_run_lists, :kind_of => Hash
+      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_attribute 'ip_address', '127.0.0.1'
+      # default_attribute [ 'pushy', 'port' ], '9000'
+      # default_attribute 'ip_addresses' do |existing_value|
+      #   (existing_value || []) + [ '127.0.0.1' ]
+      # end
+      # default_attribute 'ip_address', :delete
+      attr_reader :default_attribute_modifiers
+      def default_attribute(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_attribute requires either a value or a block"
+        end
+      end
+
+      # override_attribute 'ip_address', '127.0.0.1'
+      # override_attribute [ 'pushy', 'port' ], '9000'
+      # override_attribute 'ip_addresses' do |existing_value|
+      #   (existing_value || []) + [ '127.0.0.1' ]
+      # end
+      # override_attribute 'ip_address', :delete
+      attr_reader :override_attribute_modifiers
+      def override_attribute(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_attribute requires either a value or a block"
+        end
+      end
+
+      # Order matters--if two things here are in the wrong order, they will be flipped in the run list
+      # recipe 'apache', 'mysql'
+      # recipe 'recipe@version'
+      # recipe 'recipe'
+      # role ''
+      attr_reader :run_list_modifiers
+      attr_reader :run_list_removers
+      def recipe(*recipes)
+        if recipes.size == 0
+          raise ArgumentError, "At least one recipe must be specified"
+        end
+        @run_list_modifiers ||= []
+        @run_list_modifiers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
+      end
+      def role(*roles)
+        if roles.size == 0
+          raise ArgumentError, "At least one role must be specified"
+        end
+        @run_list_modifiers ||= []
+        @run_list_modifiers += roles.map { |role| Chef::RunList::RunListItem.new("role[#{role}]") }
+      end
+      def remove_recipe(*recipes)
+        if recipes.size == 0
+          raise ArgumentError, "At least one recipe must be specified"
+        end
+        @run_list_removers ||= []
+        @run_list_removers += recipes.map { |recipe| Chef::RunList::RunListItem.new("recipe[#{recipe}]") }
+      end
+      def remove_role(*roles)
+        if roles.size == 0
+          raise ArgumentError, "At least one role must be specified"
+        end
+        @run_list_removers ||= []
+        @run_list_removers += roles.map { |recipe| Chef::RunList::RunListItem.new("role[#{role}]") }
+      end
+    end
+  end
+end