whenever 0.6.2 → 0.6.6

data/.gitignore

@@ -2,3 +2,4 @@
 pkg
 doc
 .*.sw[a-z]
+Gemfile.lock

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### 0.6.6 / March 8th, 2011
+
+* Fix unclosed identifier bug. #119 [Javan Makhmali]
+
+
+### 0.6.5 / March 8th, 2011
+
+* Preserve whitespace at the end of crontab file. #95 [Rich Meyers]
+
+* Setting nil or blank environment variables now properly formats output. [T.J. VanSlyke]
+
+* Allow raw cron sytax, added -i to bash job template, general cleanup. [Javan Makhmali]
+
+
 ### 0.6.2 / October 26th, 2010
 
 * --clear-crontab option completely removes entries. #63 [Javan Makhmali]

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in newever.gemspec
+gemspec

data/README.md

@@ -37,6 +37,10 @@ This will create an initial "config/schedule.rb" file you.
       runner "Task.do_something_great"
     end
 
+    every '0 0 27-31 * *' do
+      command "echo 'you can use raw cron sytax too'"
+    end
+
 More examples on the wiki: <http://wiki.github.com/javan/whenever/instructions-and-examples>
 
 ### Define your own job types
@@ -100,7 +104,7 @@ This will simply show you your schedule.rb file converted to cron syntax. It doe
 
 ### Credit
 
