cheffish 1.4.1 → 1.4.2

data/lib/chef/resource/chef_role.rb

@@ -1,110 +1,110 @@
-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
+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

data/lib/chef/resource/chef_user.rb

@@ -1,56 +1,56 @@
-require 'cheffish'
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class ChefUser < Chef::Resource::LWRPBase
-      self.resource_name = 'chef_user'
-
-      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
-
-      # Client attributes
-      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
-      attribute :display_name, :kind_of => String
-      attribute :admin, :kind_of => [TrueClass, FalseClass]
-      attribute :email, :kind_of => String
-      attribute :external_authentication_uid
-      attribute :recovery_authentication_enabled, :kind_of => [TrueClass, FalseClass]
-      attribute :password, :kind_of => String # Hmm.  There is no way to idempotentize this.
-      #attribute :salt  # TODO server doesn't support sending or receiving these, but it's the only way to backup / restore a user
-      #attribute :hashed_password
-      #attribute :hash_type
-
-      # Input key
-      attribute :source_key # String or OpenSSL::PKey::*
-      attribute :source_key_path, :kind_of => String
-      attribute :source_key_pass_phrase
-
-      # Output public key (if so desired)
-      attribute :output_key_path, :kind_of => String
-      attribute :output_key_format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :pem, :der, :openssh ]
-
-      # If this is set, client is not patchy
-      attribute :complete, :kind_of => [TrueClass, FalseClass]
-
-      attribute :raw_json, :kind_of => Hash
-      attribute :chef_server, :kind_of => Hash
-
-      # Proc that runs just before the resource executes.  Called with (resource)
-      def before(&block)
-        block ? @before = block : @before
-      end
-
-      # Proc that runs after the resource completes.  Called with (resource, json, private_key, public_key)
-      def after(&block)
-        block ? @after = block : @after
-      end
-    end
-  end
-end
+require 'cheffish'
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class ChefUser < Chef::Resource::LWRPBase
+      self.resource_name = 'chef_user'
+
+      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
+
+      # Client attributes
+      attribute :name, :kind_of => String, :regex => Cheffish::NAME_REGEX, :name_attribute => true
+      attribute :display_name, :kind_of => String
+      attribute :admin, :kind_of => [TrueClass, FalseClass]
+      attribute :email, :kind_of => String
+      attribute :external_authentication_uid
+      attribute :recovery_authentication_enabled, :kind_of => [TrueClass, FalseClass]
+      attribute :password, :kind_of => String # Hmm.  There is no way to idempotentize this.
+      #attribute :salt  # TODO server doesn't support sending or receiving these, but it's the only way to backup / restore a user
+      #attribute :hashed_password
+      #attribute :hash_type
+
+      # Input key
+      attribute :source_key # String or OpenSSL::PKey::*
+      attribute :source_key_path, :kind_of => String
+      attribute :source_key_pass_phrase
+
+      # Output public key (if so desired)
+      attribute :output_key_path, :kind_of => String
+      attribute :output_key_format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :pem, :der, :openssh ]
+
+      # If this is set, client is not patchy
+      attribute :complete, :kind_of => [TrueClass, FalseClass]
+
+      attribute :raw_json, :kind_of => Hash
+      attribute :chef_server, :kind_of => Hash
+
+      # Proc that runs just before the resource executes.  Called with (resource)
+      def before(&block)
+        block ? @before = block : @before
+      end
+
+      # Proc that runs after the resource completes.  Called with (resource, json, private_key, public_key)
+      def after(&block)
+        block ? @after = block : @after
+      end
+    end
+  end
+end

data/lib/chef/resource/private_key.rb

