mobilize-base 1.0.5 → 1.0.6

data/.gitignore

@@ -11,4 +11,5 @@ config
 log
 tmp
 .DS_Store
+REVISION
 test/dump.rdb

data/README.md

@@ -27,10 +27,11 @@ Table Of Contents
   * [Google Drive](#section_Configure_Google_Drive)
   * [Jobtracker](#section_Configure_Jobtracker)
   * [Resque](#section_Configure_Resque)
+  * [Resque-Web](#section_Configure_Resque-Web)
   * [Gridfs](#section_Configure_Gridfs)
   * [Mongoid](#section_Configure_Mongoid)
 * [Start](#section_Start)
-  * [Start resque-web](#section_Start_Start_resque-web)
+  * [Start Resque-Web](#section_Start_Start_Resque-Web)
   * [Set Environment](#section_Start_Set_Environment)
   * [Create User](#section_Start_Create_User)
   * [Start Workers](#section_Start_Start_Workers)
@@ -262,22 +263,42 @@ It needs the below parameters, which can be found in the [lib/samples][git_sampl
 production, but feel free to adjust depending on your hardware.
 * redis_port - you should probably leave this alone, it specifies the
   default port for dev and prod and a separate one for testing.
+* web_port - this specifies the port under which resque-web operates
 
 ``` yml
 development:
   queue_name: 'mobilize'
   max_workers: 4
   redis_port: 6379
+  web_port: 8282
 test:
   queue_name: 'mobilize'
   max_workers: 4
   redis_port: 9736
+  web_port: 8282
 production:
   queue_name: 'mobilize'
   max_workers: 36
   redis_port: 6379
+  web_port: 8282
 ```
 
+<a name='section_Configure_Resque-Web'></a>
+### Configure Resque-Web
+
+Please change your default username and password in the resque_web.rb
+file in your config folder, reproduced below:
+
+``` ruby
+#comment out the below if you want no authentication on your web portal (not recommended)
+Resque::Server.use(Rack::Auth::Basic) do |user, password|
+  [user, password] == ['admin', 'changeyourpassword']
+end
+```
+
+This file is passed as a config file argument to
+mobilize_base:resque_web task, as detailed in [Start Resque-Web](#section_Start_Start_Resque-Web).
+
 <a name='section_Configure_Gridfs'></a>
 ### Configure Gridfs
 
@@ -350,22 +371,17 @@ A Mobilize instance can be considered "started" or "running" when you have:
 <a name='section_Start_Start_resque-web'></a>
 ### Start resque-web
 
-To start resque-web, which is a kickass UI layer built in Sinatra,
-you'll need to install the resque gem explicitly, as in
-
-``` ruby
-gem install resque
-```
+Mobilize ships with its own rake task to start resque web -- you can do
+the following:
 
-then, you can do 
 
-  $ resque-web
+  $ MOBILIZE_ENV=<environment> rake mobilize_base:resque_web
 
-and it'll start an instance on 127.0.0.1:5678
+This will start a resque_web instance with the port specified in your
+resque.yml and the config/auth scheme specified in your resque_web.rb. 
 
-You'll want to keep an eye on this as it tracks your workers in real
-time and allows you to keep track of failed jobs. More detail on the
-[Resque Standalone section][resque-web].
+More detail on the
+[Resque-Web Standalone section][resque-web].
 
 <a name='section_Start_Set_Environment'></a>
 ### Set Environment
@@ -374,7 +390,7 @@ Mobilize takes the environment from your Rails.env if you're running
 Rails, or assumes "development." You can specify "development", "test",
 or "production," as per the yml files.
 
-Otherwise, it takes it from MOBILIZE_ENV parameter, set from irb, as in:
+Otherwise, it takes it from MOBILIZE_ENV parameter, as in:
 
 ``` ruby
 > ENV['MOBILIZE_ENV'] = 'production'

data/lib/mobilize-base/extensions/google_drive/client_login_fetcher.rb

@@ -1,6 +1,7 @@
 module GoogleDrive
   class ClientLoginFetcher
     def request_raw(method, url, data, extra_header, auth)
+      clf = self
       #this is patched to handle server errors due to http chaos
       uri = URI.parse(url)
       response = nil
@@ -14,22 +15,32 @@ module GoogleDrive
         http.verify_mode = OpenSSL::SSL::VERIFY_NONE
         #set 600  to allow for large downloads
         http.read_timeout = 600
-        response = self.http_call(http, method, uri, data, extra_header, auth)
-        if response.code.ie{|rcode| rcode.starts_with?("4") or rcode.starts_with?("5")}
-          if response.body.downcase.index("rate limit") or response.body.downcase.index("captcha")
-            if sleep_time
-              sleep_time = sleep_time * attempts
+        response = begin
+                     clf.http_call(http, method, uri, data, extra_header, auth)
+                   rescue
+                     #timeouts etc.
+                     nil
+                   end
+        if response.nil?
+          attempts +=1
+        else
+          if response.code.ie{|rcode| rcode.starts_with?("4") or rcode.starts_with?("5")}
+            if response.body.downcase.index("rate limit") or response.body.downcase.index("captcha")
+              if sleep_time
+                sleep_time = sleep_time * attempts
+              else
+                sleep_time = (rand*100).to_i
+              end
             else
-              sleep_time = (rand*100).to_i
+              sleep_time = 10
             end
-          else
-            sleep_time = 10
+            attempts += 1
+            puts "Sleeping for #{sleep_time.to_s} due to #{response.body}"
+            sleep sleep_time
           end
-          attempts += 1
-          puts "Sleeping for #{sleep_time.to_s} due to #{response.body}"
-          sleep sleep_time
         end
       end
+      raise "No response after 5 attempts" if response.nil?
       raise response.body if response.code.ie{|rcode| rcode.starts_with?("4") or rcode.starts_with?("5")}
       return response
     end

data/lib/mobilize-base/handlers/resque.rb

@@ -17,7 +17,6 @@ module Mobilize
     end
 
     def Resque.workers(state="all")
-      raise "invalid state #{state}" unless ['all','idle','working','timeout'].include?(state)
       workers = ::Resque.workers.select{|w| w.queues.first == Resque.queue_name}
       return workers if state == 'all'
       working_workers = workers.select{|w| w.job['queue']== Resque.queue_name}
@@ -28,6 +27,7 @@ module Mobilize
       return stale_workers if state == 'stale'
       timeout_workers = workers.select{|w| w.job['payload'] and w.job['payload']['class']!='Jobtracker' and w.job['runat'] < (Time.now.utc - Jobtracker.max_run_time)}
       return timeout_workers if state == 'timeout'
+      raise "invalid state #{state}"
     end
 
     def Resque.failures
@@ -36,7 +36,6 @@ module Mobilize
 
     #active state refers to jobs that are either queued or working
     def Resque.jobs(state="active")
-      raise "invalid state #{state}" unless ['all','queued','working','active','timeout','failed'].include?(state)
       working_jobs =  Resque.workers('working').map{|w| w.job['payload']}
       return working_jobs if state == 'working'
       queued_jobs = ::Resque.peek(Resque.queue_name,0,0).to_a
@@ -47,6 +46,7 @@ module Mobilize
       timeout_jobs = Resque.workers("timeout").map{|w| w.job['payload']}
       return timeout_jobs if state == 'timeout'
       return working_jobs + queued_jobs + failed_jobs if state == 'all'
+      raise "invalid state #{state}"
     end
 
     def Resque.active_paths
@@ -125,13 +125,13 @@ module Mobilize
         dir_envs = "MOBILIZE_ENV=#{Base.env} " +
                    "MOBILIZE_CONFIG_DIR=#{Base.config_dir} " +
                    "MOBILIZE_LOG_DIR=#{Base.log_dir}"
-        "(cd #{Base.root};rake #{dir_envs} mobilize:work) >> #{Resque.log_path} 2>&1 &".bash
+        "(cd #{Base.root};rake #{dir_envs} mobilize_base:work) >> #{Resque.log_path} 2>&1 &".bash
       end
     end
 
     def Resque.kill_idle_workers(count=nil)
       idle_pids = Resque.workers('idle').select{|w| w.job=={}}.map{|w| w.to_s.split(":").second}
-      if count>idle_pids.length or count == 0
+      if count.to_i > idle_pids.length or count == 0
         return false
       elsif count
         "kill #{idle_pids[0..count-1].join(" ")}".bash
@@ -141,7 +141,7 @@ module Mobilize
       return true
     end
 
-    def Resque.kill_idle_stale_workers
+    def Resque.kill_idle_and_stale_workers
       idle_pids = Resque.workers('idle').select{|w| w.job=={}}.map{|w| w.to_s.split(":").second}
       stale_pids = Resque.workers('stale').select{|w| w.job=={}}.map{|w| w.to_s.split(":").second}
       idle_stale_pids = (idle_pids & stale_pids)

data/lib/mobilize-base/jobtracker.rb

@@ -75,6 +75,10 @@ module Mobilize
       Resque.kill_idle_workers
     end
 
+    def Jobtracker.kill_idle_and_stale_workers
+      Resque.kill_idle_and_stale_workers
+    end
+
     def Jobtracker.prep_workers
       Resque.prep_workers
     end
@@ -202,15 +206,25 @@ module Mobilize
 
     def Jobtracker.deployed_at
       #assumes deploy is as of last commit, or as of last deploy time
-      #as given by the least recently updated file in the root folder
+      #as given by the REVISION file in the root folder
       deploy_time = begin
-                     %{git log -1 --format="%cd"}.bash
-                   rescue
-                     ls_string = "ls -l #{ENV['PWD']}/*".bash
-                     ls_rows = ls_string.split("\n").map{|lss| lss.strip.split(" ")}
-                     mod_times = ls_rows.select{|lsr| lsr.length == 8}.map{|lsr| lsr[5..6].join(" ")}
-                     mod_times.min
-                   end
+                      %{git log -1 --format="%cd"}.bash
+                    rescue
+                      revision_path = "#{ENV['PWD']}/REVISION"
+                      "touch #{revision_path}".bash unless File.exists?(revision_path)
+                      revision_string = "ls -l #{revision_path}".bash
+                      revision_rows = revision_string.split("\n").map{|lss| lss.strip.split(" ")}
+                      mod_time = revision_rows.map do |lsr| 
+                        if lsr.length == 8
+                          #ubuntu
+                          lsr[5..6].join(" ")
+                        elsif lsr.length == 9
+                          #osx
+                          lsr[5..7].join(" ")
+                        end
+                      end.first
+                      mod_time
+                    end.to_s.strip
       Time.parse(deploy_time)
     end
 

data/lib/mobilize-base/models/job.rb

@@ -5,8 +5,6 @@ module Mobilize
     field :path, type: String
     field :active, type: Boolean
     field :trigger, type: String
-    field :status, type: String
-    field :last_completed_at, type: Time
 
     index({ path: 1})
 
@@ -26,6 +24,32 @@ module Mobilize
       return j
     end
 
+    def status
+      #last task status
+      j = self
+      j.active_task.status
+    end
+
+    def active_task
+      j = self
+      #latest started at or first
+      j.tasks.select{|t| t.started_at}.sort_by{|t| t.started_at}.last || j.tasks.first
+    end
+
+    def completed_at
+      j = self
+      j.tasks.last.completed_at
+    end
+
+    def failed_at
+      j = self
+      j.tasks.last.failed_at
+    end
+
+    def status_at
+      j.active_task.status_at
+    end
+
     #convenience methods
     def runner
       j = self
@@ -41,7 +65,7 @@ module Mobilize
     def is_due?
       j = self
       return false if j.is_working? or j.active == false or j.trigger.to_s.starts_with?("after")
-      last_run = j.last_completed_at
+      last_run = j.completed_at
       #check trigger
       trigger = j.trigger
       return true if trigger == 'once'

data/lib/mobilize-base/models/runner.rb

@@ -5,7 +5,9 @@ module Mobilize
     field :path, type: String
     field :active, type: Boolean
     field :status, type: String
-    field :last_run, type: Time
+    field :started_at, type: Time
+    field :status_at, type: Time
+    field :completed_at, type: Time
 
     index({ path: 1})
 
@@ -13,9 +15,9 @@ module Mobilize
       %w{name active trigger status task1 task2 task3 task4 task5}
     end
 
-    def last_cached_at
+    def cached_at
       r = self
-      Dataset.find_or_create_by_path(r.path).last_cached_at
+      Dataset.find_or_create_by_path(r.path).cached_at
     end
 
     def worker
@@ -51,12 +53,12 @@ module Mobilize
             j.tasks.first.enqueue!
           end
         rescue ScriptError, StandardError => exc
-          j.update_status("Failed to enqueue with #{exc.to_s}")
+          r.update_status("Failed to enqueue #{j.path} with #{exc.to_s}")
           j.update_attributes(:active=>false)
         end
       end
       r.update_gsheet(gdrive_slot)
-      r.update_attributes(:last_run=>Time.now.utc)
+      r.update_attributes(:completed_at=>Time.now.utc)
     end
 
     def dataset
@@ -77,7 +79,7 @@ module Mobilize
       r = self
       jobs_sheet = Gsheet.find_or_create_by_path(r.path,gdrive_slot)
       jobs_sheet.add_headers(r.headers)
-      jobs_sheet.delete_sheet1
+      begin;jobs_sheet.delete_sheet1;rescue;end #don't care if sheet1 deletion fails
       return jobs_sheet
     end
 
@@ -128,7 +130,12 @@ module Mobilize
     def update_gsheet(gdrive_slot)
       r = self
       jobs_gsheet = r.gsheet(gdrive_slot)
-      upd_rows = r.jobs.map{|j| {'name'=>j.name, 'active'=>j.active, 'status'=>j.status} }
+      upd_jobs = r.jobs.select do |j|
+                                 j.completed_at.nil? ||
+                                 j.completed_at > j.runner.completed_at ||
+                                 (j.failed_at and j.failed_at > j.runner.completed_at)
+                               end
+      upd_rows = upd_jobs.map{|j| {'name'=>j.name, 'active'=>j.active, 'status'=>j.status}}
       jobs_gsheet.add_or_update_rows(upd_rows)
       r.update_status("gsheet updated")
       return true
@@ -152,7 +159,7 @@ module Mobilize
 
     def update_status(msg)
       r = self
-      r.update_attributes(:status=>msg)
+      r.update_attributes(:status=>msg, :status_at=>Time.now.utc)
       Mobilize::Resque.set_worker_args_by_path(r.path,{'status'=>msg})
       return true
     end
@@ -165,12 +172,13 @@ module Mobilize
     def is_due?
       r = self.reload
       return false if r.is_working?
-      last_due_time = Time.now.utc - Jobtracker.runner_read_freq
-      return true if r.last_run.nil? or r.last_run < last_due_time
+      prev_due_time = Time.now.utc - Jobtracker.runner_read_freq
+      return true if r.started_at.nil? or r.started_at < prev_due_time
     end
 
     def enqueue!
       r = self
+      r.update_attributes(:started_at=>Time.now.utc)
       ::Resque::Job.create("mobilize",Runner,r.path,{})
       return true
     end

data/lib/mobilize-base/models/task.rb

@@ -7,8 +7,10 @@ module Mobilize
     field :call, type: String
     field :param_string, type: Array
     field :status, type: String
-    field :last_completed_at, type: Time
-    field :last_run_at, type: Time
+    field :completed_at, type: Time
+    field :started_at, type: Time
+    field :failed_at, type: Time
+    field :status_at, type: Time
 
     index({ path: 1})
 
@@ -27,9 +29,14 @@ module Mobilize
       Dataset.find_or_create_by_handler_and_path("gridfs","#{t.path}/stderr")
     end
 
+    def log_dataset
+      t = self
+      Dataset.find_or_create_by_handler_and_path("gridfs","#{t.path}/log")
+    end
+
     def params
       t = self
-      t.param_string.split(",").map do |p| 
+      t.param_string.split(",").map do |p|
         ps = p.strip
         ps = ps[1..-1] if ['"',"'"].include?(ps[0])
         ps = ps[0..-2] if ['"',"'"].include?(ps[-1])
@@ -69,12 +76,16 @@ module Mobilize
       t.update_status(%{Starting at #{Time.now.utc}})
       stdout, stderr = [nil,nil]
       begin
-        stdout = "Mobilize::#{t.handler.humanize}".constantize.send("#{t.call}_by_task_path",t.path).to_s
+        stdout,log = "Mobilize::#{t.handler.humanize}".constantize.send("#{t.call}_by_task_path",t.path).to_s
+        #write to log if method returns an array w 2 members
+        t.log_dataset.write_cache(log) if log
       rescue ScriptError, StandardError => exc
         stderr = [exc.to_s,exc.backtrace.to_s].join("\n")
-        #record the failure in Job so it appears on Runner
-        j.update_attributes(:status=>"Failed at #{Time.now.utc.to_s}")
-        t.update_attributes(:status=>"Failed at #{Time.now.utc.to_s}")
+        #record the failure in Job so it appears on Runner, turn it off
+        #so it doesn't run again
+        j.update_attributes(:active=>false)
+        t.update_attributes(:failed_at=>Time.now.utc)
+        t.update_status("Failed at #{Time.now.utc.to_s}")
         raise exc
       end
       if stdout == false
@@ -86,12 +97,13 @@ module Mobilize
       t.stdout_dataset.write_cache(stdout)
       t.update_attributes(:status=>"Completed at #{Time.now.utc.to_s}")
       if t.idx == j.tasks.length
-        j.update_attributes(:status=>"Completed at #{Time.now.utc.to_s}",:last_completed_at=>Time.now.utc)
-        j.update_attributes(:active=>false) if j.trigger.strip == "once"
-        t.update_attributes(:status=>"Completed at #{Time.now.utc.to_s}",:last_completed_at=>Time.now.utc)
+        #job has completed
+        j.update_attributes(:active=>false) if j.trigger.strip.downcase == "once"
+        t.update_attributes(:completed_at=>Time.now.utc)
+        t.update_status("Completed at #{Time.now.utc.to_s}")
         #check for any dependent jobs, if there are, enqueue them
         r = j.runner
-        dep_jobs = r.jobs.select{|dj| dj.active==true and dj.trigger=="after #{j.name}"}
+        dep_jobs = r.jobs.select{|dj| dj.active==true and dj.trigger.strip.downcase == "after #{j.name}"}
         #put begin/rescue so all dependencies run
         dep_jobs.each{|dj| begin;dj.tasks.first.enqueue! unless dj.is_working?;rescue;end}
       else
@@ -103,6 +115,7 @@ module Mobilize
 
     def enqueue!
       t = self
+      t.update_attributes(:started_at=>Time.now.utc)
       ::Resque::Job.create("mobilize",Task,t.path,{})
       return true
     end
@@ -124,7 +137,7 @@ module Mobilize
 
     def update_status(msg)
       t = self
-      t.update_attributes(:status=>msg)
+      t.update_attributes(:status=>msg,:status_at=>Time.now.utc)
       Mobilize::Resque.set_worker_args_by_path(t.path,{'status'=>msg})
       return true
     end

data/lib/mobilize-base/rakes.rb

@@ -1,10 +1,7 @@
-# require 'resque/tasks'
-# will give you the resque tasks
-
-namespace :mobilize do
-  require 'mobilize-base'
+namespace :mobilize_base do
   desc "Start a Resque worker"
   task :work do
+    require 'mobilize-base'
     begin
       #require specified mobilize gems
       Mobilize::Base.config('jobtracker')['extensions'].each do |e|
@@ -23,17 +20,41 @@ namespace :mobilize do
 
     worker.work(ENV['INTERVAL'] || 5) # interval, will block
   end
+  desc "Kill all Resque workers"
+  task :kill_workers do
+    require 'mobilize-base'
+    Mobilize::Jobtracker.kill_workers
+  end
   desc "Kill idle workers not in sync with repo"
-  task :kill_idle_stale_workers do
-    Mobilize::Jobtracker.kill_idle_stale_workers
+  task :kill_idle_and_stale_workers do
+    require 'mobilize-base'
+    Mobilize::Jobtracker.kill_idle_and_stale_workers
   end
-  desc "Make sure workers are prepped"
+  desc "Make sure there are the correct # of workers, kill if too many"
   task :prep_workers do
+    require 'mobilize-base'
     Mobilize::Jobtracker.prep_workers
   end
-end
-namespace :mobilize_base do
-  desc "Set up config and log folders and files"
+  desc "kill all old resque web processes, start new one with resque_web.rb extension file"
+  task :resque_web do
+    require 'mobilize-base'
+    port = Mobilize::Base.config('resque')['web_port']
+    config_dir = (ENV['MOBILIZE_CONFIG_DIR'] ||= "config/mobilize/")
+    full_config_dir = "#{ENV['PWD']}/#{config_dir}"
+    resque_web_extension_path = "#{full_config_dir}resque_web.rb"
+    #kill any resque-web for now
+    `ps aux | grep resque-web | awk '{print $2}' | xargs kill`
+    command = "bundle exec resque-web -p #{port.to_s} #{resque_web_extension_path}"
+    `#{command}`
+  end
+  desc "create indexes for all base models in mongodb"
+  task :create_indexes do
+    require 'mobilize-base'
+    ["Dataset","Job","Runner","Task","User"].each do |m|
+      "Mobilize::#{m}".constantize.create_indexes
+    end
+  end
+  desc "Set up config and log folders and files, populate from samples"
   task :setup do
     config_dir = (ENV['MOBILIZE_CONFIG_DIR'] ||= "config/mobilize/")
     log_dir = (ENV['MOBILIZE_LOG_DIR'] ||= "log/")
@@ -56,11 +77,4 @@ namespace :mobilize_base do
       end
     end
   end
-  desc "create indexes for all base modelsin mongodb"
-  task :create_indexes do
-    require 'mobilize-base'
-    ["Dataset","Job","Runner","Task","User"].each do |m|
-      "Mobilize::#{m}".constantize.create_indexes
-    end
-  end
 end

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.0.5"
+    VERSION = "1.0.6"
   end
 end

data/lib/samples/resque_web.rb

@@ -0,0 +1,4 @@
+#comment out the below if you want no authentication on your web portal (not recommended)
+Resque::Server.use(Rack::Auth::Basic) do |user, password|
+  [user, password] == ['admin', 'changeyourpassword']
+end

data/mobilize-base.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'redis',"~>3.0.0"
   s.add_runtime_dependency 'resque','1.21.0'
   s.add_runtime_dependency 'google_drive','0.3.2'
-  s.add_runtime_dependency 'bluepill','0.0.60'
   s.add_runtime_dependency 'popen4','0.1.2'
   s.add_runtime_dependency 'actionmailer','3.1.1'
 end

data/test/mobilize-base_test.rb

@@ -44,15 +44,24 @@ describe "Mobilize" do
     puts "add row to jobs sheet, wait 120s"
     test_job_rows = ::YAML.load_file("#{Mobilize::Base.root}/test/base_job_rows.yml")
     jobs_sheet.add_or_update_rows(test_job_rows)
-
-    puts "job row added, force enqueued runner"
-    r.enqueue!
     sleep 120
 
     puts "jobtracker posted test sheet data to test destination, and checksum succeeded?"
-    test_target_sheet = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/base1.out",gdrive_slot)
+    test_target_sheet_1 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/base1.out",gdrive_slot)
+    test_target_sheet_1 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/base1.out",gdrive_slot)
+
+
+    assert test_target_sheet_1.to_tsv == test_source_sheet.to_tsv
 
-    assert test_target_sheet.to_tsv == test_source_sheet.to_tsv
+    puts "delete both output sheets, set first job to active=true"
+    test_target_sheet_1.delete
+
+    jobs_sheet.add_or_update_rows([{'name'=>'base1','active'=>true}])
+    sleep 90
+    
+    test_target_sheet_2 = Mobilize::Gsheet.find_by_path("#{r.path.split("/")[0..-2].join("/")}/base1.out",gdrive_slot)
+    puts "jobtracker posted test sheet data to test destination, and checksum succeeded?"
+    assert test_target_sheet_2.to_tsv == test_source_sheet.to_tsv
 
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -139,22 +139,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.2
-- !ruby/object:Gem::Dependency
-  name: bluepill
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.60
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.0.60
 - !ruby/object:Gem::Dependency
   name: popen4
   requirement: !ruby/object:Gem::Requirement
@@ -226,7 +210,6 @@ files:
 - lib/mobilize-base/models/task.rb
 - lib/mobilize-base/models/user.rb
 - lib/mobilize-base/rakes.rb
-- lib/mobilize-base/tasks/mobilize-base.rake
 - lib/mobilize-base/version.rb
 - lib/samples/gdrive.yml
 - lib/samples/gridfs.yml
@@ -234,6 +217,7 @@ files:
 - lib/samples/jobtracker.yml
 - lib/samples/mongoid.yml
 - lib/samples/resque.yml
+- lib/samples/resque_web.rb
 - mobilize-base.gemspec
 - test/base1_task1.yml
 - test/base_job_rows.yml
@@ -254,7 +238,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 64363452051803879
+      hash: -3010357704785525623
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -263,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 64363452051803879
+      hash: -3010357704785525623
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24

data/lib/mobilize-base/tasks/mobilize-base.rake

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../../lib'
-require 'mobilize-base/tasks'