-Whenever was created for use at Inkling (<http://inklingmarkets.com>) where I work. Their take on it: <http://blog.inklingmarkets.com/2009/02/whenever-easy-way-to-do-cron-jobs-from.html>
+Whenever was created for use at Inkling (<http://inklingmarkets.com>). Their take on it: <http://blog.inklingmarkets.com/2009/02/whenever-easy-way-to-do-cron-jobs-from.html>
 
 Thanks to all the contributors who have made it even better: <http://github.com/javan/whenever/contributors>
 

data/Rakefile

@@ -1,35 +1,11 @@
-require 'rubygems'
-require 'rake'
-
-require File.expand_path(File.dirname(__FILE__) + "/lib/whenever/version")
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name        = "whenever"
-    gemspec.version     = Whenever::VERSION
-    gemspec.summary     = "Write your cron jobs in ruby."
-    gemspec.description = "Clean ruby syntax for writing and deploying cron jobs."
-    gemspec.email       = "javan@javan.us"
-    gemspec.homepage    = "http://github.com/javan/whenever"
-    gemspec.authors     = ["Javan Makhmali"]
-    gemspec.add_dependency 'aaronh-chronic', '>= 0.3.9'
-    gemspec.add_dependency 'activesupport', '>= 2.3.4'
-    gemspec.add_development_dependency 'shoulda', '>= 2.1.1'
-    gemspec.add_development_dependency 'mocha', '>= 0.9.5'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler -s http://gemcutter.org"
-end
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-    test.libs      << 'lib' << 'test'
-    test.pattern   = 'test/{functional,unit}/**/*_test.rb'
-    test.verbose   = true
-  end
-
-task :test => :check_dependencies
+  test.libs      << 'lib' << 'test'
+  test.pattern   = 'test/{functional,unit}/**/*_test.rb'
+  test.verbose   = true
+end
 
 task :default => :test

data/lib/whenever/capistrano.rb

@@ -3,7 +3,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset(:whenever_roles)        { :db }
   _cset(:whenever_command)      { "whenever" }
   _cset(:whenever_identifier)   { application }
-  _cset(:whenever_update_flags) { "--update-crontab #{whenever_identifier}" }
+  _cset(:whenever_environment)  { "production" }
+  _cset(:whenever_update_flags) { "--update-crontab #{whenever_identifier} --set environment=#{whenever_environment}" }
   _cset(:whenever_clear_flags)  { "--clear-crontab #{whenever_identifier}" }
   
   # Disable cron jobs at the begining of a deploy.

data/lib/whenever/command_line.rb

@@ -39,6 +39,8 @@ module Whenever
         write_crontab(whenever_cron)
       else
         puts Whenever.cron(@options)
+        puts "[message] Above is your schedule file converted to cron syntax; your crontab file was not updated."
+        puts "[message] Run `whenever --help' for more options."
         exit(0)
       end
     end
@@ -87,10 +89,10 @@ module Whenever
     
     def updated_crontab   
       # Check for unopened or unclosed identifier blocks
-      if read_crontab =~ Regexp.new("^#{comment_open}$") && (read_crontab =~ Regexp.new("^#{comment_close}$")).nil?
+      if read_crontab =~ Regexp.new("^#{comment_open}$") && (read_crontab =~ Regexp.new("^#{comment_close}")).nil?
         warn "[fail] Unclosed indentifier; Your crontab file contains '#{comment_open}', but no '#{comment_close}'"
         exit(1)
-      elsif (read_crontab =~ Regexp.new("^#{comment_open}$")).nil? && read_crontab =~ Regexp.new("^#{comment_close}$")
+      elsif (read_crontab =~ Regexp.new("^#{comment_open}$")).nil? && read_crontab =~ Regexp.new("^#{comment_close}")
         warn "[fail] Unopened indentifier; Your crontab file contains '#{comment_close}', but no '#{comment_open}'"
         exit(1)
       end
@@ -106,7 +108,11 @@ module Whenever
     end
     
     def prepare(contents)
-      contents.split("\n")[@options[:cut]..-1].join("\n")
+      # Some cron implementations require all non-comment lines to be newline-terminated.
+      # Preserve any whitespace at the end of contents. (issue #95)
+      stripped_contents = contents.strip
+      tail = contents[stripped_contents.length..-1]
+      stripped_contents.split("\n")[@options[:cut]..-1].join("\n") + tail
     end
     
     def comment_base

data/lib/whenever/cron.rb

@@ -34,6 +34,7 @@ module Whenever
 
       def time_in_cron_syntax
         case @time
+          when /^.+ .+ .+ .+ .+.?$/ then @time # raw cron sytax given
           when Symbol then parse_symbol
           when String then parse_as_string
           else parse_time

data/lib/whenever/job_list.rb

@@ -88,7 +88,7 @@ module Whenever
       
       output = []
       @env.each do |key, val|
-        output << "#{key}=#{val}\n"
+        output << "#{key}=#{val.blank? ? '""' : val}\n"
       end
       output << "\n"
       

data/lib/whenever/setup.rb

@@ -5,7 +5,7 @@ set :path, Whenever.path
 
 # All jobs are wrapped in this template.
 # http://blog.scoutapp.com/articles/2010/09/07/rvm-and-cron-in-production
-set :job_template, "/bin/bash -l -c ':job'"
+set :job_template, "/bin/bash -i -l -c ':job'"
 
 job_type :command, ":task :output"
 job_type :rake,    "cd :path && RAILS_ENV=:environment rake :task --silent :output"

data/lib/whenever/version.rb

@@ -1,3 +1,3 @@
 module Whenever
-  VERSION = '0.6.2' 
-end unless defined?(Whenever::VERSION)
+  VERSION = '0.6.6' 
+end

data/test/functional/command_line_test.rb

@@ -281,8 +281,7 @@ My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 EXISTING_CRON
 
-      # here-doc adds an extra newline we need removed
-      assert_equal existing.strip, @command.send(:prepare, existing)
+      assert_equal existing, @command.send(:prepare, existing)
     end
     
     should "trim off the top lines of the file" do
@@ -302,8 +301,21 @@ My whenever job that was already here
 # End Whenever generated tasks for: My identifier
 NEW_CRON
 
-      # here-doc adds an extra newline we need removed
-      assert_equal new_cron.strip, @command.send(:prepare, existing)
+      assert_equal new_cron, @command.send(:prepare, existing)
+    end
+    
+    should "preserve terminating newlines in files" do
+      @command = Whenever::CommandLine.new(:update => true, :identifier => 'My identifier')
+      existing = <<-EXISTING_CRON
+# Begin Whenever generated tasks for: My identifier
+My whenever job that was already here
+# End Whenever generated tasks for: My identifier
+
+# A non-Whenever task
+My non-whenever job that was already here
+EXISTING_CRON
+
+      assert_equal existing, @command.send(:prepare, existing)
     end
   end
 

data/test/functional/output_at_test.rb

@@ -248,4 +248,21 @@ class OutputAtTest < Test::Unit::TestCase
       assert_match '27,29,31,33,35,37,39,41,43,45,47,49,51,53,55,57,59 * * * * blahblah', @output
     end
   end
+  
+  context "using raw cron syntax" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :job_template, nil
+        every '0 0 27-31 * *' do
+          command "blahblah"
+        end
+      file
+    end
+    
+    should "output the command using the same cron syntax" do
+      assert_match '0 0 27-31 * * blahblah', @output
+    end
+  end
+  
 end

data/test/functional/output_default_defined_jobs_test.rb

@@ -31,7 +31,7 @@ class OutputDefaultDefinedJobsTest < Test::Unit::TestCase
     end
     
     should "output the command with the default job template" do
-      assert_match /^.+ .+ .+ .+ \/bin\/bash -l -c 'blahblah'$/, @output
+      assert_match /^.+ .+ .+ .+ \/bin\/bash -i -l -c 'blahblah'$/, @output
     end
   end
   

data/test/functional/output_env_test.rb

@@ -8,6 +8,8 @@ class OutputEnvTest < Test::Unit::TestCase
       <<-file
         env :MYVAR, 'blah'
         env 'MAILTO', "someone@example.com"
+        env :BLANKVAR, ''
+        env :NILVAR, nil
       file
     end
 
@@ -18,6 +20,14 @@ class OutputEnvTest < Test::Unit::TestCase
     should "output MAILTO environment variable" do
       assert_match "MAILTO=someone@example.com", @output
     end
+
+    should "output BLANKVAR environment variable" do
+      assert_match "BLANKVAR=\"\"", @output
+    end
+
+    should "output NILVAR environment variable" do
+      assert_match "NILVAR=\"\"", @output
+    end
   end
 
-end
+end

data/test/unit/cron_test.rb

@@ -199,6 +199,15 @@ class CronTest < Test::Unit::TestCase
       end
     end
   end
+  
+  context "When given raw cron sytax" do
+    should "return the same cron sytax" do
+      crons = ['0 0 27-31 * *', '* * * * *', '2/3 1,9,22 11-26 1-6 *']
+      crons.each do |cron|
+        assert_equal cron, parse_time(cron)
+      end
+    end
+  end
 
 private
 

data/whenever.gemspec

@@ -1,85 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "whenever/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{whenever}
-  s.version = "0.6.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Javan Makhmali"]
-  s.date = %q{2010-10-26}
+  s.name        = "whenever"
+  s.version     = Whenever::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Javan Makhmali"]
+  s.email       = ["javan@javan.us"]
+  s.homepage    = ""
+  s.summary     = %q{Cron jobs in ruby.}
   s.description = %q{Clean ruby syntax for writing and deploying cron jobs.}
-  s.email = %q{javan@javan.us}
-  s.executables = ["whenever", "wheneverize"]
-  s.extra_rdoc_files = [
-    "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG.md",
-     "README.md",
-     "Rakefile",
-     "bin/whenever",
-     "bin/wheneverize",
-     "lib/whenever.rb",
-     "lib/whenever/capistrano.rb",
-     "lib/whenever/command_line.rb",
-     "lib/whenever/cron.rb",
-     "lib/whenever/job.rb",
-     "lib/whenever/job_list.rb",
-     "lib/whenever/output_redirection.rb",
-     "lib/whenever/setup.rb",
-     "lib/whenever/version.rb",
-     "test/functional/command_line_test.rb",
-     "test/functional/output_at_test.rb",
-     "test/functional/output_default_defined_jobs_test.rb",
-     "test/functional/output_defined_job_test.rb",
-     "test/functional/output_env_test.rb",
-     "test/functional/output_redirection_test.rb",
-     "test/test_helper.rb",
-     "test/unit/cron_test.rb",
-     "test/unit/job_test.rb",
-     "whenever.gemspec"
-  ]
-  s.homepage = %q{http://github.com/javan/whenever}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- test/{functional,unit}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Write your cron jobs in ruby.}
-  s.test_files = [
-    "test/functional/command_line_test.rb",
-     "test/functional/output_at_test.rb",
-     "test/functional/output_default_defined_jobs_test.rb",
-     "test/functional/output_defined_job_test.rb",
-     "test/functional/output_env_test.rb",
-     "test/functional/output_redirection_test.rb",
-     "test/test_helper.rb",
-     "test/unit/cron_test.rb",
-     "test/unit/job_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_development_dependency(%q<shoulda>, [">= 2.1.1"])
-      s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
-    else
-      s.add_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
-      s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-      s.add_dependency(%q<shoulda>, [">= 2.1.1"])
-      s.add_dependency(%q<mocha>, [">= 0.9.5"])
-    end
-  else
-    s.add_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
-    s.add_dependency(%q<activesupport>, [">= 2.3.4"])
-    s.add_dependency(%q<shoulda>, [">= 2.1.1"])
-    s.add_dependency(%q<mocha>, [">= 0.9.5"])
-  end
+  s.add_runtime_dependency(%q<aaronh-chronic>, [">= 0.3.9"])
+  s.add_runtime_dependency(%q<activesupport>, [">= 2.3.4"])
+  s.add_development_dependency(%q<shoulda>, [">= 2.1.1"])
+  s.add_development_dependency(%q<mocha>, [">= 0.9.5"])
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whenever
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: false
+  hash: 11
+  prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Javan Makhmali
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-26 00:00:00 -04:00
+date: 2011-03-08 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,17 +83,19 @@ dependencies:
   type: :development
   version_requirements: *id004
 description: Clean ruby syntax for writing and deploying cron jobs.
-email: javan@javan.us
+email: 
+- javan@javan.us
 executables: 
 - whenever
 - wheneverize
 extensions: []
 
-extra_rdoc_files: 
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - CHANGELOG.md
+- Gemfile
 - README.md
 - Rakefile
 - bin/whenever
@@ -118,12 +120,12 @@ files:
 - test/unit/job_test.rb
 - whenever.gemspec
 has_rdoc: true
-homepage: http://github.com/javan/whenever
+homepage: ""
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -147,10 +149,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
-summary: Write your cron jobs in ruby.
+summary: Cron jobs in ruby.
 test_files: 
 - test/functional/command_line_test.rb
 - test/functional/output_at_test.rb
@@ -158,6 +160,5 @@ test_files:
 - test/functional/output_defined_job_test.rb
 - test/functional/output_env_test.rb
 - test/functional/output_redirection_test.rb
-- test/test_helper.rb
 - test/unit/cron_test.rb
 - test/unit/job_test.rb