le1t0-whenever 0.4.2.002 → 0.4.2.003

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 0.4.2.003 / Jul 5th, 2010
+
+* fixed adding per-cronjob environment variables
+
 == 0.4.2.002 / May 18th, 2010
 
 * Added setting environment variables per cron job

data/lib/whenever/job_types/default.rb

@@ -11,22 +11,26 @@ module Whenever
         @output_redirection = opts.delete(:output) || :not_set
         @environment        = opts.delete(:environment) || :production
         @path               = opts.delete(:path) || Whenever.path
-        @envvars            = opts
+        @envvars            = envvars(opts)
       end
     
       def output
         envvars + task
       end
       
-      def envvars
-        if @envvars.is_a?(Array)
-          @envvars.keys.select do |key|
-            key.to_sym != :RAILS_ENV
+      def envvars(opts=nil)
+        return @envvars if opts.nil?
+        env_vars = opts
+        if env_vars.is_a?(Hash)
+          env_vars.keys.select do |key|
+            key.to_sym != :RAILS_ENV && key.to_s =~ /^[A-Z_]+$/
           end.collect do |key|
-            "#{key}=#{@envvars[key]}"
+            "#{key}=#{env_vars[key]}"
           end.join(' ') + ' '
+        elsif env_vars.is_a?(Array)
+          env_vars.join(' ') + ' '
         else
-          @envvars.nil? ? '' : @envvars.to_s + ' '
+          env_vars.to_s + ' '
         end
       end
       
@@ -38,4 +42,4 @@ module Whenever
       
     end
   end
-end
+end

data/lib/whenever/version.rb

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

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 2
-  - 2
-  version: 0.4.2.002
+  - 3
+  version: 0.4.2.003
 platform: ruby
 authors: 
 - Le1t0
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +02:00
+date: 2010-07-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency