From 8440b850cb757058f03c21638f908e3c70148872 Mon Sep 17 00:00:00 2001 From: Xander Miller Date: Wed, 2 Oct 2013 10:02:32 -0400 Subject: [PATCH 1/2] Updated to Rufus-Scheduler 3.0 syntax + modified gemspec to require rufus-scheduler >= 3.0.0 + modified scheduler call to use .new instead of previous .start_new syntax --- dashing.gemspec | 2 +- lib/dashing.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dashing.gemspec b/dashing.gemspec index 050266b1..fcd99ac5 100644 --- a/dashing.gemspec +++ b/dashing.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |s| s.add_dependency('sinatra') s.add_dependency('sinatra-contrib') s.add_dependency('thin') - s.add_dependency('rufus-scheduler') + s.add_dependency('rufus-scheduler', '>=3.0.0') s.add_dependency('thor') s.add_dependency('sprockets') s.add_dependency('rack') diff --git a/lib/dashing.rb b/lib/dashing.rb index 2c3a8108..934d95cd 100644 --- a/lib/dashing.rb +++ b/lib/dashing.rb @@ -7,7 +7,7 @@ require 'json' require 'yaml' -SCHEDULER = Rufus::Scheduler.start_new +SCHEDULER = Rufus::Scheduler.new set :root, Dir.pwd From cfa7371f48c51e1ebe9d99eb4e914db1d514b2fc Mon Sep 17 00:00:00 2001 From: Xander Miller Date: Wed, 2 Oct 2013 11:53:34 -0400 Subject: [PATCH 2/2] Updated to Rufus-Scheduler 3.0 syntax and rebased + modified gemspec to require rufus-scheduler >= 3.0.0 + modified scheduler call to use .new instead of previous .start_new syntax --- dashing.gemspec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dashing.gemspec b/dashing.gemspec index b5781fc2..2afcffa1 100644 --- a/dashing.gemspec +++ b/dashing.gemspec @@ -21,11 +21,7 @@ Gem::Specification.new do |s| s.add_dependency('sinatra') s.add_dependency('sinatra-contrib') s.add_dependency('thin') -<<<<<<< HEAD s.add_dependency('rufus-scheduler', '>=3.0.0') -======= - s.add_dependency('rufus-scheduler', '~> 2.0') ->>>>>>> upstream/master s.add_dependency('thor') s.add_dependency('sprockets') s.add_dependency('rack')