Skip to content

Commit

Permalink
(maint) Ensure every file has a trailing newlines
Browse files Browse the repository at this point in the history
Without this patch some files exist in the tree that don't have trailing
newlines.  This is annoying because perl -pli.bak -e will automatically
add a newline to every file it modifies in place.  The files that
actually have modifications by the global search and replace need to be
separated from the files that only have newlines added.

This patch simply adds newlines to everything if they don't exist on the
last line.

Yes, the PNG's are perfectly fine with a trailing newline as well.
  • Loading branch information
Jeff McCune committed Apr 23, 2012
1 parent 0ee259f commit 5117e12
Show file tree
Hide file tree
Showing 34 changed files with 31 additions and 31 deletions.
Binary file modified autotest/images/fail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified autotest/images/pass.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified autotest/images/pending.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion conf/osx/preflight
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
/bin/rm -Rf "${3}{BINDIR}/puppetd"
/bin/rm -Rf "${3}{BINDIR}/puppetmasterd"
/bin/rm -Rf "${3}{BINDIR}/puppetqd"
/bin/rm -Rf "${3}{BINDIR}/puppetrun"
/bin/rm -Rf "${3}{BINDIR}/puppetrun"
2 changes: 1 addition & 1 deletion lib/puppet/indirector/facts/network_device.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ def destroy(facts)
def save(facts)
raise Puppet::DevError, "You cannot save facts to the code store; it is only used for getting facts from a remote device"
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/type/vlan.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
newparam(:device_url) do
desc "The URL of the router or switch maintaining this VLAN."
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/instrumentation/indirection_probe.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ def to_pson(*args)
def self.from_pson(data)
self.new(data["name"])
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/instrumentation/instrumentable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@ def self.each_probe
}
nil # do not leak our probes to the exterior world
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/instrumentation/listeners/log.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ def data
@last_logs.dup
}
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/instrumentation/listeners/performance.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ def data
@samples.dup
end
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ def initialize(url)
@transport.password = @url.password
end
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/cisco.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

module Puppet::Util::NetworkDevice::Cisco

end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/cisco/facts.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,4 @@ def uptime_to_seconds(uptime)
end
end

end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/cisco/interface.rb
Original file line number Diff line number Diff line change
Expand Up @@ -79,4 +79,4 @@ def command(command)
Puppet.err "Error while executing #{command}, device returned #{out}" if out =~ /^%/mo
end
end
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@ def parse_directive(device, var, value, count)
end
end

end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/ipcalc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ def prefix_length(netmask)
def linklocal?(ip)
end

end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/transport.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# stub
module Puppet::Util::NetworkDevice::Transport
end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/transport/base.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ def command(cmd, options = {})
end
end

end
end
2 changes: 1 addition & 1 deletion lib/puppet/util/network_device/transport/ssh.rb
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,4 @@ def process_ssh
end
end
end
end
end
2 changes: 1 addition & 1 deletion spec/fixtures/releases/jamtur01-apache/metadata.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"dependencies":[],"types":[{"providers":[{"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu Required binaries: ``a2enmod``, ``a2dismod``. Default for ``operatingsystem`` == ``debianubuntu``. "}],"parameters":[{"name":"name","doc":"The name of the module to be managed"}],"properties":[{"name":"ensure","doc":"The basic property that the resource should be in. Valid values are ``present``, ``absent``."}],"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu"}],"checksums":{"manifests/params.pp":"71734796921dbdbfd58f503622527616","tests/ssl.pp":"191912535199531fd631f911c6329e56","tests/vhost.pp":"1b91e03c8ef89a7ecb6793831ac18399","manifests/php.pp":"b78cc593f1c4cd800c906e0891c9b11f","files/httpd":"295f5e924afe6f752d29327e73fe6d0a","tests/php.pp":"ce7bb9eef69d32b42a32ce32d9653625","lib/puppet/provider/a2mod/a2mod.rb":"18c5bb180b75a2375e95e07f88a94257","files/test.vhost":"0602022c19a7b6b289f218c7b93c1aea","manifests/ssl.pp":"b4334a161a2ba5fa8a62cf7b38f352c8","manifests/dev.pp":"510813942246cc9a7786d8f2d8874a35","manifests/vhost.pp":"cbc4657b0cce5cd432057393d5f6b0c2","tests/init.pp":"4eac4a7ef68499854c54a78879e25535","lib/puppet/type/a2mod.rb":"0e1b4843431413a10320ac1f6a055d15","tests/apache.pp":"4eac4a7ef68499854c54a78879e25535","tests/dev.pp":"4cf15c1fecea3ca86009f182b402c7ab","templates/vhost-default.conf.erb":"9055aed946e1111c30ab81fedac2c8b0","manifests/init.pp":"dc503e26e8021351078813b541c4bd3d","Modulefile":"d43334b4072cd1744121b3b25cd9ed15"},"version":"0.0.1","name":"jamtur01-apache"}
{"dependencies":[],"types":[{"providers":[{"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu Required binaries: ``a2enmod``, ``a2dismod``. Default for ``operatingsystem`` == ``debianubuntu``. "}],"parameters":[{"name":"name","doc":"The name of the module to be managed"}],"properties":[{"name":"ensure","doc":"The basic property that the resource should be in. Valid values are ``present``, ``absent``."}],"name":"a2mod","doc":"Manage Apache 2 modules on Debian and Ubuntu"}],"checksums":{"manifests/params.pp":"71734796921dbdbfd58f503622527616","tests/ssl.pp":"191912535199531fd631f911c6329e56","tests/vhost.pp":"1b91e03c8ef89a7ecb6793831ac18399","manifests/php.pp":"b78cc593f1c4cd800c906e0891c9b11f","files/httpd":"295f5e924afe6f752d29327e73fe6d0a","tests/php.pp":"ce7bb9eef69d32b42a32ce32d9653625","lib/puppet/provider/a2mod/a2mod.rb":"18c5bb180b75a2375e95e07f88a94257","files/test.vhost":"0602022c19a7b6b289f218c7b93c1aea","manifests/ssl.pp":"b4334a161a2ba5fa8a62cf7b38f352c8","manifests/dev.pp":"510813942246cc9a7786d8f2d8874a35","manifests/vhost.pp":"cbc4657b0cce5cd432057393d5f6b0c2","tests/init.pp":"4eac4a7ef68499854c54a78879e25535","lib/puppet/type/a2mod.rb":"0e1b4843431413a10320ac1f6a055d15","tests/apache.pp":"4eac4a7ef68499854c54a78879e25535","tests/dev.pp":"4cf15c1fecea3ca86009f182b402c7ab","templates/vhost-default.conf.erb":"9055aed946e1111c30ab81fedac2c8b0","manifests/init.pp":"dc503e26e8021351078813b541c4bd3d","Modulefile":"d43334b4072cd1744121b3b25cd9ed15"},"version":"0.0.1","name":"jamtur01-apache"}
2 changes: 1 addition & 1 deletion spec/fixtures/unit/parser/lexer/arithmetic_expression.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
$result = ((( $two + 2) / $one) + 4 * 5.45) - (6 << 7) + (0x800 + -9)


