mobilize-base 1.1.08 → 1.1.10

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

@@ -47,7 +47,7 @@ module Mobilize
 
     #email management - used to make sure not too many emails get used at the same time
     def Gdrive.slot_worker_by_path(path)
-      working_slots = Mobilize::Resque.jobs('working').map{|j| j['gdrive_slot'] if (j and j['gdrive_slot'])}.compact
+      working_slots = Mobilize::Resque.jobs.map{|j| begin j['args'][1]['gdrive_slot'];rescue;nil;end}.compact.uniq
       Gdrive.workers.sort_by{rand}.each do |w|
         unless working_slots.include?([w['name'],Gdrive.domain].join("@"))
           Mobilize::Resque.set_worker_args_by_path(path,{'gdrive_slot'=>[w['name'],Gdrive.domain].join("@")})

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

@@ -57,8 +57,18 @@ module Mobilize
       tsv = source_dst.read(user.name)
       sheet_name = target_path.split("/").last
       temp_path = [stage_path.gridsafe,sheet_name].join("/")
+      #find and delete temp sheet, if any
+      temp_sheet = Gsheet.find_by_path(temp_path,gdrive_slot)
+      temp_sheet.delete if temp_sheet
+      #write data to temp sheet
       temp_sheet = Gsheet.find_or_create_by_path(temp_path,gdrive_slot)
-      temp_sheet.write(tsv,Gdrive.owner_name)
+      #this step has a tendency to fail; if it does,
+      #don't fail the stage, mark it as false
+      begin
+        temp_sheet.write(tsv,Gdrive.owner_name)
+      rescue
+        return nil
+      end
       temp_sheet.check_and_fix(tsv)
       target_sheet = Gsheet.find_by_path(target_path,gdrive_slot)
       unless target_sheet
@@ -68,7 +78,13 @@ module Mobilize
         target_sheet.spreadsheet.update_acl(user.email,"writer") unless target_sheet.spreadsheet.acl_entry(user.email).ie{|e| e and e.role=="owner"}
         target_sheet.delete_sheet1
       end
-      target_sheet.merge(temp_sheet,user.name)
+      #this step has a tendency to fail; if it does,
+      #don't fail the stage, mark it as false
+      begin
+        target_sheet.merge(temp_sheet,user.name)
+      rescue
+        return nil
+      end
       #delete the temp sheet's book
       temp_sheet.spreadsheet.delete
       status = "Write successful for #{target_path}"

data/lib/mobilize-base/version.rb

@@ -1,5 +1,5 @@
 module Mobilize
   module Base
-    VERSION = "1.1.08"
+    VERSION = "1.1.10"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: 1.1.08
+  version: 1.1.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-22 00:00:00.000000000 Z
+date: 2013-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -239,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2754609569538544720
+      hash: 944227401708125254
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2754609569538544720
+      hash: 944227401708125254
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.24