auto_cron 0.1.10 → 0.1.12

data/Gemfile

@@ -9,5 +9,6 @@ group :development do
   # gem "shoulda", ">= 0"
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
+  gem "rake", "0.9.2"
   gem "rcov", ">= 0"
 end

data/Gemfile.lock

@@ -15,4 +15,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  rake (= 0.9.2)
   rcov

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.12

data/auto_cron.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{auto_cron}
-  s.version = "0.1.10"
+  s.version = "0.1.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Farrill"]
-  s.date = %q{2011-09-04}
+  s.date = %q{2011-11-19}
   s.description = %q{Generate a crontab}
   s.email = %q{alex.farrill@gmail.com}
   s.extra_rdoc_files = [
@@ -49,15 +49,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["= 0.9.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["= 0.9.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["= 0.9.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
   end
 end

data/lib/auto_cron.rb

@@ -1,11 +1,11 @@
 require 'auto_cron/railtie' if defined?(Rails)
 
 class AutoCron
-  def initialize( template, application )
+  def initialize( templates, application )
     require 'erb'
 
     @auto_cron_dir = File.join( Rails.root, "config", "auto_cron" )
-    @template = template
+    @templates = templates.split(",")
     @application = application
   end
 
@@ -41,18 +41,14 @@ protected
     else
       ''
     end
-    full_template_path = File.join( @auto_cron_dir, "#{ @template }.erb" )
-    header + "\n\n" + ERB.new( File.read( full_template_path ) ).result
+    @templates.each do |template|
+      full_template_path = File.join( @auto_cron_dir, "#{ template }.erb" )
+      header + "\n\n" + ERB.new( File.read( full_template_path ) ).result
+    end
   end
 
   def read_crontab
-    return @current_crontab if @current_crontab
-  
-    # command = ['crontab -l']
-    # command_results  = %x[#{command.join(' ')} 2> /dev/null]
-    # @current_crontab = $?.exitstatus.zero? ? command_results : ''
-    
-    @current_crontab = %x[crontab -l 2> /dev/null]
+    @current_crontab ||= %x[crontab -l 2> /dev/null]
   end
 
   def comment_base

data/lib/auto_cron/railtie.rb

@@ -1,5 +1,4 @@
 require 'auto_cron'
-require 'rails'
 
 class Railtie < Rails::Railtie
   rake_tasks do

data/lib/capistrano/auto_cron.rb

@@ -1,21 +1,16 @@
 Capistrano::Configuration.instance.load do
   namespace :auto_cron do
-    task :publish, :roles => :publish do
-      run "cd #{release_path} && #{rake} TEMPLATE=publish APPLICATION=#{application} RAILS_ENV=#{rails_env} auto_cron"
-    end
-
-    desc "Connects to each box individually and installs the specified cron 
-          USAGE:: role :publish_cron, 'prilb', :crontab => 'cron' " 
-    task :publish_crons, :roles => :publish_cron do
+    desc "Connects to each box individually and installs the specifed cron 
+          USAGE:: role :publish_cron, 'prilb', :crontabs => %w( publish production ) " 
+    task :publish_crons, :roles => :publish_crons do
       find_servers_for_task( current_task ).each do |sd|
         establish_connections_to( sd )
         targets = []
         targets.push sessions[sd]
-
-        Command.process( "cd #{release_path} && #{rake} TEMPLATE=#{sd.options[:crontab]} RAILS_ENV=#{rails_env} auto_cron", 
+        Command.process( "cd #{release_path} && #{rake} TEMPLATES=#{sd.options[:crontabs].join(",")} APPLICATION=#{application} RAILS_ENV=#{rails_env} auto_cron", 
                           targets, options.merge(:logger => logger), &block)
 
-        logger.debug "creating crontab:#{sd.options[:crontab]} on #{sd.host}"
+        logger.debug "creating crontabs: #{sd.options[:crontabs].join(", ")} on #{sd.host}"
       end
     end
   end

data/lib/tasks/auto_cron_tasks.rake

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + "/../auto_cron"
 desc "Generates the auto-cron and saves it to the crontab"
 task :auto_cron do
   require 'tempfile'
-  auto_cron = AutoCron.new ENV['TEMPLATE'], ENV['APPLICATION']
+  auto_cron = AutoCron.new ENV['TEMPLATES'], ENV['APPLICATION']
   cron_body = auto_cron.updated_crontab
   tmp_cron_path = Tempfile.new( 'auto_cron' ).path
   File.open( tmp_cron_path, File::WRONLY | File::APPEND ) do |file|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_cron
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Alex Farrill
@@ -15,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-04 00:00:00 -04:00
+date: 2011-11-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -30,12 +30,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id001
   type: :development
   name: bundler
   prerelease: false
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +46,28 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  requirement: *id002
   type: :development
   name: jeweler
   prerelease: false
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  requirement: *id003
+  type: :development
+  name: rake
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,10 +76,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   type: :development
   name: rcov
   prerelease: false
-  version_requirements: *id003
 description: Generate a crontab
 email: alex.farrill@gmail.com
 executables: []