mobilize-base 1.365 → 1.366

data/lib/mobilize-base/jobtracker.rb

@@ -86,7 +86,7 @@ module Mobilize
           #check for run_now file
           run_now_dir = "/home/#{u.name}/mobilize/"
           run_now_path = "#{run_now_dir}run_now"
-          run_now = if File.exists?(run_now_dir) and File.exists?(run_now_path)
+          run_now = if `sudo ls #{run_now_dir}`.split("\n").include?("run_now")
                       #delete user's run now file
                       `sudo rm -rf #{run_now_path}`
                       true

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

@@ -26,7 +26,9 @@ module Mobilize
       gdrive_slot = Gdrive.slot_worker_by_path(r.path)
       unless gdrive_slot
         r.update_status("no gdrive slot available")
-        return false
+        #re-queue so we can wait for slot
+        r.enqueue!
+        return nil
       end
       r.update_attributes(:started_at=>Time.now.utc)
       begin

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

@@ -83,9 +83,9 @@ module Mobilize
     def complete(response)
       s = self
       j = s.job
+      r = j.runner
       if s.idx == j.stages.length
         #check for any dependent jobs, if there are, enqueue them
-        r = j.runner
         dep_jobs = r.jobs.select do |dj|
                                    dj.active==true and
                                      dj.trigger.strip.downcase == "after #{j.name.downcase}"
@@ -93,7 +93,8 @@ module Mobilize
         #put begin/rescue so all dependencies run
         dep_jobs.each do |dj|
                         begin
-                          unless dj.is_working?
+                          dj_methods = dj.stages.map{|ds| "#{ds.handler}.#{ds.call}"}.uniq
+                          unless dj.is_working? or (Jobtracker.disabled_methods & dj_methods).length>0
                             dj.stages.first.update_attributes(:retries_done=>0)
                             dj.stages.first.enqueue!
                           end
@@ -131,11 +132,6 @@ module Mobilize
       j = s.job
       r = j.runner
       u = r.user
-      begin
-        j.update_attributes(:active=>false) if s.params['always_on'].to_s=="false"
-      rescue StandardError, ScriptError
-        #skip due to parse error on params
-      end
       s.update_attributes(:failed_at=>Time.now.utc,:response=>response)
       stage_name = "#{j.name}_stage#{s.idx.to_s}.err"
       target_path =  (r.path.split("/")[0..-2] + [stage_name]).join("/")

data/lib/mobilize-base/tasks.rb

@@ -65,7 +65,7 @@ namespace :mobilize do
     Mobilize::Jobtracker.restart!
   end
   desc "Add a user and set up local files"
-  task :add_base_user, :name, :env do |t,args|
+  task :add_user, :name, :env do |t,args|
     ENV['MOBILIZE_ENV']=args.env
     require 'mobilize-base'
     u = Mobilize::User.find_or_create_by_name(args.name)
@@ -83,6 +83,13 @@ namespace :mobilize do
     user,job,stage = args.path.split("/")
     Mobilize::Stage.where(path: "Runner_#{user}/jobs/#{job}/#{stage}").first.enqueue!
   end
+  desc "Remap http_url for Gbook, Gfile, etc."
+  task :remap_http_url, :handler, :path, :http_url, :env do |t,args|
+    ENV['MOBILIZE_ENV']=args.env
+    require 'mobilize-base'
+    dst = Mobilize::Dataset.find_or_create_by_handler_and_path(args.handler,args.path)
+    dst.update_attributes(:http_url=>args.http_url)
+  end
   desc "kill all old resque web processes, start new one with resque_web.rb extension file"
   task :resque_web, :env do |t,args|
     ENV['MOBILIZE_ENV']=args.env

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.365"
+    VERSION = "1.366"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.365'
+  version: '1.366'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4397843469439206987
+      hash: 2855481328417912899
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -243,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4397843469439206987
+      hash: 2855481328417912899
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25