auto_cron 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/auto_cron.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{auto_cron}
-  s.version = "0.1.3"
+  s.version = "0.1.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Farrill"]

data/lib/auto_cron/railtie.rb

@@ -1,9 +1,8 @@
 require 'auto_cron'
 require 'rails'
-module AutoCron
-  class Railtie < Rails::Railtie
-    rake_tasks do
-      load "tasks/auto_cron_tasks.rake"
-    end
+
+class Railtie < Rails::Railtie
+  rake_tasks do
+    load "tasks/auto_cron_tasks.rake"
   end
-end
+end

data/lib/auto_cron.rb

@@ -1,69 +1,67 @@
 require 'auto_cron/railtie' if defined?(Rails)
 
-module AutoCron
-  class AutoCron
-    def initialize( template, application )
-      require 'erb'
+class AutoCron
+  def initialize( template, application )
+    require 'erb'
 
-      @auto_cron_dir = File.join( Rails.root, "config", "auto_cron" )
-      @template = template
-      @application = application
-    end
-  
-    def updated_crontab
-      # Check for unopened or unclosed identifier blocks
-      if read_crontab.index(comment_open) && !read_crontab.index(comment_close)
-        warn "[fail] Unclosed indentifier; Your crontab file contains '#{comment_open}', but no '#{comment_close}'"
-        exit(1)
-      elsif !read_crontab.index(comment_open) && read_crontab.index(comment_close)
-        warn "[fail] Unopened indentifier; Your crontab file contains '#{comment_close}', but no '#{comment_open}'"
-        exit(1)
-      end
-    
-      # If an existing identier block is found, replace it with the new cron entries
-      if read_crontab.index(comment_open) && read_crontab.index(comment_close)
-        read_crontab.gsub(Regexp.new("#{comment_open}.+#{comment_close}", Regexp::MULTILINE), auto_cron_wrapped.chomp)
-      else # Otherwise, append the new cron entries after any existing ones
-        [read_crontab, auto_cron_wrapped].join("\n\n")
-      end
-    end
-  
-  protected
+    @auto_cron_dir = File.join( Rails.root, "config", "auto_cron" )
+    @template = template
+    @application = application
+  end
 
-    def auto_cron_wrapped
-      @auto_cron_wrapped ||= [comment_open, auto_cron_inner, comment_close].join("\n") + "\n"
-    end
-  
-    def auto_cron_inner
-      header_template = File.join( @auto_cron_dir, 'header.erb' ) 
-      header = if File.exist?( header_template )
-        ERB.new( File.read( header_template ) ).result
-      else
-        ''
-      end
-      full_template_path = File.join( @auto_cron_dir, "#{ @template }.erb" )
-      header + "\n\n" + ERB.new( File.read( full_template_path ) ).result
+  def updated_crontab
+    # Check for unopened or unclosed identifier blocks
+    if read_crontab.index(comment_open) && !read_crontab.index(comment_close)
+      warn "[fail] Unclosed indentifier; Your crontab file contains '#{comment_open}', but no '#{comment_close}'"
+      exit(1)
+    elsif !read_crontab.index(comment_open) && read_crontab.index(comment_close)
+      warn "[fail] Unopened indentifier; Your crontab file contains '#{comment_close}', but no '#{comment_open}'"
+      exit(1)
     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 : ''
+    # If an existing identier block is found, replace it with the new cron entries
+    if read_crontab.index(comment_open) && read_crontab.index(comment_close)
+      read_crontab.gsub(Regexp.new("#{comment_open}.+#{comment_close}", Regexp::MULTILINE), auto_cron_wrapped.chomp)
+    else # Otherwise, append the new cron entries after any existing ones
+      [read_crontab, auto_cron_wrapped].join("\n\n")
     end
-  
-    def comment_base
-      "auto_cron generated tasks for: #{ @application }"
-    end
-  
-    def comment_open
-      "# Begin #{ comment_base }"
-    end
-  
-    def comment_close
-      "# End #{ comment_base }"
+  end
+
+protected
+
+  def auto_cron_wrapped
+    @auto_cron_wrapped ||= [comment_open, auto_cron_inner, comment_close].join("\n") + "\n"
+  end
+
+  def auto_cron_inner
+    header_template = File.join( @auto_cron_dir, 'header.erb' ) 
+    header = if File.exist?( header_template )
+      ERB.new( File.read( header_template ) ).result
+    else
+      ''
     end
+    full_template_path = File.join( @auto_cron_dir, "#{ @template }.erb" )
+    header + "\n\n" + ERB.new( File.read( full_template_path ) ).result
+  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 : ''
   end
-end
+
+  def comment_base
+    "auto_cron generated tasks for: #{ @application }"
+  end
+
+  def comment_open
+    "# Begin #{ comment_base }"
+  end
+
+  def comment_close
+    "# End #{ comment_base }"
+  end
+
+end

data/lib/tasks/auto_cron_tasks.rake

@@ -3,7 +3,8 @@ require File.dirname(__FILE__) + "/../auto_cron"
 desc "Generates the auto-cron and saves it to the crontab"
 task :auto_cron do
   require 'tempfile'
-  cron_body = AutoCron.auto_cron ENV['TEMPLATE']
+  auto_cron = AutoCron.new ENV['TEMPLATE'], 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|
     file << cron_body

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: auto_cron
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alex Farrill