From 1d0768e0ab0e69e65cf3862d81b6ee264776c658 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 12:42:19 +0200
Subject: [PATCH 1/6] whenever fix

---
 config/schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/schedule.rb b/config/schedule.rb
index d1be9f7b1..221dddc95 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -5,7 +5,7 @@
 
 # rbenv support
 rbenv = 'export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";'
-path  = Whenever.path.join('../../current')
+path  = Whenever.path.sub(/\/releases\/.*/, '/current')
 set :job_template, "/bin/bash -l -c '#{rbenv} :job'"
 job_type :runner, "#{path}/bin/rails r -e :environment ':task' :output"
 

From a24a70093980366b114da74beac553228fe92525 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 14:01:14 +0200
Subject: [PATCH 2/6] update whenver

---
 config/schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/schedule.rb b/config/schedule.rb
index 221dddc95..69c11c348 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -7,7 +7,7 @@
 rbenv = 'export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";'
 path  = Whenever.path.sub(/\/releases\/.*/, '/current')
 set :job_template, "/bin/bash -l -c '#{rbenv} :job'"
-job_type :runner, "#{path}/bin/rails r -e :environment ':task' :output"
+job_type :runner, "cd #{path} && bin/rails r -e :environment ':task' :output"
 
 # cron output
 set :output, 'log/cron.log'

From b56e4eb0ed65fae381722b97775858bd4fe5ef61 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 14:11:24 +0200
Subject: [PATCH 3/6] update whenever job_type

---
 config/schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/schedule.rb b/config/schedule.rb
index 69c11c348..c12de01ff 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -7,7 +7,7 @@
 rbenv = 'export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";'
 path  = Whenever.path.sub(/\/releases\/.*/, '/current')
 set :job_template, "/bin/bash -l -c '#{rbenv} :job'"
-job_type :runner, "cd #{path} && bin/rails r -e :environment ':task' :output"
+job_type :runner, "cd #{path} && bin/rails r -e :environment \":task\" :output"
 
 # cron output
 set :output, 'log/cron.log'

From f3ee8ccb19d27404e0f2da62146ac37e1235fdae Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 14:17:28 +0200
Subject: [PATCH 4/6] STDOUT didn't work, use puts instead

---
 app/models/zonefile_setting.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/zonefile_setting.rb b/app/models/zonefile_setting.rb
index 96f692fae..d729370cb 100644
--- a/app/models/zonefile_setting.rb
+++ b/app/models/zonefile_setting.rb
@@ -11,7 +11,7 @@ class ZonefileSetting < ActiveRecord::Base
   def self.generate_zonefile(origin)
     filename = "#{origin}.zone"
 
-    STDOUT << "#{Time.now.utc} - Generating zonefile #{filename}\n"
+    puts "#{Time.now.utc} - Generating zonefile #{filename}\n"
 
     zf = ActiveRecord::Base.connection.execute(
       "select generate_zonefile('#{origin}')"
@@ -19,7 +19,7 @@ class ZonefileSetting < ActiveRecord::Base
 
     File.open("#{APP_CONFIG['zonefile_export_dir']}/#{filename}", 'w') { |f| f.write(zf) }
 
-    STDOUT << "#{Time.now.utc} - Successfully generated zonefile #{filename}\n"
+    puts "#{Time.now.utc} - Successfully generated zonefile #{filename}\n"
   end
 
   def to_s

From 715456c6bbe37e757a1075905ef711c6dff00bf6 Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 14:21:46 +0200
Subject: [PATCH 5/6] revert STDOUT back

---
 app/models/zonefile_setting.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/zonefile_setting.rb b/app/models/zonefile_setting.rb
index d729370cb..96f692fae 100644
--- a/app/models/zonefile_setting.rb
+++ b/app/models/zonefile_setting.rb
@@ -11,7 +11,7 @@ class ZonefileSetting < ActiveRecord::Base
   def self.generate_zonefile(origin)
     filename = "#{origin}.zone"
 
-    puts "#{Time.now.utc} - Generating zonefile #{filename}\n"
+    STDOUT << "#{Time.now.utc} - Generating zonefile #{filename}\n"
 
     zf = ActiveRecord::Base.connection.execute(
       "select generate_zonefile('#{origin}')"
@@ -19,7 +19,7 @@ class ZonefileSetting < ActiveRecord::Base
 
     File.open("#{APP_CONFIG['zonefile_export_dir']}/#{filename}", 'w') { |f| f.write(zf) }
 
-    puts "#{Time.now.utc} - Successfully generated zonefile #{filename}\n"
+    STDOUT << "#{Time.now.utc} - Successfully generated zonefile #{filename}\n"
   end
 
   def to_s

From 9e824a43f80a05f9e544717b4c9f9e4e3077192f Mon Sep 17 00:00:00 2001
From: Priit Tark <priit@gitlab.eu>
Date: Thu, 8 Jan 2015 14:29:58 +0200
Subject: [PATCH 6/6] syntax cleanup

---
 config/schedule.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/schedule.rb b/config/schedule.rb
index c12de01ff..68d484da2 100644
--- a/config/schedule.rb
+++ b/config/schedule.rb
@@ -5,7 +5,7 @@
 
 # rbenv support
 rbenv = 'export PATH="$HOME/.rbenv/bin:$PATH";eval "$(rbenv init -)";'
-path  = Whenever.path.sub(/\/releases\/.*/, '/current')
+path  = Whenever.path.sub(%r(\/releases\/.*), '/current')
 set :job_template, "/bin/bash -l -c '#{rbenv} :job'"
 job_type :runner, "cd #{path} && bin/rails r -e :environment \":task\" :output"