From 4c93090e1aad8dfdaa39b4f304d3c87704408b13 Mon Sep 17 00:00:00 2001 From: Jeff McCune Date: Thu, 4 Aug 2011 19:17:48 -0700 Subject: [PATCH] (#8792) Rename whole_line type to file_line Without this patch the resource whole_line would be included in the stable stdlib module shipping in PE 1.2. Ideally the name will be stable and unchanging in the future. There was quite a bit of concern over whole_line being an unwise name. file_line appears to be the most suitable name and least likely to need another rename in the future. --- .../{whole_line => file_line}/ruby.rb | 2 +- .../type/{whole_line.rb => file_line.rb} | 4 ++-- .../{whole_line => file_line}/ruby_spec.rb | 4 ++-- spec/unit/puppet/type/file_line_spec.rb | 24 +++++++++++++++++++ spec/unit/puppet/type/whole_line_spec.rb | 24 ------------------- 5 files changed, 29 insertions(+), 29 deletions(-) rename lib/puppet/provider/{whole_line => file_line}/ruby.rb (82%) rename lib/puppet/type/{whole_line.rb => file_line.rb} (93%) rename spec/unit/puppet/provider/{whole_line => file_line}/ruby_spec.rb (87%) create mode 100644 spec/unit/puppet/type/file_line_spec.rb delete mode 100644 spec/unit/puppet/type/whole_line_spec.rb diff --git a/lib/puppet/provider/whole_line/ruby.rb b/lib/puppet/provider/file_line/ruby.rb similarity index 82% rename from lib/puppet/provider/whole_line/ruby.rb rename to lib/puppet/provider/file_line/ruby.rb index 156f255..63bbd8e 100644 --- a/lib/puppet/provider/whole_line/ruby.rb +++ b/lib/puppet/provider/file_line/ruby.rb @@ -1,4 +1,4 @@ -Puppet::Type.type(:whole_line).provide(:ruby) do +Puppet::Type.type(:file_line).provide(:ruby) do def exists? File.readlines(resource[:path]).find do |line| diff --git a/lib/puppet/type/whole_line.rb b/lib/puppet/type/file_line.rb similarity index 93% rename from lib/puppet/type/whole_line.rb rename to lib/puppet/type/file_line.rb index f231602..aacd6d9 100644 --- a/lib/puppet/type/whole_line.rb +++ b/lib/puppet/type/file_line.rb @@ -1,11 +1,11 @@ -Puppet::Type.newtype(:whole_line) do +Puppet::Type.newtype(:file_line) do desc <<-EOT Type that can append whole a line to a file if it does not already contain it. Example: - whole_line { 'sudo_rule': + file_line { 'sudo_rule': path => '/etc/sudoers', line => '%admin ALL=(ALL) ALL', } diff --git a/spec/unit/puppet/provider/whole_line/ruby_spec.rb b/spec/unit/puppet/provider/file_line/ruby_spec.rb similarity index 87% rename from spec/unit/puppet/provider/whole_line/ruby_spec.rb rename to spec/unit/puppet/provider/file_line/ruby_spec.rb index 9faff2c..b03fc0e 100644 --- a/spec/unit/puppet/provider/whole_line/ruby_spec.rb +++ b/spec/unit/puppet/provider/file_line/ruby_spec.rb @@ -1,12 +1,12 @@ require 'puppet' require 'tempfile' -provider_class = Puppet::Type.type(:whole_line).provider(:ruby) +provider_class = Puppet::Type.type(:file_line).provider(:ruby) describe provider_class do before :each do tmp = Tempfile.new('tmp') @tmpfile = tmp.path tmp.close! - @resource = Puppet::Type::Whole_line.new( + @resource = Puppet::Type::File_line.new( {:name => 'foo', :path => @tmpfile, :line => 'foo'} ) @provider = provider_class.new(@resource) diff --git a/spec/unit/puppet/type/file_line_spec.rb b/spec/unit/puppet/type/file_line_spec.rb new file mode 100644 index 0000000..7e07c06 --- /dev/null +++ b/spec/unit/puppet/type/file_line_spec.rb @@ -0,0 +1,24 @@ +require 'puppet' +require 'tempfile' +describe Puppet::Type.type(:file_line) do + before :each do + @file_line = Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path') + end + it 'should accept a line and path' do + @file_line[:line] = 'my_line' + @file_line[:line].should == 'my_line' + end + it 'should accept posix filenames' do + @file_line[:path] = '/tmp/path' + @file_line[:path].should == '/tmp/path' + end + it 'should not accept unqualified path' do + expect { @file_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/) + end + it 'should require that a line is specified' do + expect { Puppet::Type.type(:file_line).new(:name => 'foo', :path => '/tmp/file') }.should raise_error(Puppet::Error, /Both line and path are required attributes/) + end + it 'should require that a file is specified' do + expect { Puppet::Type.type(:file_line).new(:name => 'foo', :line => 'path') }.should raise_error(Puppet::Error, /Both line and path are required attributes/) + end +end diff --git a/spec/unit/puppet/type/whole_line_spec.rb b/spec/unit/puppet/type/whole_line_spec.rb deleted file mode 100644 index f273baa..0000000 --- a/spec/unit/puppet/type/whole_line_spec.rb +++ /dev/null @@ -1,24 +0,0 @@ -require 'puppet' -require 'tempfile' -describe Puppet::Type.type(:whole_line) do - before :each do - @whole_line = Puppet::Type.type(:whole_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path') - end - it 'should accept a line and path' do - @whole_line[:line] = 'my_line' - @whole_line[:line].should == 'my_line' - end - it 'should accept posix filenames' do - @whole_line[:path] = '/tmp/path' - @whole_line[:path].should == '/tmp/path' - end - it 'should not accept unqualified path' do - expect { @whole_line[:path] = 'file' }.should raise_error(Puppet::Error, /File paths must be fully qualified/) - end - it 'should require that a line is specified' do - expect { Puppet::Type.type(:whole_line).new(:name => 'foo', :path => '/tmp/file') }.should raise_error(Puppet::Error, /Both line and path are required attributes/) - end - it 'should require that a file is specified' do - expect { Puppet::Type.type(:whole_line).new(:name => 'foo', :line => 'path') }.should raise_error(Puppet::Error, /Both line and path are required attributes/) - end -end -- 2.39.5