diff --git a/lib/puppet/provider/cron/crontab.rb b/lib/puppet/provider/cron/crontab.rb index 8a347b331..a554363c8 100755 --- a/lib/puppet/provider/cron/crontab.rb +++ b/lib/puppet/provider/cron/crontab.rb @@ -1,206 +1,200 @@ require 'puppet/provider/parsedfile' tab = case Facter.value(:operatingsystem) when "Solaris" :suntab when "AIX" :aixtab else :crontab end - Puppet::Type.type(:cron).provide( - :crontab, - :parent => Puppet::Provider::ParsedFile, - :default_target => ENV["USER"] || "root", - - :filetype => tab -) do +Puppet::Type.type(:cron).provide(:crontab, :parent => Puppet::Provider::ParsedFile, :default_target => ENV["USER"] || "root", :filetype => tab) do commands :crontab => "crontab" text_line :comment, :match => %r{^#}, :post_parse => proc { |record| record[:name] = $1 if record[:line] =~ /Puppet Name: (.+)\s*$/ } text_line :blank, :match => %r{^\s*$} text_line :environment, :match => %r{^\w+=} record_line :freebsd_special, :fields => %w{special command}, :match => %r{^@(\w+)\s+(.+)$}, :pre_gen => proc { |record| record[:special] = "@" + record[:special] } crontab = record_line :crontab, :fields => %w{minute hour monthday month weekday command}, :match => %r{^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.+)$}, :optional => %w{minute hour weekday month monthday}, :absent => "*" class << crontab def numeric_fields fields - [:command] end # Do some post-processing of the parsed record. Basically just # split the numeric fields on ','. def post_parse(record) numeric_fields.each do |field| if val = record[field] and val != :absent record[field] = record[field].split(",") end end end # Join the fields back up based on ','. def pre_gen(record) numeric_fields.each do |field| if vals = record[field] and vals.is_a?(Array) record[field] = vals.join(",") end end end # Add name and environments as necessary. def to_line(record) str = "" str = "# Puppet Name: #{record[:name]}\n" if record[:name] if record[:environment] and record[:environment] != :absent and record[:environment] != [:absent] record[:environment].each do |env| str += env + "\n" end end if record[:special] str += "@#{record[:special]} #{record[:command]}" else str += join(record) end str end end # Return the header placed at the top of each generated file, warning # users that modifying this file manually is probably a bad idea. def self.header %{# HEADER: This file was autogenerated at #{Time.now} by puppet. # HEADER: While it can still be managed manually, it is definitely not recommended. # HEADER: Note particularly that the comments starting with 'Puppet Name' should # HEADER: not be deleted, as doing so could cause duplicate cron jobs.\n} end # See if we can match the record against an existing cron job. def self.match(record, resources) resources.each do |name, resource| # Match the command first, since it's the most important one. next unless record[:target] == resource.value(:target) next unless record[:command] == resource.value(:command) # Then check the @special stuff if record[:special] next unless resource.value(:special) == record[:special] end # Then the normal fields. matched = true record_type(record[:record_type]).fields.each do |field| next if field == :command next if field == :special if record[field] and ! resource.value(field) #Puppet.info "Cron is missing %s: %s and %s" % # [field, record[field].inspect, resource.value(field).inspect] matched = false break end if ! record[field] and resource.value(field) #Puppet.info "Hash is missing %s: %s and %s" % # [field, resource.value(field).inspect, record[field].inspect] matched = false break end # Yay differing definitions of absent. next if (record[field] == :absent and resource.value(field) == "*") # Everything should be in the form of arrays, not the normal text. next if (record[field] == resource.value(field)) #Puppet.info "Did not match %s: %s vs %s" % # [field, resource.value(field).inspect, record[field].inspect] matched = false break end return resource if matched end false end # Collapse name and env records. def self.prefetch_hook(records) name = nil envs = nil result = records.each { |record| case record[:record_type] when :comment if record[:name] name = record[:name] record[:skip] = true # Start collecting env values envs = [] end when :environment # If we're collecting env values (meaning we're in a named cronjob), # store the line and skip the record. if envs envs << record[:line] record[:skip] = true end when :blank # nothing else if name record[:name] = name name = nil end if envs.nil? or envs.empty? record[:environment] = :absent else # Collect all of the environment lines, and mark the records to be skipped, # since their data is included in our crontab record. record[:environment] = envs # And turn off env collection again envs = nil end end }.reject { |record| record[:skip] } result end def self.to_file(records) text = super # Apparently Freebsd will "helpfully" add a new TZ line to every # single cron line, but not in all cases (e.g., it doesn't do it # on my machine). This is my attempt to fix it so the TZ lines don't # multiply. if text =~ /(^TZ=.+\n)/ tz = $1 text.sub!(tz, '') text = tz + text end text end def user=(user) @property_hash[:user] = user @property_hash[:target] = user end def user @property_hash[:user] || @property_hash[:target] end end diff --git a/lib/puppet/type/cron.rb b/lib/puppet/type/cron.rb index 4f6ea733c..5083ca556 100755 --- a/lib/puppet/type/cron.rb +++ b/lib/puppet/type/cron.rb @@ -1,412 +1,412 @@ require 'etc' require 'facter' require 'puppet/util/filetype' Puppet::Type.newtype(:cron) do @doc = "Installs and manages cron jobs. All fields except the command and the user are optional, although specifying no periodic fields would result in the command being executed every minute. While the name of the cron job is not part of the actual job, it is used by Puppet to store and retrieve it. If you specify a cron job that matches an existing job in every way except name, then the jobs will be considered equivalent and the new name will be permanently associated with that job. Once this association is made and synced to disk, you can then manage the job normally (e.g., change the schedule of the job). Example: cron { logrotate: command => \"/usr/sbin/logrotate\", user => root, hour => 2, minute => 0 } Note that all cron values can be specified as an array of values: cron { logrotate: command => \"/usr/sbin/logrotate\", user => root, hour => [2, 4] } Or using ranges, or the step syntax `*/2` (although there's no guarantee that your `cron` daemon supports it): cron { logrotate: command => \"/usr/sbin/logrotate\", user => root, hour => ['2-4'], minute => '*/10' } " ensurable # A base class for all of the Cron parameters, since they all have # similar argument checking going on. class CronParam < Puppet::Property class << self attr_accessor :boundaries, :default end # We have to override the parent method, because we consume the entire # "should" array def insync?(is) self.is_to_s(is) == self.should_to_s end # A method used to do parameter input handling. Converts integers # in string form to actual integers, and returns the value if it's # an integer or false if it's just a normal string. def numfix(num) if num =~ /^\d+$/ return num.to_i elsif num.is_a?(Integer) return num else return false end end # Verify that a number is within the specified limits. Return the # number if it is, or false if it is not. def limitcheck(num, lower, upper) (num >= lower and num <= upper) && num end # Verify that a value falls within the specified array. Does case # insensitive matching, and supports matching either the entire word # or the first three letters of the word. def alphacheck(value, ary) tmp = value.downcase # If they specified a shortened version of the name, then see # if we can lengthen it (e.g., mon => monday). if tmp.length == 3 ary.each_with_index { |name, index| if name =~ /#{tmp}/i return index end } else return ary.index(tmp) if ary.include?(tmp) end false end def should_to_s(newvalue = @should) if newvalue newvalue = [newvalue] unless newvalue.is_a?(Array) if self.name == :command or newvalue[0].is_a? Symbol newvalue[0] else newvalue.join(",") end else nil end end def is_to_s(currentvalue = @is) if currentvalue return currentvalue unless currentvalue.is_a?(Array) if self.name == :command or currentvalue[0].is_a? Symbol currentvalue[0] else currentvalue.join(",") end else nil end end def should if @should and @should[0] == :absent :absent else @should end end def should=(ary) super @should.flatten! end # The method that does all of the actual parameter value # checking; called by all of the +param=+ methods. # Requires the value, type, and bounds, and optionally supports # a boolean of whether to do alpha checking, and if so requires # the ary against which to do the checking. munge do |value| # Support 'absent' as a value, so that they can remove # a value if value == "absent" or value == :absent return :absent end # Allow the */2 syntax if value =~ /^\*\/[0-9]+$/ return value end # Allow ranges if value =~ /^[0-9]+-[0-9]+$/ return value end # Allow ranges + */2 if value =~ /^[0-9]+-[0-9]+\/[0-9]+$/ return value end if value == "*" return :absent end return value unless self.class.boundaries lower, upper = self.class.boundaries retval = nil if num = numfix(value) retval = limitcheck(num, lower, upper) elsif respond_to?(:alpha) # If it has an alpha method defined, then we check # to see if our value is in that list and if so we turn # it into a number retval = alphacheck(value, alpha) end if retval return retval.to_s else self.fail "#{value} is not a valid #{self.class.name}" end end end # Somewhat uniquely, this property does not actually change anything -- it # just calls +@resource.sync+, which writes out the whole cron tab for # the user in question. There is no real way to change individual cron # jobs without rewriting the entire cron file. # # Note that this means that managing many cron jobs for a given user # could currently result in multiple write sessions for that user. newproperty(:command, :parent => CronParam) do desc "The command to execute in the cron job. The environment provided to the command varies by local system rules, and it is best to always provide a fully qualified command. The user's profile is not sourced when the command is run, so if the user's environment is desired it should be sourced manually. All cron parameters support `absent` as a value; this will remove any existing values for that field." def retrieve return_value = super return_value = return_value[0] if return_value && return_value.is_a?(Array) return_value end def should if @should if @should.is_a? Array @should[0] else devfail "command is not an array" end else nil end end end newproperty(:special) do desc "A special value such as 'reboot' or 'annually'. Only available on supported systems such as Vixie Cron. Overrides more specific time of day/week settings." def specials %w{reboot yearly annually monthly weekly daily midnight hourly} end validate do |value| raise ArgumentError, "Invalid special schedule #{value.inspect}" unless specials.include?(value) end end newproperty(:minute, :parent => CronParam) do self.boundaries = [0, 59] desc "The minute at which to run the cron job. Optional; if specified, must be between 0 and 59, inclusive." end newproperty(:hour, :parent => CronParam) do self.boundaries = [0, 23] desc "The hour at which to run the cron job. Optional; if specified, must be between 0 and 23, inclusive." end newproperty(:weekday, :parent => CronParam) do def alpha %w{sunday monday tuesday wednesday thursday friday saturday} end self.boundaries = [0, 7] desc "The weekday on which to run the command. Optional; if specified, must be between 0 and 7, inclusive, with 0 (or 7) being Sunday, or must be the name of the day (e.g., Tuesday)." end newproperty(:month, :parent => CronParam) do def alpha %w{january february march april may june july august september october november december} end self.boundaries = [1, 12] desc "The month of the year. Optional; if specified must be between 1 and 12 or the month name (e.g., December)." end newproperty(:monthday, :parent => CronParam) do self.boundaries = [1, 31] desc "The day of the month on which to run the command. Optional; if specified, must be between 1 and 31." end newproperty(:environment) do desc "Any environment settings associated with this cron job. They will be stored between the header and the job in the crontab. There can be no guarantees that other, earlier settings will not also affect a given cron job. Also, Puppet cannot automatically determine whether an existing, unmanaged environment setting is associated with a given cron job. If you already have cron jobs with environment settings, then Puppet will keep those settings in the same place in the file, but will not associate them with a specific job. Settings should be specified exactly as they should appear in the crontab, e.g., `PATH=/bin:/usr/bin:/usr/sbin`." validate do |value| unless value =~ /^\s*(\w+)\s*=\s*(.*)\s*$/ or value == :absent or value == "absent" raise ArgumentError, "Invalid environment setting #{value.inspect}" end end def insync?(is) if is.is_a? Array return is.sort == @should.sort else return is == @should end end def is_to_s(newvalue) if newvalue if newvalue.is_a?(Array) newvalue.join(",") else newvalue end else nil end end def should @should end def should_to_s(newvalue = @should) if newvalue newvalue.join(",") else nil end end end newparam(:name) do desc "The symbolic name of the cron job. This name is used for human reference only and is generated automatically for cron jobs found on the system. This generally won't matter, as Puppet will do its best to match existing cron jobs against specified jobs (and Puppet adds a comment to cron jobs it adds), but it is at least possible that converting from unmanaged jobs to managed jobs might require manual intervention." isnamevar end newproperty(:user) do desc "The user to run the command as. This user must be allowed to run cron jobs, which is not currently checked by Puppet. The user defaults to whomever Puppet is running as." defaultto { Etc.getpwuid(Process.uid).name || "root" } end newproperty(:target) do desc "Where the cron job should be stored. For crontab-style entries this is the same as the user and defaults that way. Other providers default accordingly." defaultto { if provider.is_a?(@resource.class.provider(:crontab)) if val = @resource.should(:user) val else raise ArgumentError, "You must provide a user with crontab entries" end elsif provider.class.ancestors.include?(Puppet::Provider::ParsedFile) provider.class.default_target else nil end } end # We have to reorder things so that :provide is before :target attr_accessor :uid def value(name) name = symbolize(name) ret = nil if obj = @parameters[name] ret = obj.should ret ||= obj.retrieve if ret == :absent ret = nil end end unless ret case name when :command - devfail "No command, somehow" + devfail "No command, somehow" unless @parameters[:ensure].value == :absent when :special # nothing else #ret = (self.class.validproperty?(name).default || "*").to_s ret = "*" end end ret end end diff --git a/spec/unit/type/cron_spec.rb b/spec/unit/type/cron_spec.rb index 75cc0d484..e98529c60 100755 --- a/spec/unit/type/cron_spec.rb +++ b/spec/unit/type/cron_spec.rb @@ -1,481 +1,491 @@ #!/usr/bin/env ruby require 'spec_helper' describe Puppet::Type.type(:cron) do before do @class = Puppet::Type.type(:cron) # Init a fake provider @provider_class = stub 'provider_class', :ancestors => [], :name => 'fake', :suitable? => true, :supports_parameter? => true @class.stubs(:defaultprovider).returns @provider_class @class.stubs(:provider).returns @provider_class @provider = stub 'provider', :class => @provider_class, :clean => nil @provider.stubs(:is_a?).returns false @provider_class.stubs(:new).returns @provider @cron = @class.new( :name => "foo" ) end it "should have :name be its namevar" do @class.key_attributes.should == [:name] end describe "when validating attributes" do [:name, :provider].each do |param| it "should have a #{param} parameter" do @class.attrtype(param).should == :param end end [:command, :special, :minute, :hour, :weekday, :month, :monthday, :environment, :user, :target].each do |property| it "should have a #{property} property" do @class.attrtype(property).should == :property end end [:command, :minute, :hour, :weekday, :month, :monthday].each do |cronparam| it "should have #{cronparam} of type CronParam" do @class.attrclass(cronparam).ancestors.should include CronParam end end end describe "when validating attribute" do describe "ensure" do it "should support present as a value for ensure" do proc { @class.new(:name => 'foo', :ensure => :present) }.should_not raise_error end it "should support absent as a value for ensure" do proc { @class.new(:name => 'foo', :ensure => :present) }.should_not raise_error end end describe "minute" do it "should support absent" do proc { @class.new(:name => 'foo', :minute => 'absent') }.should_not raise_error end it "should support *" do proc { @class.new(:name => 'foo', :minute => '*') }.should_not raise_error end it "should translate absent to :absent" do @class.new(:name => 'foo', :minute => 'absent')[:minute].should == :absent end it "should translate * to :absent" do @class.new(:name => 'foo', :minute => '*')[:minute].should == :absent end it "should support valid single values" do proc { @class.new(:name => 'foo', :minute => '0') }.should_not raise_error proc { @class.new(:name => 'foo', :minute => '1') }.should_not raise_error proc { @class.new(:name => 'foo', :minute => '59') }.should_not raise_error end it "should not support non numeric characters" do proc { @class.new(:name => 'foo', :minute => 'z59') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '5z9') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '59z') }.should raise_error(Puppet::Error) end it "should not support single values out of range" do proc { @class.new(:name => 'foo', :minute => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '60') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '61') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '120') }.should raise_error(Puppet::Error) end it "should support valid multiple values" do proc { @class.new(:name => 'foo', :minute => ['0','1','59'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :minute => ['40','30','20'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :minute => ['10','30','20'] ) }.should_not raise_error end it "should not support multiple values if at least one is invalid" do # one invalid proc { @class.new(:name => 'foo', :minute => ['0','1','60'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => ['0','120','59'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => ['-1','1','59'] ) }.should raise_error(Puppet::Error) # two invalid proc { @class.new(:name => 'foo', :minute => ['0','61','62'] ) }.should raise_error(Puppet::Error) # all invalid proc { @class.new(:name => 'foo', :minute => ['-1','61','62'] ) }.should raise_error(Puppet::Error) end it "should support valid step syntax" do proc { @class.new(:name => 'foo', :minute => '*/2' ) }.should_not raise_error proc { @class.new(:name => 'foo', :minute => '10-16/2' ) }.should_not raise_error end it "should not support invalid steps" do proc { @class.new(:name => 'foo', :minute => '*/A' ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :minute => '*/2A' ) }.should raise_error(Puppet::Error) # As it turns out cron does not complaining about steps that exceed the valid range # proc { @class.new(:name => 'foo', :minute => '*/120' ) }.should raise_error(Puppet::Error) end end describe "hour" do it "should support absent" do proc { @class.new(:name => 'foo', :hour => 'absent') }.should_not raise_error end it "should support *" do proc { @class.new(:name => 'foo', :hour => '*') }.should_not raise_error end it "should translate absent to :absent" do @class.new(:name => 'foo', :hour => 'absent')[:hour].should == :absent end it "should translate * to :absent" do @class.new(:name => 'foo', :hour => '*')[:hour].should == :absent end it "should support valid single values" do proc { @class.new(:name => 'foo', :hour => '0') }.should_not raise_error proc { @class.new(:name => 'foo', :hour => '11') }.should_not raise_error proc { @class.new(:name => 'foo', :hour => '12') }.should_not raise_error proc { @class.new(:name => 'foo', :hour => '13') }.should_not raise_error proc { @class.new(:name => 'foo', :hour => '23') }.should_not raise_error end it "should not support non numeric characters" do proc { @class.new(:name => 'foo', :hour => 'z15') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => '1z5') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => '15z') }.should raise_error(Puppet::Error) end it "should not support single values out of range" do proc { @class.new(:name => 'foo', :hour => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => '24') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => '120') }.should raise_error(Puppet::Error) end it "should support valid multiple values" do proc { @class.new(:name => 'foo', :hour => ['0','1','23'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :hour => ['5','16','14'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :hour => ['16','13','9'] ) }.should_not raise_error end it "should not support multiple values if at least one is invalid" do # one invalid proc { @class.new(:name => 'foo', :hour => ['0','1','24'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => ['0','-1','5'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => ['-1','1','23'] ) }.should raise_error(Puppet::Error) # two invalid proc { @class.new(:name => 'foo', :hour => ['0','25','26'] ) }.should raise_error(Puppet::Error) # all invalid proc { @class.new(:name => 'foo', :hour => ['-1','24','120'] ) }.should raise_error(Puppet::Error) end it "should support valid step syntax" do proc { @class.new(:name => 'foo', :hour => '*/2' ) }.should_not raise_error proc { @class.new(:name => 'foo', :hour => '10-18/4' ) }.should_not raise_error end it "should not support invalid steps" do proc { @class.new(:name => 'foo', :hour => '*/A' ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :hour => '*/2A' ) }.should raise_error(Puppet::Error) # As it turns out cron does not complaining about steps that exceed the valid range # proc { @class.new(:name => 'foo', :hour => '*/26' ) }.should raise_error(Puppet::Error) end end describe "weekday" do it "should support absent" do proc { @class.new(:name => 'foo', :weekday => 'absent') }.should_not raise_error end it "should support *" do proc { @class.new(:name => 'foo', :weekday => '*') }.should_not raise_error end it "should translate absent to :absent" do @class.new(:name => 'foo', :weekday => 'absent')[:weekday].should == :absent end it "should translate * to :absent" do @class.new(:name => 'foo', :weekday => '*')[:weekday].should == :absent end it "should support valid numeric weekdays" do proc { @class.new(:name => 'foo', :weekday => '0') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => '1') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => '6') }.should_not raise_error # According to http://www.manpagez.com/man/5/crontab 7 is also valid (Sunday) proc { @class.new(:name => 'foo', :weekday => '7') }.should_not raise_error end it "should support valid weekdays as words (3 character version)" do proc { @class.new(:name => 'foo', :weekday => 'Monday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Tuesday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Wednesday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Thursday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Friday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Saturday') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Sunday') }.should_not raise_error end it "should support valid weekdays as words (3 character version)" do proc { @class.new(:name => 'foo', :weekday => 'Mon') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Tue') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Wed') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Thu') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Fri') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Sat') }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => 'Sun') }.should_not raise_error end it "should not support numeric values out of range" do proc { @class.new(:name => 'foo', :weekday => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :weekday => '8') }.should raise_error(Puppet::Error) end it "should not support invalid weekday names" do proc { @class.new(:name => 'foo', :weekday => 'Sar') }.should raise_error(Puppet::Error) end it "should support valid multiple values" do proc { @class.new(:name => 'foo', :weekday => ['0','1','6'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => ['Mon','Wed','Friday'] ) }.should_not raise_error end it "should not support multiple values if at least one is invalid" do # one invalid proc { @class.new(:name => 'foo', :weekday => ['0','1','8'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :weekday => ['Mon','Fii','Sat'] ) }.should raise_error(Puppet::Error) # two invalid proc { @class.new(:name => 'foo', :weekday => ['Mos','Fii','Sat'] ) }.should raise_error(Puppet::Error) # all invalid proc { @class.new(:name => 'foo', :weekday => ['Mos','Fii','Saa'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :weekday => ['-1','8','11'] ) }.should raise_error(Puppet::Error) end it "should support valid step syntax" do proc { @class.new(:name => 'foo', :weekday => '*/2' ) }.should_not raise_error proc { @class.new(:name => 'foo', :weekday => '0-4/2' ) }.should_not raise_error end it "should not support invalid steps" do proc { @class.new(:name => 'foo', :weekday => '*/A' ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :weekday => '*/2A' ) }.should raise_error(Puppet::Error) # As it turns out cron does not complaining about steps that exceed the valid range # proc { @class.new(:name => 'foo', :weekday => '*/9' ) }.should raise_error(Puppet::Error) end end describe "month" do it "should support absent" do proc { @class.new(:name => 'foo', :month => 'absent') }.should_not raise_error end it "should support *" do proc { @class.new(:name => 'foo', :month => '*') }.should_not raise_error end it "should translate absent to :absent" do @class.new(:name => 'foo', :month => 'absent')[:month].should == :absent end it "should translate * to :absent" do @class.new(:name => 'foo', :month => '*')[:month].should == :absent end it "should support valid numeric values" do proc { @class.new(:name => 'foo', :month => '1') }.should_not raise_error proc { @class.new(:name => 'foo', :month => '12') }.should_not raise_error end it "should support valid months as words" do proc { @class.new(:name => 'foo', :month => 'January') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'February') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'March') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'April') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'May') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'June') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'July') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'August') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'September') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'October') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'November') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'December') }.should_not raise_error end it "should support valid months as words (3 character short version)" do proc { @class.new(:name => 'foo', :month => 'Jan') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Feb') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Mar') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Apr') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'May') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Jun') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Jul') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Aug') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Sep') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Oct') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Nov') }.should_not raise_error proc { @class.new(:name => 'foo', :month => 'Dec') }.should_not raise_error end it "should not support numeric values out of range" do proc { @class.new(:name => 'foo', :month => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '0') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '13') }.should raise_error(Puppet::Error) end it "should not support words that are not valid months" do proc { @class.new(:name => 'foo', :month => 'Jal') }.should raise_error(Puppet::Error) end it "should not support single values out of range" do proc { @class.new(:name => 'foo', :month => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '60') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '61') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '120') }.should raise_error(Puppet::Error) end it "should support valid multiple values" do proc { @class.new(:name => 'foo', :month => ['1','9','12'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :month => ['Jan','March','Jul'] ) }.should_not raise_error end it "should not support multiple values if at least one is invalid" do # one invalid proc { @class.new(:name => 'foo', :month => ['0','1','12'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => ['1','13','10'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => ['Jan','Feb','Jxx'] ) }.should raise_error(Puppet::Error) # two invalid proc { @class.new(:name => 'foo', :month => ['Jan','Fex','Jux'] ) }.should raise_error(Puppet::Error) # all invalid proc { @class.new(:name => 'foo', :month => ['-1','0','13'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => ['Jax','Fex','Aux'] ) }.should raise_error(Puppet::Error) end it "should support valid step syntax" do proc { @class.new(:name => 'foo', :month => '*/2' ) }.should_not raise_error proc { @class.new(:name => 'foo', :month => '1-12/3' ) }.should_not raise_error end it "should not support invalid steps" do proc { @class.new(:name => 'foo', :month => '*/A' ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :month => '*/2A' ) }.should raise_error(Puppet::Error) # As it turns out cron does not complaining about steps that exceed the valid range # proc { @class.new(:name => 'foo', :month => '*/13' ) }.should raise_error(Puppet::Error) end end describe "monthday" do it "should support absent" do proc { @class.new(:name => 'foo', :monthday => 'absent') }.should_not raise_error end it "should support *" do proc { @class.new(:name => 'foo', :monthday => '*') }.should_not raise_error end it "should translate absent to :absent" do @class.new(:name => 'foo', :monthday => 'absent')[:monthday].should == :absent end it "should translate * to :absent" do @class.new(:name => 'foo', :monthday => '*')[:monthday].should == :absent end it "should support valid single values" do proc { @class.new(:name => 'foo', :monthday => '1') }.should_not raise_error proc { @class.new(:name => 'foo', :monthday => '30') }.should_not raise_error proc { @class.new(:name => 'foo', :monthday => '31') }.should_not raise_error end it "should not support non numeric characters" do proc { @class.new(:name => 'foo', :monthday => 'z23') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => '2z3') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => '23z') }.should raise_error(Puppet::Error) end it "should not support single values out of range" do proc { @class.new(:name => 'foo', :monthday => '-1') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => '0') }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => '32') }.should raise_error(Puppet::Error) end it "should support valid multiple values" do proc { @class.new(:name => 'foo', :monthday => ['1','23','31'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :monthday => ['31','23','1'] ) }.should_not raise_error proc { @class.new(:name => 'foo', :monthday => ['1','31','23'] ) }.should_not raise_error end it "should not support multiple values if at least one is invalid" do # one invalid proc { @class.new(:name => 'foo', :monthday => ['1','23','32'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => ['-1','12','23'] ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => ['13','32','30'] ) }.should raise_error(Puppet::Error) # two invalid proc { @class.new(:name => 'foo', :monthday => ['-1','0','23'] ) }.should raise_error(Puppet::Error) # all invalid proc { @class.new(:name => 'foo', :monthday => ['-1','0','32'] ) }.should raise_error(Puppet::Error) end it "should support valid step syntax" do proc { @class.new(:name => 'foo', :monthday => '*/2' ) }.should_not raise_error proc { @class.new(:name => 'foo', :monthday => '10-16/2' ) }.should_not raise_error end it "should not support invalid steps" do proc { @class.new(:name => 'foo', :monthday => '*/A' ) }.should raise_error(Puppet::Error) proc { @class.new(:name => 'foo', :monthday => '*/2A' ) }.should raise_error(Puppet::Error) # As it turns out cron does not complaining about steps that exceed the valid range # proc { @class.new(:name => 'foo', :monthday => '*/32' ) }.should raise_error(Puppet::Error) end end describe "environment" do it "it should accept an :environment that looks like a path" do lambda do @cron[:environment] = 'PATH=/bin:/usr/bin:/usr/sbin' end.should_not raise_error end it "should not accept environment variables that do not contain '='" do lambda do @cron[:environment] = "INVALID" end.should raise_error(Puppet::Error) end it "should accept empty environment variables that do not contain '='" do lambda do @cron[:environment] = "MAILTO=" end.should_not raise_error(Puppet::Error) end it "should accept 'absent'" do lambda do @cron[:environment] = 'absent' end.should_not raise_error(Puppet::Error) end end end + + it "should require a command when adding an entry" do + entry = @class.new(:name => "test_entry", :ensure => :present) + expect { entry.value(:command) }.should raise_error(/No command/) + end + + it "should not require a command when removing an entry" do + entry = @class.new(:name => "test_entry", :ensure => :absent) + entry.value(:command).should == nil + end end