ewoutvonk-whenever 0.3.6.002 → 0.3.7.001

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 0.3.7 / September 4th, 2009
+
+* No longer tries (and fails) to combine @shortcut jobs. #20 [Javan Makhmali]
+
+
 == 0.3.6 / June 15th, 2009
 
 * Setting a PATH in the crontab automatically based on the user's PATH. [Javan Makhmali]

data/Manifest

@@ -21,3 +21,4 @@ test/output_env_test.rb
 test/output_rake_test.rb
 test/output_runner_test.rb
 test/test_helper.rb
+whenever.gemspec

data/lib/job_list.rb

@@ -112,7 +112,7 @@ module Whenever
     # them into one that runs on the 2nd minute at the 3rd and 4th hour.
     #
     def combine(entries)
-      entries.map! { |entry| entry.split(/ +/,6 )}
+      entries.map! { |entry| entry.split(/ +/, 6) }
       0.upto(4) do |f|
         (entries.length-1).downto(1) do |i|
           next if entries[i][f] == '*'
@@ -134,18 +134,25 @@ module Whenever
     def cron_jobs
       return if @jobs.empty?
       
-      output = []
+      shortcut_jobs = []
+      regular_jobs = []
+      
       @jobs.each do |time, jobs|
         jobs.each do |job|
           Whenever::Output::Cron.output(time, job) do |cron|
             cron << " >> #{job.cron_log} 2>&1" if job.cron_log 
             cron << "\n\n"
-            output << cron
+            
+            if cron.starts_with?("@")
+              shortcut_jobs << cron
+            else
+              regular_jobs << cron
+            end
           end
         end
       end
-      
-      combine(output).join
+
+      shortcut_jobs.join + combine(regular_jobs).join
     end
     
   end

data/lib/job_types/default.rb

@@ -5,32 +5,36 @@ module Whenever
       attr_accessor :task, :at, :cron_log
     
       def initialize(options = {})
-        @task        = options[:task]
-        @at          = options[:at]
-        @envvars     = options[:envvars]
-        @cron_log    = options[:cron_log]
-        @environment = options[:environment] || :production
-        @path        = options[:path] || Whenever.path
+        opts = options.clone
+        @task        = opts.delete(:task)
+        @at          = opts.delete(:at)
+        @cron_log    = opts.delete(:cron_log)
+        @environment = opts.delete(:environment) || :production
+        @path        = opts.delete(:path) || Whenever.path
+        @envvars     = opts
       end
     
       def output
         envvars + task
       end
       
-    protected
-    
       def envvars
-        if @envvars.is_a?(Array)
-          @envvars.keys.select do |key|
-            key.to_sym != :RAILS_ENV
-          end.collect do |key|
-            "#{key}=#{@envvars[key]}"
-          end.join(' ') + ' '
-        else
-          @envvars.nil? ? '' : @envvars.to_s + ' '
+        vars = ''
+        if !@envvars.nil? && @envvars.keys.size > 0
+          vars = @envvars.collect do |key,value|
+            if key.is_a?(String)
+              key.to_s + "=" + value.to_s
+            else
+              nil
+            end
+          end.compact.join(' ')
         end
+        
+        vars.empty? ? '' : vars + ' '
       end
       
+    protected
+    
       def path_required
         raise ArgumentError, "No path available; set :path, '/your/path' in your schedule file" if @path.blank?
       end

data/lib/job_types/rake_task.rb

@@ -4,7 +4,7 @@ module Whenever
       
       def output
         path_required
-        "cd #{@path} && #{envvars} RAILS_ENV=#{@environment} /usr/bin/env rake #{task}"
+        "cd #{@path} && #{envvars}RAILS_ENV=#{@environment} /usr/bin/env rake #{task}"
       end
       
     end

data/lib/job_types/runner.rb

@@ -4,7 +4,7 @@ module Whenever
 
       def output
         path_required
-        %Q(#{envvars} #{File.join(@path, 'script', 'runner')} -e #{@environment} #{task.inspect})
+        %Q(#{envvars}#{File.join(@path, 'script', 'runner')} -e #{@environment} #{task.inspect})
       end
       
     end

data/lib/version.rb

@@ -2,7 +2,7 @@ module Whenever
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/output_at_test.rb

@@ -134,4 +134,45 @@ class OutputAtTest < Test::Unit::TestCase
     end
   end
   
+  context "Multiple commands output every :reboot" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        every :reboot do
+          command "command_1"
+          command "command_2"
+        end
+      file
+    end
+    
+    should "output both commands @reboot" do
+      assert_match "@reboot command_1", @output
+      assert_match "@reboot command_2", @output
+    end
+  end
+  
+  context "Many different job types output every :day" do
+    setup do
+      @output = Whenever.cron \
+      <<-file
+        set :path, '/your/path'
+        every :day do
+          rake "blah:blah"
+          runner "runner_1"
+          command "command_1"
+          runner "runner_2"
+          command "command_2"
+        end
+      file
+    end
+    
+    should "output all of the commands @daily" do
+      assert_match '@daily cd /your/path && RAILS_ENV=production /usr/bin/env rake blah:blah', @output
+      assert_match '@daily /your/path/script/runner -e production "runner_1"', @output
+      assert_match '@daily command_1', @output
+      assert_match '@daily /your/path/script/runner -e production "runner_2"', @output
+      assert_match '@daily command_2', @output
+    end
+  end
+  
 end

data/whenever.gemspec

@@ -2,11 +2,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{whenever}
-  s.version = "0.3.6.002"
+  s.version = "0.3.7.001"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ewout Vonk"]
-  s.date = %q{2009-07-15}
+  s.date = %q{2009-09-10}
+
   s.description = %q{Provides clean ruby syntax for defining messy cron jobs and running them Whenever.}
   s.email = %q{ewoutvonk@ewout.info}
   s.executables = ["whenever", "wheneverize"]
@@ -17,13 +18,13 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Whenever", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{whenever}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Provides clean ruby syntax for defining messy cron jobs and running them Whenever.}
   s.test_files = ["test/command_line_test.rb", "test/cron_test.rb", "test/output_at_test.rb", "test/output_command_test.rb", "test/output_env_test.rb", "test/output_rake_test.rb", "test/output_runner_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<chronic>, [">= 0.2.3"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ewoutvonk-whenever
 version: !ruby/object:Gem::Version 
-  version: 0.3.6.002
+  version: 0.3.7.001
 platform: ruby
 authors: 
 - Ewout Vonk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -07:00
+date: 2009-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,7 +97,7 @@ requirements: []
 rubyforge_project: whenever
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Provides clean ruby syntax for defining messy cron jobs and running them Whenever.
 test_files: 
 - test/command_line_test.rb