diff --git a/Gemfile b/Gemfile index 15fea8d6..36ea87d4 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem 'hoptoad_notifier' gem 'addressable', :require => ['addressable/template', 'addressable/uri'] -gem 'whenever', '~> 0.6.2', :require => false +gem 'whenever', '~> 0.7.3', :require => false gem 'swf_converter', '~> 0.0.3' diff --git a/Gemfile.lock b/Gemfile.lock index b7bd2a42..9803cf92 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -55,7 +55,6 @@ GEM Platform (>= 0.4.0) open4 Platform (0.4.0) - aaronh-chronic (0.3.9) abstract (1.0.0) actionmailer (3.0.5) actionpack (= 3.0.5) @@ -88,6 +87,7 @@ GEM bcrypt-ruby (2.1.4) builder (2.1.2) character-encodings (0.4.1) + chronic (0.6.7) closure-compiler (1.1.4) compass (0.10.6) haml (>= 3.0.4) @@ -200,9 +200,9 @@ GEM rack (>= 1.0.0) warden (1.0.6) rack (>= 1.0) - whenever (0.6.8) - aaronh-chronic (>= 0.3.9) + whenever (0.7.3) activesupport (>= 2.3.4) + chronic (~> 0.6.3) will_paginate (3.0.2) yui-compressor (0.9.6) POpen4 (>= 0.1.4) @@ -242,5 +242,5 @@ DEPENDENCIES rspec-rails (~> 2.0.0.beta.22) sanitize (~> 2.0.3) swf_converter (~> 0.0.3) - whenever (~> 0.6.2) + whenever (~> 0.7.3) will_paginate (~> 3.0.pre2) diff --git a/config/schedule.rb b/config/schedule.rb index 30875fcb..41bd8f8e 100644 --- a/config/schedule.rb +++ b/config/schedule.rb @@ -1,16 +1,11 @@ # Learn more: http://github.com/javan/whenever -RVM_RUBY = 'ruby-1.9.2@impress' -set :job_template, "bash -l -c 'rvm use #{RVM_RUBY} && :job'" -job_type :runner, "cd :path && rails runner -e :environment ':task' :output" - env :MAILTO, 'webmaster@openneo.net' every :day do - runner "Item.spider_mall\\!" + rake 'mall:spider_items' end -ItemsLimit = 20 every :hour do - runner "Item.spider_mall_assets\\!\\(#{ItemsLimit}\\)" + rake 'mall:spider_assets' end diff --git a/lib/tasks/spider.rake b/lib/tasks/spider.rake new file mode 100644 index 00000000..23eb182e --- /dev/null +++ b/lib/tasks/spider.rake @@ -0,0 +1,12 @@ +namespace :mall do + desc 'Spider NC Mall for new items' + task :spider_items => :environment do + Item.spider_mall! + end + + desc 'Spider NC Mall for item assets' + task :spider_assets => :environment do + item_limit = ENV['ITEM_LIMIT'] || 20 + Item.spider_mall_assets!(item_limit) + end +end diff --git a/vendor/cache/aaronh-chronic-0.3.9.gem b/vendor/cache/aaronh-chronic-0.3.9.gem deleted file mode 100644 index ca38635d..00000000 Binary files a/vendor/cache/aaronh-chronic-0.3.9.gem and /dev/null differ diff --git a/vendor/cache/chronic-0.6.7.gem b/vendor/cache/chronic-0.6.7.gem new file mode 100644 index 00000000..ff807664 Binary files /dev/null and b/vendor/cache/chronic-0.6.7.gem differ diff --git a/vendor/cache/whenever-0.6.8.gem b/vendor/cache/whenever-0.6.8.gem deleted file mode 100644 index 8fd729fa..00000000 Binary files a/vendor/cache/whenever-0.6.8.gem and /dev/null differ diff --git a/vendor/cache/whenever-0.7.3.gem b/vendor/cache/whenever-0.7.3.gem new file mode 100644 index 00000000..4777db1d Binary files /dev/null and b/vendor/cache/whenever-0.7.3.gem differ