From 52edb7fd28750a5bb05f0c65037fbeb1e42e9857 Mon Sep 17 00:00:00 2001
From: David Dollar <ddollar@gmail.com>
Date: Fri, 15 Oct 2010 15:53:27 -0700
Subject: [PATCH] move data under data

---
 {example => data/example}/Procfile                      | 0
 {example => data/example}/error                         | 0
 data/example/log/neverdie.log                           | 4 ++++
 {example => data/example}/ticker                        | 0
 {export => data/export}/upstart/master.conf.erb         | 0
 {export => data/export}/upstart/process.conf.erb        | 0
 {export => data/export}/upstart/process_master.conf.erb | 0
 foreman.gemspec                                         | 1 -
 lib/foreman/export/base.rb                              | 2 +-
 9 files changed, 5 insertions(+), 2 deletions(-)
 rename {example => data/example}/Procfile (100%)
 rename {example => data/example}/error (100%)
 create mode 100644 data/example/log/neverdie.log
 rename {example => data/example}/ticker (100%)
 rename {export => data/export}/upstart/master.conf.erb (100%)
 rename {export => data/export}/upstart/process.conf.erb (100%)
 rename {export => data/export}/upstart/process_master.conf.erb (100%)

diff --git a/example/Procfile b/data/example/Procfile
similarity index 100%
rename from example/Procfile
rename to data/example/Procfile
diff --git a/example/error b/data/example/error
similarity index 100%
rename from example/error
rename to data/example/error
diff --git a/data/example/log/neverdie.log b/data/example/log/neverdie.log
new file mode 100644
index 0000000..a8ce255
--- /dev/null
+++ b/data/example/log/neverdie.log
@@ -0,0 +1,4 @@
+tick
+tick
+./never_die:6:in `sleep': Interrupt
+	from ./never_die:6
diff --git a/example/ticker b/data/example/ticker
similarity index 100%
rename from example/ticker
rename to data/example/ticker
diff --git a/export/upstart/master.conf.erb b/data/export/upstart/master.conf.erb
similarity index 100%
rename from export/upstart/master.conf.erb
rename to data/export/upstart/master.conf.erb
diff --git a/export/upstart/process.conf.erb b/data/export/upstart/process.conf.erb
similarity index 100%
rename from export/upstart/process.conf.erb
rename to data/export/upstart/process.conf.erb
diff --git a/export/upstart/process_master.conf.erb b/data/export/upstart/process_master.conf.erb
similarity index 100%
rename from export/upstart/process_master.conf.erb
rename to data/export/upstart/process_master.conf.erb
diff --git a/foreman.gemspec b/foreman.gemspec
index c1fb004..eeff42e 100644
--- a/foreman.gemspec
+++ b/foreman.gemspec
@@ -9,5 +9,4 @@ Parka::Specification.new do |gem|
 
   gem.executables  = "foreman"
   gem.files       << "man/foreman.1"
-  gem.files       << Dir["export/**/*"]
 end
diff --git a/lib/foreman/export/base.rb b/lib/foreman/export/base.rb
index bb70511..c89cf17 100644
--- a/lib/foreman/export/base.rb
+++ b/lib/foreman/export/base.rb
@@ -24,7 +24,7 @@ private ######################################################################
   end
 
   def export_template(name)
-    File.read(File.expand_path("../../../../export/#{name}", __FILE__))
+    File.read(File.expand_path("../../../../data/export/#{name}", __FILE__))
   end
 
   def write_file(filename, contents)