promotion 1.3.4 → 1.3.5

data/CHANGELOG

@@ -1,6 +1,7 @@
-== Version 1.3.4
+== Version 1.3.5
 - Schedule in newsyslog handles $-formats (starting with 'D', 'W', or 'M')
   and @-formats (containing 'T') as well as integer hours and '*'
+- More space for newsyslog columns
 
 == Version 1.3.2
 - Fixed defect in crontab where comments were not prefixed with #

data/lib/promotion/generator/newsyslog.rb

@@ -5,14 +5,14 @@ module Newsyslog
   # Writes the Newsyslog configuration
   def self.generate(specs)
     sym = "Newsyslog"
-		begin
-			originalContents = Promotion::Generator::original_contents_for(sym)
-      newContents = originalContents + Marker + contents(specs)
-			Promotion::Generator::write_file_for(sym, newContents)
-		rescue => e
-			$log.error("Error occurred while generating #{sym}\n#{e.message}" + e.backtrace.join("\n"))
-			exit 1
-		end
+    begin
+      originalContents = Promotion::Generator::original_contents_for(sym)
+      newContents = originalContents + Marker + "\n" + contents(specs)
+      Promotion::Generator::write_file_for(sym, newContents)
+    rescue => e
+      $log.error("Error occurred while generating #{sym}\n#{e.message}" + e.backtrace.join("\n"))
+      exit 1
+    end
   end
 
   # Generates the contents for /etc/newsyslog.conf, which controls rolling and retention of logs
@@ -22,7 +22,7 @@ module Newsyslog
     contents << "# It was generated by the promotion application and will be overwritten\n"
     contents << "# when the next promotion occurs.\n"
     contents << "# The previous section will be preserved\n\n"
-    contents << "# Filename								Owner:Group			Mode   Count  Size   When     Flags\n"
+    contents << "# Filename                              Owner:Group         Mode   Count  Size   When     Flags\n"
     specs.each { |spec|
       spec.elements.each("/Specification/Newsyslog") { |nsl|
         contents << "%-40s" % nsl.text()
@@ -38,7 +38,7 @@ module Newsyslog
         contents << "%-7s" % (nsl.attributes["Count"] || "*")
         contents << "%-7s" % (nsl.attributes["Size"] || "*")
         # treat as $-format if starts with D,W,M; treat as integer if integer
-				# else treat as @-format if digits with a 'T'
+        # else treat as @-format if digits with a 'T'
         sched = nsl.attributes["When"] || "*"
         if sched[0..0] == "D" or sched[0..0] == "W" or sched[0..0] == "M"
           contents << "$%-9s" % sched

data/lib/promotion/generator/profile.rb

@@ -7,7 +7,7 @@ module Profile
     sym = "Profile"
 		begin
       originalContents = Promotion::Generator::original_contents_for(sym)
-      newContents = originalContents + Marker + contents(specs)
+      newContents = originalContents + Marker + "\n" + contents(specs)
 			Promotion::Generator::write_file_for(sym, newContents)
 		rescue => e
 			$log.error("Error occurred while generating #{sym}\n#{e.message}" + e.backtrace.join("\n"))

data/lib/promotion/generator/rcconf.rb

@@ -7,7 +7,7 @@ module Rcconf
     sym = "Rc_conf"
 		begin
 			originalContents = Promotion::Generator::original_contents_for(sym)
-      newContents = originalContents + Marker + contents(specs)
+      newContents = originalContents + Marker + "\n" + contents(specs)
 			Promotion::Generator::write_file_for(sym, newContents)
 		rescue => e
 			$log.error("Error occurred while generating #{sym}\n#{e.message}" + e.backtrace.join("\n"))

data/lib/promotion/generator/sudoers.rb

@@ -7,7 +7,7 @@ module Sudoers
     sym = "Sudoers"
 		begin
       originalContents = Promotion::Generator::original_contents_for(sym)
-      newContents = originalContents + Marker + contents(specs)
+      newContents = originalContents + Marker + "\n" + contents(specs)
 			tempFilename = Promotion::Generator::write_file_for(sym, newContents, true)
 			$log.info("Checking temporary sudoers written to #{tempFilename}.")
 			visudoResults = `#{Files::Visudo} -c -f #{tempFilename}`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: promotion
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 3
-  - 4
-  version: 1.3.4
+  - 5
+  version: 1.3.5
 platform: ruby
 authors: 
 - Richard Kernahan