promotion 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,9 +1,14 @@
+== Version 1.2.1
+- Added Clear attribute to Folder.
+- Fixed crontab generation. crontabs are generated completely - prior 
+  contents is not preserved (due to the nature of crontabs) 
+
 == Version 1.2.0
 - Make Promotion a better gem citizen by making the installation of executables
-  an explicit command, as shown in the post-installation message. 
+  an explicit command, as shown in the post-installation message.
 
 === Version 1.1.0
-- Added dependency on log4r. 
+- Added dependency on log4r.
 - Fixed several broken dependencies caused by converting to a gem.
 
 === Version 1.0.9

data/README

@@ -174,7 +174,7 @@ Before we can move files into place, we need the Folders set up:
   <Folders Mode="0750" Owner="root" Group="wheel">
     <Folder Owner="_mysql" Group="_mysql">/var/mysql</Folder>
     <Folder>/home/myapp</Folder>
-    <Folder>/var/myapp</Folder>
+    <Folder Clear="true">/var/myapp</Folder>
   </Folders>
 You can have several +Folders+ elements, if desired. The defaults for all +Folder+
 child elements may be set as attributes of the parent +Folders+ element. In this example,
@@ -182,6 +182,9 @@ all the folders will have permissions <code>rwxr-x---</code>, and ownership of <
 Note that the folder <code>/var/mysql</code> has a different owner and group. Any Folder can
 override the default Mode, Owner, and Group.
 
+The optional +Clear+ attribute will clear the contents of the folder (actually it completely
+removes the folder and recreates it). This happens before files are copied to it of course.
+
 === +Files+
 Finally we can specify how to move the files into place:
   <Files Owner="root" Group="wheel" Mode="0644" Source="conf">

data/lib/promotion/generator.rb

@@ -175,16 +175,12 @@ class Generator
 			schedules.each { |user, crontablist|
 				generatedContents = generator.result(binding)
 				userCrontab = File.expand_path(user, Folders::Crontabs)
-				begin
-					originalContents = IO.readlines(userCrontab,"")[0].split(@marker)[0]
-				rescue
-					originalContents = ""
-				end
-				newContents = [originalContents, @marker, generatedContents].join("\n")
 				begin
 					tempFilename = user + ".tmp"
 					tempFile = File.new(tempFilename, File::WRONLY | File::CREAT | File::TRUNC)
-					tempFile.puts(newContents)
+					tempFile.puts(generatedContents)
+					# previous cron jobs are *NOT* preserved - the tab is competely generated!
+					# otherwise we'll double the crontab each time we run.
 				ensure
 					tempFile.close unless tempFile.nil? || tempFile.closed?
 				end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: promotion
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Richard Kernahan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-20 00:00:00 Z
+date: 2012-09-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: log4r
@@ -76,10 +76,8 @@ files:
 homepage: http://rubygems.org/gems/promotion
 licenses: []
 
-post_install_message: "\n\
-  \t\n  To install the executables (promote, evolve, devolve, mkdeploy)\n  issue the following command:\n\
-  \t$ sudo ruby -rubygems -e \"require 'promotion/install'\"\n\
-  \t\n  "
+post_install_message: "\n\n  To install the executables (promote, evolve, devolve, mkdeploy)\n  issue the following command:\n\
+  \t$ sudo ruby -rubygems -e \"require 'promotion/install'\"\n\n  "
 rdoc_options: 
 - --title
 - Promotion