jobbr 1.1.0 → 1.1.1

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    jobbr (1.1.0)
+    jobbr (1.1.1)
       chronic_duration
       delayed_job_mongoid
       mongoid (~> 3.0)

data/README.rdoc

@@ -62,6 +62,10 @@ Then you will need to manually add jobs to the Heroku scheduler console
 
 {<img src="http://cl.ly/image/2N1T1l1w2c28/Capture%20d%E2%80%99%C3%A9cran%202013-07-09%20%C3%A0%2022.18.40.png" width='400'>}[http://cl.ly/image/2N1T1l1w2c28]
 
+You also need to add an environment variable to let Jobbr know it's running on Heroku
+
+    heroku config:add HEROKU=true
+
 === Delayed Jobs
 
 Use generators to get a new job model:

data/app/models/jobbr/standalone_tasks.rb

@@ -19,9 +19,11 @@ module Jobbr
         klass = "#{name.to_s.pluralize.camelize}::#{File.basename(file, '.rb').camelize}".constantize
         dependencies << klass.name
         {
-          name:         klass.task_name.to_sym,
-          desc:         klass.description,
-          klass_name:   klass.name,
+          name:             klass.task_name.to_sym,
+          desc:             klass.description,
+          klass_name:       klass.name,
+          heroku_frequency: klass.heroku_frequency,
+          heroku_priority:  klass.heroku_priority,
           dependencies: (dependencies[0..1] + [klass.name]).map { |n| "#{n.underscore}.rb" }
         }
       end

data/lib/jobbr/version.rb

@@ -1,3 +1,3 @@
 module Jobbr
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/tasks/jobbr_heroku_tasks.rake

@@ -0,0 +1,29 @@
+require "jobbr/mongoid.rb"
+
+namespace :jobbr do
+
+  namespace :heroku do
+
+    desc 'Run all minutely Heroku jobs'
+    task :minutely => :environment do
+      run_heroku_scheduled_classes(:minutely)
+    end
+
+    desc 'Run all hourly Heroku jobs'
+    task :hourly => :environment do
+      run_heroku_scheduled_classes(:hourly)
+    end
+
+    desc 'Run all daily Heroku jobs'
+    task :daily => :environment do
+      run_heroku_scheduled_classes(:daily)
+    end
+
+    def run_heroku_scheduled_classes(frequency)
+      load "jobbr/scheduled_job"
+      Jobbr::Mongoid.models(Jobbr::ScheduledJob).select{|c| c.heroku_frequency == frequency }.sort{|a,b| b.heroku_priority <=> a.heroku_priority}.each(&:run)
+    end
+
+  end
+
+end

data/lib/tasks/jobbr_tasks.rake

@@ -1,41 +1,25 @@
-models_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'app', 'models'))
-require File.join(models_root, 'jobbr', 'standalone_tasks')
-require "jobbr/mongoid.rb"
+unless ENV['HEROKU']
 
-namespace :jobbr do
+  models_root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'app', 'models'))
+  require File.join(models_root, 'jobbr', 'standalone_tasks')
 
-  Jobbr::StandaloneTasks.all(:scheduled_job).each do |info|
-    # dynamically create a rake task for each individual Jobbr::ScheduledJob
-    desc info[:desc]
-    task info[:name] => :environment do
-      info[:dependencies].each { |lib| load lib }
-      info[:klass_name].constantize.run
-    end
-  end
-
-  desc 'Mark all running job as failed.'
-  task :sweep_running_jobs => :environment do
-    Jobbr::Run.where(status: :running).update_all(status: :failure)
-  end
-
-  namespace :heroku do
+  namespace :jobbr do
 
-    task :minutely => :environment do
-      heroku_scheduled_classes(:minutely).each(&:run)
+    Jobbr::StandaloneTasks.all(:scheduled_job).each do |info|
+      # dynamically create a rake task for each individual Jobbr::ScheduledJob
+      desc info[:desc]
+      task info[:name] => :environment do
+        info[:dependencies].each { |lib| load lib }
+        info[:klass_name].constantize.run
+      end
     end
 
-    task :hourly => :environment do
-      heroku_scheduled_classes(:hourly).each(&:run)
-    end
-
-    task :daily => :environment do
-      heroku_scheduled_classes(:daily).each(&:run)
-    end
-
-    def heroku_scheduled_classes(frequency)
-      Jobbr::Mongoid.models(Jobbr::ScheduledJob).select{|c| c.heroku_frequency == frequency }.sort{|a,b| b.heroku_priority <=> a.heroku_priority}
+    desc 'Mark all running job as failed.'
+    task :sweep_running_jobs => :environment do
+      Jobbr::Run.where(status: :running).update_all(status: :failure)
     end
 
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobbr
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -180,6 +180,7 @@ files:
 - lib/jobbr/mongoid.rb
 - lib/jobbr/version.rb
 - lib/jobbr/whenever.rb
+- lib/tasks/jobbr_heroku_tasks.rake
 - lib/tasks/jobbr_tasks.rake
 - script/rails
 - spec/dummy/README.rdoc
@@ -250,7 +251,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1087904321549229692
+      hash: 3800200861971861567
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -259,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1087904321549229692
+      hash: 3800200861971861567
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23