promotion 1.3.5 → 1.3.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+== Version 1.3.6
+- Allow multiple daemon entries, if they use the Name attribute.
+
 == 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 '*'

data/README

@@ -221,8 +221,10 @@ the destination folder specified.
 
 === +Daemon+
 To enable an application to startup automatically, a +Daemon+ element is needed. The name of the
-startup script is expected to be <code>/etc/rc.d/myapp</code>.
+startup script is expected to be <code>/etc/rc.d/myapp</code>, but may be overridden by the
+optional +Name+ attribute.
   <Daemon Flags="" Priority="10" User="" />
+  <Daemon Flags="-d $MYAPP_HOME" Priority="20" User="_myapp" Name="otherapp"/>
 
 The +Flags+ attribute contains the command line options provided to the executable by
 <code>/etc/rc.conf.local</code>.

data/lib/promotion/generator/rcconf.rb

@@ -32,7 +32,8 @@ module Rcconf
     }
     pkgScripts = []
     daemonSpecs.each { |spec|
-      name = spec.attributes["Name"]
+      # Name defaults to the name of the spec, but may be overridden by the optional Name attribute
+      name = spec.elements["/Specification/Daemon"].attributes["Name"] || spec.attributes["Name"]
       flags = spec.elements["/Specification/Daemon"].attributes["Flags"]
       contents << "#{name}_flags=\"#{flags}\" \n"
       pkgScripts << name

data/promotion.xsd

@@ -16,7 +16,7 @@
 				<xsd:element ref="Allfiles" minOccurs="0" maxOccurs="unbounded" />
 				<xsd:element ref="Zipfile" minOccurs="0" maxOccurs="unbounded" />
 				<xsd:element ref="Sudoers" minOccurs="0" maxOccurs="1" />
-				<xsd:element ref="Daemon" minOccurs="0" maxOccurs="1" />
+				<xsd:element ref="Daemon" minOccurs="0" maxOccurs="unbounded" />
 				<xsd:element ref="Environment" minOccurs="0" maxOccurs="1" />
 				<xsd:element ref="Crontab" minOccurs="0" maxOccurs="1" />
 				<xsd:element ref="Database" minOccurs="0" maxOccurs="1" />
@@ -288,6 +288,7 @@
 		<xsd:attribute name="Priority" type="xsd:nonNegativeInteger" use="optional" />
 		<xsd:attribute name="Flags" type="xsd:string" use="required" />
 		<xsd:attribute name="User" type="xsd:string" use="required" />
+		<xsd:attribute name="Name" type="xsd:NMTOKEN" use="optional" />
 	</xsd:attributeGroup>
 
 	<xsd:simpleType name="MODE">

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: promotion
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 23
   prerelease: 
   segments: 
   - 1
   - 3
-  - 5
-  version: 1.3.5
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Richard Kernahan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-27 00:00:00 Z
+date: 2012-09-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r