notice("result is $result == 1295.87692307692")
notice("result is $result == 1295.87692307692")
2 changes: 1 addition & 1 deletion spec/fixtures/yaml/report0.25.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@
- Total
- 0
records: {}
time: 2010-09-23 16:17:26.987789 -07:00
time: 2010-09-23 16:17:26.987789 -07:00
2 changes: 1 addition & 1 deletion spec/fixtures/yaml/report2.6.x.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -187,4 +187,4 @@
- hourly
time: 2010-09-23 15:44:06.432185 -07:00
version: 1285281846
time: 2010-09-23 15:44:05.894401 -07:00
time: 2010-09-23 15:44:05.894401 -07:00
2 changes: 1 addition & 1 deletion spec/integration/network/rest_authconfig_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ def request(args = {})
@auth.should_not allow(request)
end

end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation/data_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
it "should return a hash containing data when unserializing from pson" do
Puppet::Util::Instrumentation::Data.from_pson({:name => "name"}).should == {:name => "name"}
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation/indirection_probe_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
probe = Puppet::Util::Instrumentation::IndirectionProbe.new("probe")
probe.should set_json_attribute('name').to("probe")
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation/instrumentable_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -183,4 +183,4 @@ def mymethod(arg1,arg2,arg3)
Puppet::Util::Instrumentation::Instrumentable.enable_probes
ProbeTest2.new.should respond_to(:instrumented_mymethod)
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation/listener_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,4 +97,4 @@
Puppet::Util::Instrumentation::Listener.from_pson({"name" => "listener", "enabled" => true})
end
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation/listeners/log_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@
25.times { @log.notify(:test, :stop, { :started => Time.at(123456789), :finished => Time.at(123456790)}) }
@log.data[:test].size.should == 20
end
end
end
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@
@performance.notify(:test, :start, { :started => Time.at(123456789)})
@performance.data.should be_empty
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/instrumentation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -178,4 +178,4 @@
end
end
end
end
end
2 changes: 1 addition & 1 deletion spec/unit/util/reference_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,4 @@
EOT
end

end
end
2 changes: 1 addition & 1 deletion tasks/rake/manpages.rake
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ task :gen_manpages do
%x{#{ronn} #{ronn_args} ./man/man8/puppet-resource.8.ronn}
FileUtils.rm("./man/man8/puppet-resource.8.ronn")

end
end
2 changes: 1 addition & 1 deletion test/data/snippets/arithmetic_expression.pp
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
$result = ((( $two + 2) / $one) + 4 * 5.45) - (6 << 7) + (0x800 + -9)


notice("result is $result == 1295.87692307692")
notice("result is $result == 1295.87692307692")

0 comments on commit 5117e12

Please sign in to comment.