From 961447dfdf096ce1df184ea81335df9e1fe09294 Mon Sep 17 00:00:00 2001 From: Pete Johns Date: Thu, 26 Jun 2014 20:04:33 +1000 Subject: [PATCH] `be_true` and `be_false` are deprecated Replace with `be true` and `be false` and make predicate return a boolean. > Methods that don't return a boolean, shouldn't end in a question mark. -- https://github.com/bbatsov/ruby-style-guide#naming --- lib/puppet/provider/ini_setting/ruby.rb | 2 +- .../puppet/provider/ini_setting/ruby_spec.rb | 68 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/puppet/provider/ini_setting/ruby.rb b/lib/puppet/provider/ini_setting/ruby.rb index 1b2bc80..7831a4f 100644 --- a/lib/puppet/provider/ini_setting/ruby.rb +++ b/lib/puppet/provider/ini_setting/ruby.rb @@ -38,7 +38,7 @@ Puppet::Type.type(:ini_setting).provide(:ruby) do end def exists? - ini_file.get_value(section, setting) + !ini_file.get_value(section, setting).nil? end def create diff --git a/spec/unit/puppet/provider/ini_setting/ruby_spec.rb b/spec/unit/puppet/provider/ini_setting/ruby_spec.rb index 5fee4f0..be7535c 100644 --- a/spec/unit/puppet/provider/ini_setting/ruby_spec.rb +++ b/spec/unit/puppet/provider/ini_setting/ruby_spec.rb @@ -144,7 +144,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -172,7 +172,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section:sub', :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -200,7 +200,7 @@ yahoo = yippee resource = Puppet::Type::Ini_setting.new(common_params.merge( :setting => 'baz', :value => 'bazvalue2')) provider = described_class.new(resource) - provider.exists?.should == 'bazvalue' + provider.exists?.should be true provider.value=('bazvalue2') validate_file(<<-EOS # This is a comment @@ -227,7 +227,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section:sub', :setting => 'subby', :value => 'foo')) provider = described_class.new(resource) - provider.exists?.should == 'bar' + provider.exists?.should be true provider.value.should == 'bar' provider.value=('foo') validate_file(<<-EOS @@ -255,7 +255,7 @@ subby=foo resource = Puppet::Type::Ini_setting.new(common_params.merge( :setting => 'url', :value => 'http://192.168.0.1:8080')) provider = described_class.new(resource) - provider.exists?.should == 'http://192.168.1.1:8080' + provider.exists?.should be true provider.value.should == 'http://192.168.1.1:8080' provider.value=('http://192.168.0.1:8080') @@ -284,14 +284,14 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :setting => 'baz', :value => 'bazvalue')) provider = described_class.new(resource) - provider.exists?.should == 'bazvalue' + provider.exists?.should be true end it "should add a new section if the section does not exist" do resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => "section3", :setting => 'huzzah', :value => 'shazaam')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -321,7 +321,7 @@ huzzah = shazaam resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => "section:subsection", :setting => 'huzzah', :value => 'shazaam')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -351,7 +351,7 @@ huzzah = shazaam resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => "section1", :setting => 'setting1', :value => 'hellowworld', :path => emptyfile)) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(" [section1] @@ -363,7 +363,7 @@ setting1 = hellowworld resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => "section:subsection", :setting => 'setting1', :value => 'hellowworld', :path => emptyfile)) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(" [section:subsection] @@ -375,7 +375,7 @@ setting1 = hellowworld resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => "section1", :setting => 'master', :value => true)) provider = described_class.new(resource) - provider.exists?.should == 'true' + provider.exists?.should be true provider.value.should == 'true' end @@ -397,7 +397,7 @@ foo = http://192.168.1.1:8080 resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => '', :setting => 'bar', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -414,7 +414,7 @@ foo = http://192.168.1.1:8080 resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => '', :setting => 'foo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should == 'blah' + provider.exists?.should be true provider.value.should == 'blah' provider.value=('yippee') validate_file(<<-EOS @@ -431,7 +431,7 @@ foo = http://192.168.1.1:8080 resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => '', :setting => 'foo', :value => 'blah')) provider = described_class.new(resource) - provider.exists?.should == 'blah' + provider.exists?.should be true end end @@ -447,7 +447,7 @@ foo = http://192.168.1.1:8080 resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => '', :setting => 'foo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS foo = yippee @@ -462,7 +462,7 @@ foo = http://192.168.1.1:8080 resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section2', :setting => 'foo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should == 'http://192.168.1.1:8080' + provider.exists?.should be true provider.value.should == 'http://192.168.1.1:8080' provider.value=('yippee') validate_file(<<-EOS @@ -476,7 +476,7 @@ foo = yippee resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section2', :setting => 'bar', :value => 'baz')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS [section2] @@ -522,7 +522,7 @@ foo=bar :value => 'yippee', :key_val_separator => '=')) provider = described_class.new(resource) - provider.exists?.should == 'bar' + provider.exists?.should be true provider.value.should == 'bar' provider.value=('yippee') validate_file(<<-EOS @@ -539,7 +539,7 @@ foo=yippee :value => 'baz', :key_val_separator => '=')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS [section2] @@ -576,7 +576,7 @@ EOS resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section1', :setting => 'foo', :ensure => 'absent')) provider = described_class.new(resource) - provider.exists?.should be_true + provider.exists?.should be true provider.destroy validate_file(<<-EOS [section1] @@ -601,7 +601,7 @@ EOS resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section:sub', :setting => 'foo', :ensure => 'absent')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.destroy validate_file(<<-EOS [section1] @@ -652,7 +652,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section1', :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -681,7 +681,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section1', :setting => 'bar', :value => 'barvalue2')) provider = described_class.new(resource) - provider.exists?.should be_true + provider.exists?.should be true provider.create validate_file(<<-EOS # This is a comment @@ -709,7 +709,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section2', :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -738,7 +738,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section2', :setting => 'baz', :value => 'bazvalue2')) provider = described_class.new(resource) - provider.exists?.should be_true + provider.exists?.should be true provider.create validate_file(<<-EOS # This is a comment @@ -766,7 +766,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section:sub', :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment @@ -795,7 +795,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section:sub', :setting => 'fleezy', :value => 'flam2')) provider = described_class.new(resource) - provider.exists?.should be_true + provider.exists?.should be true provider.create validate_file(<<-EOS # This is a comment @@ -842,7 +842,7 @@ blah = blah resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section2', :setting => 'foo', :value => 'foo3')) provider = described_class.new(resource) - provider.exists?.should be_false + provider.exists?.should be false provider.create validate_file(<<-EOS [section1] @@ -864,7 +864,7 @@ blah = blah resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section1', :setting => 'foo', :value => 'foo3')) provider = described_class.new(resource) - provider.exists?.should be_true + provider.exists?.should be true provider.create validate_file(<<-EOS [section1] @@ -885,7 +885,7 @@ blah = blah resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section2', :setting => 'bar', :value => 'bar3')) provider = described_class.new(resource) - provider.exists?.should be_false + provider.exists?.should be false provider.create validate_file(<<-EOS [section1] @@ -907,7 +907,7 @@ blah = blah resource = Puppet::Type::Ini_setting.new( common_params.merge(:section => 'section2', :setting => 'baz', :value => 'bazvalue')) provider = described_class.new(resource) - provider.exists?.should be_false + provider.exists?.should be false provider.create validate_file(<<-EOS [section1] @@ -938,7 +938,7 @@ EOS common_params.merge(:section => 'section1', :setting => 'foo', :value => 'foovalue2') ) provider = described_class.new(resource) - provider.exists?.should be_false + provider.exists?.should be false provider.create validate_file(<<-EOS [section1] @@ -953,7 +953,7 @@ foo=foovalue2 common_params.merge(:section => 'section1', :setting => 'bar', :value => 'barvalue2') ) provider = described_class.new(resource) - provider.exists?.should be_false + provider.exists?.should be false provider.create validate_file(<<-EOS [section1] @@ -991,7 +991,7 @@ subby=bar resource = Puppet::Type::Ini_setting.new(common_params.merge( :section => 'section - two', :setting => 'yahoo', :value => 'yippee')) provider = described_class.new(resource) - provider.exists?.should be_nil + provider.exists?.should be false provider.create validate_file(<<-EOS # This is a comment