Removed crontab functions instead of unstubbing them.

diff --git a/lib/puppet/parser/functions/persistent_crontab_minutes.rb b/lib/puppet/parser/functions/persistent_crontab_minutes.rb
deleted file mode 100644 (file)
index cd80094..0000000
--- a/lib/puppet/parser/functions/persistent_crontab_minutes.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-#
-# persistent_crontab_minutes.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:persistent_crontab_minutes, :type => :rvalue, :doc => <<-EOS
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    require 'md5'
-
-    value = 0
-
-    job  = arguments[0]
-    host = arguments[1]
-
-    environment = Puppet[:environment]
-
-    # We select first directory that exists.  This might not be the best idea ...
-    modules = Puppet[:modulepath].split(':').select { |i| File.exists?(i) }.first
-
-    raise(Puppet::ParseError, "Unable to determine the storage " +
-      "directory for Puppet modules") unless modules
-
-    # Prepare the file where we store current value ...
-    file = "/puppet/state/crontab/#{host}-#{job}.minutes"
-    file = File.join(modules, file)
-
-    # Get the directory portion from the file name ...
-    directory = File.dirname(file)
-
-    FileUtils.mkdir_p(directory) unless File.directory?(directory)
-
-    if FileTest.exists?(file)
-      File.open(file, 'r') { |f| value = f.read.to_i }
-
-      raise(Puppet::ParseError, "The value for minutes in the file `%s' " +
-        "is out of the range from 0 to 59 inclusive") unless value < 60
-    else
-      #
-      # Pick a random number based on the job and host name.  This will yield
-      # the same value for exactly the same combination of the job and host name.
-      #
-      value = MD5.new(job_name + host).to_s.hex % 60
-
-      # Minutes are from 0 to 59 inclusive ...
-      value = value < 60 ? value : 59
-
-      File.open(file, 'w') { |f| f.write(value) }
-    end
-
-    # Tell Puppet to keep an eye on this file ...
-    parser = Puppet::Parser::Parser.new(environment)
-    parser.watch_file(file) if File.exists?(file)
-
-    return value
-  end
-end
-
-# vim: set ts=2 sw=2 et :

diff --git a/lib/puppet/parser/functions/random_crontab_minutes.rb b/lib/puppet/parser/functions/random_crontab_minutes.rb
deleted file mode 100644 (file)
index 8ab29e1..0000000
--- a/lib/puppet/parser/functions/random_crontab_minutes.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# random_crontab_minutes.rb
-#
-
-module Puppet::Parser::Functions
-  newfunction(:random_crontab_minutes, :type => :rvalue, :doc => <<-EOS
-    EOS
-  ) do |arguments|
-
-    raise(Puppet::ParseError, "Wrong number of arguments " +
-      "given (#{arguments.size} for 2)") if arguments.size < 2
-
-    require 'md5'
-
-    job_name = arguments[0]
-    host     = arguments[1]
-
-    #
-    # Pick a random number based on the job and host name.  This will yield
-    # the same value for exactly the same combination of the job and host name.
-    #
-    value = MD5.new(job_name + host).to_s.hex % 60
-
-    # Minutes are from 0 to 59 inclusive ...
-    value = value < 60 ? value : 59
-
-    return value
-  end
-end
-
-# vim: set ts=2 sw=2 et :

diff --git a/spec/unit/parser/functions/persistent_crontab_minutes_spec.rb b/spec/unit/parser/functions/persistent_crontab_minutes_spec.rb
deleted file mode 100644 (file)
index 1d8cbe7..0000000
--- a/spec/unit/parser/functions/persistent_crontab_minutes_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the persistent_crontab_minutes function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("persistent_crontab_minutes").should == "function_persistent_crontab_minutes"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { @scope.function_persistent_crontab_minutes([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-end

diff --git a/spec/unit/parser/functions/random_crontab_minutes_spec.rb b/spec/unit/parser/functions/random_crontab_minutes_spec.rb
deleted file mode 100644 (file)
index b47b3ae..0000000
--- a/spec/unit/parser/functions/random_crontab_minutes_spec.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env rspec
-require 'spec_helper'
-
-describe "the random_crontab_minutes function" do
-  before :all do
-    Puppet::Parser::Functions.autoloader.loadall
-  end
-
-  before :each do
-    @scope = Puppet::Parser::Scope.new
-  end
-
-  it "should exist" do
-    Puppet::Parser::Functions.function("random_crontab_minutes").should == "function_random_crontab_minutes"
-  end
-
-  it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { @scope.function_random_crontab_minutes([]) }.should( raise_error(Puppet::ParseError))
-  end
-
-end