@@ -1,48 +1,48 @@
-require 'openssl/cipher'
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class PrivateKey < Chef::Resource::LWRPBase
-      self.resource_name = 'private_key'
-
-      actions :create, :delete, :regenerate, :nothing
-      default_action :create
-
-      # Path to private key.  Set to :none to create the key in memory and not on disk.
-      attribute :path, :kind_of => [ String, Symbol ], :name_attribute => true
-      attribute :format, :kind_of => Symbol, :default => :pem, :equal_to => [ :pem, :der ]
-      attribute :type, :kind_of => Symbol, :default => :rsa, :equal_to => [ :rsa, :dsa ] # TODO support :ec
-      # These specify an optional public_key you can spit out if you want.
-      attribute :public_key_path, :kind_of => String
-      attribute :public_key_format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :openssh, :pem, :der ]
-      # Specify this if you want to copy another private key but give it a different format / password
-      attribute :source_key
-      attribute :source_key_path, :kind_of => String
-      attribute :source_key_pass_phrase
-
-      # RSA and DSA
-      attribute :size, :kind_of => Integer, :default => 2048
-
-      # RSA-only
-      attribute :exponent, :kind_of => Integer # For RSA
-
-      # PEM-only
-      attribute :pass_phrase, :kind_of => String
-      attribute :cipher, :kind_of => String, :default => 'DES-EDE3-CBC', :equal_to => OpenSSL::Cipher.ciphers
-
-      # Set this to regenerate the key if it does not have the desired characteristics (like size, type, etc.)
-      attribute :regenerate_if_different, :kind_of => [TrueClass, FalseClass]
-
-      # Proc that runs after the resource completes.  Called with (resource, private_key)
-      def after(&block)
-        block ? @after = block : @after
-      end
-
-      # We are not interested in Chef's cloning behavior here.
-      def load_prior_resource(*args)
-        Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
-      end
-    end
-  end
-end
+require 'openssl/cipher'
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class PrivateKey < Chef::Resource::LWRPBase
+      self.resource_name = 'private_key'
+
+      actions :create, :delete, :regenerate, :nothing
+      default_action :create
+
+      # Path to private key.  Set to :none to create the key in memory and not on disk.
+      attribute :path, :kind_of => [ String, Symbol ], :name_attribute => true
+      attribute :format, :kind_of => Symbol, :default => :pem, :equal_to => [ :pem, :der ]
+      attribute :type, :kind_of => Symbol, :default => :rsa, :equal_to => [ :rsa, :dsa ] # TODO support :ec
+      # These specify an optional public_key you can spit out if you want.
+      attribute :public_key_path, :kind_of => String
+      attribute :public_key_format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :openssh, :pem, :der ]
+      # Specify this if you want to copy another private key but give it a different format / password
+      attribute :source_key
+      attribute :source_key_path, :kind_of => String
+      attribute :source_key_pass_phrase
+
+      # RSA and DSA
+      attribute :size, :kind_of => Integer, :default => 2048
+
+      # RSA-only
+      attribute :exponent, :kind_of => Integer # For RSA
+
+      # PEM-only
+      attribute :pass_phrase, :kind_of => String
+      attribute :cipher, :kind_of => String, :default => 'DES-EDE3-CBC', :equal_to => OpenSSL::Cipher.ciphers
+
+      # Set this to regenerate the key if it does not have the desired characteristics (like size, type, etc.)
+      attribute :regenerate_if_different, :kind_of => [TrueClass, FalseClass]
+
+      # Proc that runs after the resource completes.  Called with (resource, private_key)
+      def after(&block)
+        block ? @after = block : @after
+      end
+
+      # We are not interested in Chef's cloning behavior here.
+      def load_prior_resource(*args)
+        Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+      end
+    end
+  end
+end

data/lib/chef/resource/public_key.rb

@@ -1,25 +1,25 @@
-require 'openssl/cipher'
-require 'chef/resource/lwrp_base'
-
-class Chef
-  class Resource
-    class PublicKey < Chef::Resource::LWRPBase
-      self.resource_name = 'public_key'
-
-      actions :create, :delete, :nothing
-      default_action :create
-
-      attribute :path, :kind_of => String, :name_attribute => true
-      attribute :format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :pem, :der, :openssh ]
-
-      attribute :source_key
-      attribute :source_key_path, :kind_of => String
-      attribute :source_key_pass_phrase
-
-      # We are not interested in Chef's cloning behavior here.
-      def load_prior_resource(*args)
-        Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
-      end
-    end
-  end
-end
+require 'openssl/cipher'
+require 'chef/resource/lwrp_base'
+
+class Chef
+  class Resource
+    class PublicKey < Chef::Resource::LWRPBase
+      self.resource_name = 'public_key'
+
+      actions :create, :delete, :nothing
+      default_action :create
+
+      attribute :path, :kind_of => String, :name_attribute => true
+      attribute :format, :kind_of => Symbol, :default => :openssh, :equal_to => [ :pem, :der, :openssh ]
+
+      attribute :source_key
+      attribute :source_key_path, :kind_of => String
+      attribute :source_key_pass_phrase
+
+      # We are not interested in Chef's cloning behavior here.
+      def load_prior_resource(*args)
+        Chef::Log.debug("Overloading #{resource_name}.load_prior_resource with NOOP")
+      end
+    end
+  end
+end