safegards for old boutiques and misc minor corrections

Author: MontrealSergiy

BrainPortal/app/models/tool_config.rb

@@ -625,21 +625,21 @@ def self.register_descriptor(descriptor, tool_name, tool_version) #:nodoc:
   def self.registered_boutiques_descriptor(tool_name, tool_version) #:nodoc:
     @_descriptors_ ||= {}
     key = [ tool_name, tool_version ] # two strings
-    @_descriptors_[key] = @_descriptors_[key]&.reload_if_file_timestamp_changed
+    @_descriptors_[key] &&= @_descriptors_[key].try :reload_if_file_timestamp_changed  # try to support old style boutiques
     @_descriptors_[key]
   end
 
   def boutiques_descriptor
+    path = boutiques_descriptor_path.presence
+    return self.class.registered_boutiques_descriptor(self.tool.name, self.version_name) if ! path
+
     if @_descriptor_
-      @_descriptor_       = @_descriptor_.reload_if_file_timestamp_changed
+      @_descriptor_     &&= @_descriptor_.try :reload_if_file_timestamp_changed
       key                 = [ self.tool.name, self.version_name ] # two strings
       @_descriptors_[key] = @_descriptor_
       return @_descriptor_
     end
-    path = boutiques_descriptor_path.presence
-    if ! path
-      return self.class.registered_boutiques_descriptor(self.tool.name, self.version_name)
-    end
+
     path = Pathname.new(path)
     path = Pathname.new(CBRAIN::BoutiquesDescriptorsPlugins_Dir) + path if path.relative?
     @_descriptor_ = BoutiquesSupport::BoutiquesDescriptor.new_from_file(path)

BrainPortal/lib/boutiques_support.rb

@@ -182,7 +182,7 @@ def self.new_from_file(path)
 
     def reload_if_file_timestamp_changed()
       filepath = self.from_file
-      return self if filepath.blank? || File.mtime(filepath) == self.mtime_of_file
+      return self if filepath.blank? || (File.mtime(filepath) - self.mtime_of_file ).abs < 1
       self.class.new_from_file(filepath)
     end