Skip to content

Add a ceiling function to complement the floor function. #407

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 3, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ string. *Type*: rvalue
* `capitalize`: Capitalizes the first letter of a string or array of strings.
Requires either a single string or an array as an input. *Type*: rvalue

* `ceiling`: Returns the smallest integer greater than or equal to the argument.
Takes a single numeric value as an argument. *Type*: rvalue

* `chomp`: Removes the record separator from the end of a string or an array of
strings; for example, 'hello\n' becomes 'hello'. Requires a single string or array as an input. *Type*: rvalue

Expand Down
25 changes: 25 additions & 0 deletions lib/puppet/parser/functions/ceiling.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
module Puppet::Parser::Functions
newfunction(:ceiling, :type => :rvalue, :doc => <<-EOS
Returns the smallest integer greater or equal to the argument.
Takes a single numeric value as an argument.
EOS
) do |arguments|

raise(Puppet::ParseError, "ceiling(): Wrong number of arguments " +
"given (#{arguments.size} for 1)") if arguments.size != 1

begin
arg = Float(arguments[0])
rescue TypeError, ArgumentError => e
raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
"given (#{arguments[0]} for Numeric)")
end

raise(Puppet::ParseError, "ceiling(): Wrong argument type " +
"given (#{arg.class} for Numeric)") if arg.is_a?(Numeric) == false

arg.ceil
end
end

# vim: set ts=2 sw=2 et :
39 changes: 39 additions & 0 deletions spec/acceptance/ceiling_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#! /usr/bin/env ruby -S rspec
require 'spec_helper_acceptance'

describe 'ceiling function', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
describe 'success' do
it 'ceilings floats' do
pp = <<-EOS
$a = 12.8
$b = 13
$o = ceiling($a)
if $o == $b {
notify { 'output correct': }
}
EOS

apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stdout).to match(/Notice: output correct/)
end
end
it 'ceilings integers' do
pp = <<-EOS
$a = 7
$b = 7
$o = ceiling($a)
if $o == $b {
notify { 'output correct': }
}
EOS

apply_manifest(pp, :catch_failures => true) do |r|
expect(r.stdout).to match(/Notice: output correct/)
end
end
end
describe 'failure' do
it 'handles improper argument counts'
it 'handles non-numbers'
end
end
39 changes: 39 additions & 0 deletions spec/functions/ceiling_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
#! /usr/bin/env ruby -S rspec

require 'spec_helper'

describe "the ceiling function" do
let(:scope) { PuppetlabsSpec::PuppetInternals.scope }

it "should exist" do
expect(Puppet::Parser::Functions.function("ceiling")).to eq("function_ceiling")
end

it "should raise a ParseError if there is less than 1 argument" do
expect { scope.function_ceiling([]) }.to( raise_error(Puppet::ParseError, /Wrong number of arguments/))
end

it "should should raise a ParseError if input isn't numeric (eg. String)" do
expect { scope.function_ceiling(["foo"]) }.to( raise_error(Puppet::ParseError, /Wrong argument type/))
end

it "should should raise a ParseError if input isn't numeric (eg. Boolean)" do
expect { scope.function_ceiling([true]) }.to( raise_error(Puppet::ParseError, /Wrong argument type/))
end

it "should return an integer when a numeric type is passed" do
result = scope.function_ceiling([12.4])
expect(result.is_a?(Integer)).to(eq(true))
end

it "should return the input when an integer is passed" do
result = scope.function_ceiling([7])
expect(result).to(eq(7))
end

it "should return the smallest integer greater than or equal to the input" do
result = scope.function_ceiling([3.8])
expect(result).to(eq(4))
end
end