5904c6f7b4
It is a legitimate use case to set empty values; to override a default when an empty value is acceptable for instance. This patch changes the regex in three ways: it 1) removes the requirement for a non-whitespace terminator on a setting value, 2) makes the value match non-greedy so that the \s*$ at the end can catch the newline and 3) changes the \s*=\s* to [ \t]*=[ \t]* because we don't want that to capture *any* whitespace (like a newline).
138 lines
3.8 KiB
Ruby
138 lines
3.8 KiB
Ruby
require 'spec_helper'
|
|
require 'stringio'
|
|
require 'puppet/util/ini_file'
|
|
|
|
describe Puppet::Util::IniFile do
|
|
let(:subject) { Puppet::Util::IniFile.new("/my/ini/file/path") }
|
|
|
|
before :each do
|
|
File.should_receive(:file?).with("/my/ini/file/path") { true }
|
|
described_class.should_receive(:readlines).once.with("/my/ini/file/path") do
|
|
sample_content
|
|
end
|
|
end
|
|
|
|
context "when parsing a file" do
|
|
let(:sample_content) {
|
|
template = <<-EOS
|
|
# This is a comment
|
|
[section1]
|
|
; This is also a comment
|
|
foo=foovalue
|
|
|
|
bar = barvalue
|
|
baz =
|
|
[section2]
|
|
|
|
foo= foovalue2
|
|
baz=bazvalue
|
|
#another comment
|
|
; yet another comment
|
|
zot = multi word value
|
|
EOS
|
|
template.split("\n")
|
|
}
|
|
|
|
it "should parse the correct number of sections" do
|
|
# there is always a "global" section, so our count should be 3.
|
|
subject.section_names.length.should == 3
|
|
end
|
|
|
|
it "should parse the correct section_names" do
|
|
# there should always be a "global" section named "" at the beginning of the list
|
|
subject.section_names.should == ["", "section1", "section2"]
|
|
end
|
|
|
|
it "should expose settings for sections" do
|
|
subject.get_value("section1", "foo").should == "foovalue"
|
|
subject.get_value("section1", "bar").should == "barvalue"
|
|
subject.get_value("section1", "baz").should == ""
|
|
subject.get_value("section2", "foo").should == "foovalue2"
|
|
subject.get_value("section2", "baz").should == "bazvalue"
|
|
subject.get_value("section2", "zot").should == "multi word value"
|
|
end
|
|
|
|
end
|
|
|
|
context "when parsing a file whose first line is a section" do
|
|
let(:sample_content) {
|
|
template = <<-EOS
|
|
[section1]
|
|
; This is a comment
|
|
foo=foovalue
|
|
EOS
|
|
template.split("\n")
|
|
}
|
|
|
|
it "should parse the correct number of sections" do
|
|
# there is always a "global" section, so our count should be 2.
|
|
subject.section_names.length.should == 2
|
|
end
|
|
|
|
it "should parse the correct section_names" do
|
|
# there should always be a "global" section named "" at the beginning of the list
|
|
subject.section_names.should == ["", "section1"]
|
|
end
|
|
|
|
it "should expose settings for sections" do
|
|
subject.get_value("section1", "foo").should == "foovalue"
|
|
end
|
|
|
|
end
|
|
|
|
context "when parsing a file with a 'global' section" do
|
|
let(:sample_content) {
|
|
template = <<-EOS
|
|
foo = bar
|
|
[section1]
|
|
; This is a comment
|
|
foo=foovalue
|
|
EOS
|
|
template.split("\n")
|
|
}
|
|
|
|
it "should parse the correct number of sections" do
|
|
# there is always a "global" section, so our count should be 2.
|
|
subject.section_names.length.should == 2
|
|
end
|
|
|
|
it "should parse the correct section_names" do
|
|
# there should always be a "global" section named "" at the beginning of the list
|
|
subject.section_names.should == ["", "section1"]
|
|
end
|
|
|
|
it "should expose settings for sections" do
|
|
subject.get_value("", "foo").should == "bar"
|
|
subject.get_value("section1", "foo").should == "foovalue"
|
|
end
|
|
end
|
|
|
|
context "when updating a file with existing empty values" do
|
|
let(:sample_content) {
|
|
template = <<-EOS
|
|
[section1]
|
|
foo=
|
|
#bar=
|
|
EOS
|
|
template.split("\n")
|
|
}
|
|
|
|
it "should properly update uncommented values" do
|
|
subject.get_value("section1", "far").should == nil
|
|
subject.set_value("section1", "foo", "foovalue")
|
|
subject.get_value("section1", "foo").should == "foovalue"
|
|
end
|
|
|
|
it "should properly update commented values" do
|
|
subject.get_value("section1", "bar").should == nil
|
|
subject.set_value("section1", "bar", "barvalue")
|
|
subject.get_value("section1", "bar").should == "barvalue"
|
|
end
|
|
|
|
it "should properly add new empty values" do
|
|
subject.get_value("section1", "baz").should == nil
|
|
subject.set_value("section1", "baz", "bazvalue")
|
|
subject.get_value("section1", "baz").should == "bazvalue"
|
|
end
|
|
end
|
|
end
|