Changed the type name from append_line to
whole_line.
After feedback that having a type with a verb in
the name was confusing.
Signed-off-by: Dan Bode <d...@puppetlabs.com>
---
.../provider/{append_line => whole_line}/ruby.rb | 2 +-
lib/puppet/type/{append_line.rb => whole_line.rb} | 6 ++--
.../{append_line => whole_line}/ruby_spec.rb | 4 +-
spec/unit/puppet/type/append_line_spec.rb | 24 --------------------
spec/unit/puppet/type/whole_line_spec.rb | 24 ++++++++++++++++++++
tests/{append_line.pp => whole_line.pp} | 4 +-
6 files changed, 32 insertions(+), 32 deletions(-)
rename lib/puppet/provider/{append_line => whole_line}/ruby.rb (82%)
rename lib/puppet/type/{append_line.rb => whole_line.rb} (85%)
rename spec/unit/puppet/provider/{append_line => whole_line}/ruby_spec.rb (86%)
delete mode 100644 spec/unit/puppet/type/append_line_spec.rb
create mode 100644 spec/unit/puppet/type/whole_line_spec.rb
rename tests/{append_line.pp => whole_line.pp} (58%)
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 5e78659..156f255 100644
--- 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 b3f926c..f231602 100644
--- 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 ea28c31..9faff2c 100644
--- 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
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
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 f50a833..1302989 100644
--- 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',
}
--
1.7.5.4
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
