mobilize-base 1.364 → 1.365

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

@@ -204,8 +204,14 @@ module GoogleDrive
                 end
               else
                 #"loc_v=>#{loc_v.to_s},rem_v=>#{rem_v.to_s}".oputs
-                if loc_v.force_encoding("UTF-8") != rem_v.force_encoding("UTF-8")
-                #make sure it's not an ecoding issue
+                begin 
+                  if loc_v.force_encoding("UTF-8") != rem_v.force_encoding("UTF-8")
+                  #make sure it's not an ecoding issue
+                    "row #{row_i.to_s} col #{col_i.to_s}: Local=>#{loc_v} , Remote=>#{rem_v}".oputs
+                    errcnt+=1
+                  end
+                rescue => exc
+                  "#{exc.to_s}".oputs
                   "row #{row_i.to_s} col #{col_i.to_s}: Local=>#{loc_v} , Remote=>#{rem_v}".oputs
                   errcnt+=1
                 end

data/lib/mobilize-base/handlers/google/gmail.rb

@@ -2,7 +2,6 @@ module Mobilize
   require 'action_mailer'
   class Gmail < ActionMailer::Base
     ActionMailer::Base.delivery_method = :smtp
-    
     ActionMailer::Base.smtp_settings = {
     :address              => "smtp.gmail.com",
     :port                 => 587,

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

@@ -162,11 +162,10 @@ module Mobilize
         rescue => exc
           if retries < Gdrive.max_file_write_retries
             retries +=1
-            sleep Gdrive.file_write_retry_delay
-          else
             stdout = nil
             stderr = [exc.to_s,"\n",exc.backtrace.join("\n")].join
             signal = 500
+            sleep Gdrive.file_write_retry_delay
           end
         end
       end

data/lib/mobilize-base/jobtracker.rb

@@ -40,7 +40,8 @@ module Mobilize
               n['body'] += "\n\n#{runner_dst.http_url}" if runner_dst and runner_dst.http_url
             end
             n['to'] = email
-            n['bcc'] = [Gdrive.admin_group_name,Gdrive.domain].join("@")
+            #uncomment to receive a copy of emails sent to users
+            #n['bcc'] = [Gdrive.admin_group_name,Gdrive.domain].join("@")
             notifs << n
           end
         end

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

@@ -112,6 +112,15 @@ module Mobilize
       #to make sure it doesn't enqueue due to runner check
       s.update_attributes(:completed_at=>Time.now.utc,:response=>response)
       s.update_status("Completed at #{Time.now.utc.to_s}")
+      #delete error sheet if any
+      begin
+        err_sheet_name = "#{j.name}_stage#{s.idx.to_s}.err"
+        err_sheet_path =  (r.path.split("/")[0..-2] + [err_sheet_name]).join("/")
+        err_sheet = Gsheet.find_by_path(err_sheet_path,gdrive_slot)
+        err_sheet.delete if err_sheet
+      rescue
+        #if it doesn't delete, whatever
+      end
       true
     end
 

data/lib/mobilize-base/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobilize-base
 version: !ruby/object:Gem::Version
-  version: '1.364'
+  version: '1.365'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-13 00:00:00.000000000 Z
+date: 2013-06-14 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: 3043585426916430228
+      hash: 4397843469439206987
 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: 3043585426916430228
+      hash: 4397843469439206987
 requirements: []
 rubyforge_project: mobilize-base
 rubygems_version: 1.8.25