(#8665) Change type from append_line to whole_line

Changed the type name from append_line to
whole_line.

After feedback that having a type with a verb in
the name was confusing.

diff --git a/lib/puppet/provider/append_line/ruby.rb b/lib/puppet/provider/whole_line/ruby.rb
similarity index 82%
rename from lib/puppet/provider/append_line/ruby.rb
rename to lib/puppet/provider/whole_line/ruby.rb
index 5e78659568785395f46f801b613cda13dde8b8c9..156f2559de876047ad26f5046045a8ed3895ff75 100644 (file)
--- a/lib/puppet/provider/append_line/ruby.rb
+++ b/lib/puppet/provider/whole_line/ruby.rb
@@ -1,4 +1,4 @@
-Puppet::Type.type(:append_line).provide(:ruby) do
+Puppet::Type.type(:whole_line).provide(:ruby) do
 
   def exists?
     File.readlines(resource[:path]).find do |line|

diff --git a/lib/puppet/type/append_line.rb b/lib/puppet/type/whole_line.rb
similarity index 85%
rename from lib/puppet/type/append_line.rb
rename to lib/puppet/type/whole_line.rb
index b3f926caaf669fed4688aef6d7490bf7cf1fb34b..f231602f4a6e9d3ddfccfb5757e53de91be1d249 100644 (file)
--- a/lib/puppet/type/append_line.rb
+++ b/lib/puppet/type/whole_line.rb
@@ -1,11 +1,11 @@
-Puppet::Type.newtype(:append_line) do
+Puppet::Type.newtype(:whole_line) do
 
   desc <<-EOT
-  Type that can append a line to a file if it does not already contain it.
+  Type that can append whole a line to a file if it does not already contain it.
 
   Example:
 
-  append_line { 'sudo_rule':
+  whole_line { 'sudo_rule':
     path => '/etc/sudoers',
     line => '%admin ALL=(ALL) ALL',
   }

diff --git a/spec/unit/puppet/provider/append_line/ruby_spec.rb b/spec/unit/puppet/provider/whole_line/ruby_spec.rb
similarity index 86%
rename from spec/unit/puppet/provider/append_line/ruby_spec.rb
rename to spec/unit/puppet/provider/whole_line/ruby_spec.rb
index ea28c31efc49edec9ba010bfb6ebe6856baa25ed..9faff2c4cb5d6886ec4db2854c40ec8d5f52547e 100644 (file)
--- a/spec/unit/puppet/provider/append_line/ruby_spec.rb
+++ b/spec/unit/puppet/provider/whole_line/ruby_spec.rb
@@ -1,12 +1,12 @@
 require 'puppet'
 require 'tempfile'
-provider_class = Puppet::Type.type(:append_line).provider(:ruby)
+provider_class = Puppet::Type.type(:whole_line).provider(:ruby)
 describe provider_class do
   before :each do
     tmp = Tempfile.new('tmp')
     @tmpfile = tmp.path
     tmp.close!
-    @resource = Puppet::Type::Append_line.new(
+    @resource = Puppet::Type::Whole_line.new(
       {:name => 'foo', :path => @tmpfile, :line => 'foo'}
     )
     @provider = provider_class.new(@resource)

diff --git a/spec/unit/puppet/type/append_line_spec.rb b/spec/unit/puppet/type/append_line_spec.rb
deleted file mode 100644 (file)
index d0564c3..0000000
--- a/spec/unit/puppet/type/append_line_spec.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'puppet'
-require 'tempfile'
-describe Puppet::Type.type(:append_line) do
-  before :each do
-    @append_line = Puppet::Type.type(:append_line).new(:name => 'foo', :line => 'line', :path => '/tmp/path')
-  end
-  it 'should accept a line and path' do
-    @append_line[:line] = 'my_line'
-    @append_line[:line].should == 'my_line'
-  end
-  it 'should accept posix filenames' do
-    @append_line[:path] = '/tmp/path'
-    @append_line[:path].should == '/tmp/path'
-  end
-  it 'should not accept unqualified path' do
-    expect { @append_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(:append_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(:append_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
new file mode 100644 (file)
index 0000000..f273baa
--- /dev/null
+++ b/spec/unit/puppet/type/whole_line_spec.rb
@@ -0,0 +1,24 @@
+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

diff --git a/tests/append_line.pp b/tests/whole_line.pp
similarity index 58%
rename from tests/append_line.pp
rename to tests/whole_line.pp
index f50a833244988c2245bd286a72f7361dfefd28fb..1302989afed179774a1b30a44407b2253017ebba 100644 (file)
--- a/tests/append_line.pp
+++ b/tests/whole_line.pp
@@ -1,7 +1,7 @@
 file { '/tmp/dansfile':
   ensure => present
 }->
-append_line { 'dans_line':
+whole_line { 'dans_line':
   line => 'dan is awesome',
-  #path => '/tmp/dansfile',
+  path => '/tmp/dansfile',
 }