promotion 1.3.2 → 1.3.3

data/CHANGELOG

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

data/lib/promotion/generator/newsyslog.rb

@@ -37,7 +37,16 @@ module Newsyslog
         contents << "%-7s" % (nsl.attributes["Mode"] || "0640")
         contents << "%-7s" % (nsl.attributes["Count"] || "*")
         contents << "%-7s" % (nsl.attributes["Size"] || "*")
-        contents << "%-9s" % (nsl.attributes["When"] || "*")
+        # treat as $-format if starts with D,W,M; treat as integer if integer
+				# else treat as @-format if digits with a 'T'
+        sched = nsl.attributes["When"] || "*"
+        if sched[0] == "D" or sched[0] == "W" or sched[0] == "M"
+          contents << "$%-9s" % sched
+        elsif sched.include?("T")
+          contents << "@%-9s" % sched
+        else
+          contents << "%-9s" % sched
+        end
         contents << "Z" if (nsl.attributes["Zip"] || "true") == "true"
         contents << "B" if (nsl.attributes["Binary"] || "false") == "true"
         contents << "\n"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: promotion
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Richard Kernahan