Fix typos, grammar errors, and a logic bug in noc_controller (#1600)

Signed-off-by: rafsanneloy <rafsanneloy@gmail.com>

Author: RafsanNeloy

Bourreau/spec/boutiques/boutiques_tester_spec.rb

@@ -220,7 +220,7 @@
       context 'cluster_command substitution' do
 
         # Test basic command substitution correctness
-        it "should correctly subsitute cluster_commands with default settings" do
+        it "should correctly substitute cluster_commands with default settings" do
           task = @generateTask.( { a: 'value' } )
           expect( task.cluster_commands[0].strip ).to eq( '/minimalApp -a value' )
         end
@@ -239,15 +239,15 @@
         end
 
         # Test output flag substitution
-        it "should correctly subsitute cluster_commands with output keys" do
+        it "should correctly substitute cluster_commands with output keys" do
           @descriptor['command-line'] += ' [OUT-KEY]'
           @descriptor['output-files'][0].merge!( { 'value-key' => '[OUT-KEY]', 'command-line-flag' => '-o' } )
           task = @generateTask.( { a: 'value' } )
           expect( task.cluster_commands[0].strip ).to eq( '/minimalApp -a value -o value' )
         end
 
         # Test output flag separator substitution
-        it "should correctly subsitute cluster_commands with output keys and a separator" do
+        it "should correctly substitute cluster_commands with output keys and a separator" do
           @descriptor['command-line'] += ' [OUT-KEY]'
           @descriptor['output-files'][0].merge!( {
             'value-key'                   => '[OUT-KEY]',
@@ -258,7 +258,7 @@
         end
 
         # Test output flag separator substitution with prior path-template substitution
-        it "should correctly subsitute cluster_commands with output flag separators and path-template substitutions" do
+        it "should correctly substitute cluster_commands with output flag separators and path-template substitutions" do
           @descriptor['command-line'] += ' [B] [OUT-KEY]'
           @descriptor['inputs'] << GenerateJsonInputDefault.('b','Number','Numerical arg')
           @descriptor['output-files'][0].merge!( {

BrainPortal/app/controllers/access_profiles_controller.rb

@@ -100,7 +100,7 @@ def update #:nodoc:
       end
     end
 
-    # New users added to the the AP? Adjust their groups
+    # New users added to the AP? Adjust their groups
     added_uids   = new_user_ids - old_user_ids
     User.find(added_uids).each do |user|
       orig_user_gids = user.group_ids
@@ -109,7 +109,7 @@ def update #:nodoc:
                                       Group, orig_user_gids, user.group_ids, current_user)
     end
 
-    # Some users lost access to the the AP? Adjust their groups
+    # Some users lost access to the AP? Adjust their groups
     removed_uids = old_user_ids - new_user_ids
     User.find(removed_uids).each do |user|
       orig_user_gids = user.group_ids

BrainPortal/app/controllers/bourreaux_controller.rb

@@ -461,7 +461,7 @@ def operation_stop_bac_workers(bourreau) #:nodoc:
 
   public
 
-  # Define disk usage of remote ressource,
+  # Define disk usage of remote resource,
   # with date filtering if wanted.
   def rr_disk_usage
     date_filtering = params[:date_range] || {}
@@ -679,14 +679,14 @@ def cleanup_caches
 
   end
 
-  # Define remote ressource and users accessible/available by
+  # Define remote resource and users accessible/available by
   # the current user.
   def rr_access
     @remote_r = RemoteResource.find_all_accessible_by_user(current_user).all.sort { |a,b| a.name <=> b.name }
     @users    = current_user.available_users.all.sort { |a,b| a.login <=> b.login }
   end
 
-  # Define which remote resource can acces which data provider.
+  # Define which remote resource can access which data provider.
   def rr_access_dp
     @rrs = RemoteResource.find_all_accessible_by_user(current_user).all.sort do |a,b|
            (b.online?.to_s <=> a.online?.to_s).nonzero? ||

BrainPortal/app/controllers/noc_controller.rb

@@ -230,7 +230,7 @@ def gather_info(since_when) #:nodoc:
                        .sum(:value)
 
     # This is used to adjust the color ranges
-    @num_hours     = (Time.now - since_when) / 24.hours; @num_hours = 1.0 if @num_hours < 1
+    @num_hours     = (Time.now - since_when) / 1.hour; @num_hours = 1.0 if @num_hours < 1
 
     # This is used to debug layout issues by generating random numbers
     if fake

BrainPortal/app/controllers/portal_controller.rb

@@ -446,7 +446,7 @@ def swagger
       return
     end
 
-    # FIXME the way we exatrct the version number from the file name is brittle...
+    # FIXME the way we extract the version number from the file name is brittle...
     @spec_version = @specfile.sub("cbrain-","").sub(/-swagger.*/,"")
 
     respond_to do |format|

BrainPortal/app/controllers/quotas_controller.rb

@@ -96,7 +96,7 @@ def new
     # Try to find an existing quota record; nils will mean we fetch nothing
     @quota = model.where( atts ).first
 
-    # If we haven't found an existing quota entry, we intialize a new one.
+    # If we haven't found an existing quota entry, we initialize a new one.
     # It can contain nils for the attributes.
     @quota ||= model.new( atts )
 
@@ -218,7 +218,7 @@ def report_cpu_quotas
         .group(:user_id,:remote_resource_id).sum(:value)
     end
 
-    # These two lamdas transform the hashes above into new hashes
+    # These two lambdas transform the hashes above into new hashes
     # where the top level is a UID (user or bourreau) and the key is
     # a hash with a subset of the entries for each. It's darn complicated.
     # For help, try this in Ruby shell:
@@ -407,7 +407,7 @@ def guess_size_units(sizestring)
 
   # Tries to turn strings like '2h' into 7200 (for 7200 seconds, etc).
   # Supported suffixes are s, h, d, m, w, and y (case insensitive).
-  # Minutes not supported because of the sad existance of months.
+  # Minutes not supported because of the sad existence of months.
   def guess_time_units(timestring)
     match = timestring.match(/\A\s*(\d{1,4}(\.\d{1,2})?)\s*([shdwmy]?)\s*\z/i)
     return "" unless match # parsing error

BrainPortal/app/controllers/tasks_controller.rb

@@ -367,7 +367,7 @@ def create #:nodoc:
     new_task_params = task_params() # filters and censors
 
     @task           = create_initial_task_from_form(new_task_params, params[:tool_id])
-    @tool_config    = @task.tool_config # for acces in view
+    @tool_config    = @task.tool_config # for access in view
 
     # Give a task the ability to do a refresh of its form
     commit_name     = extract_params_key([ :refresh, :load_preset, :delete_preset, :save_preset ])

BrainPortal/app/controllers/userfiles_controller.rb

@@ -1117,7 +1117,7 @@ def change_provider #:nodoc:
   def delete_files #:nodoc:
     filelist    = params[:file_ids] || []
 
-    # Select all accessible files with write acces by the user.
+    # Select all accessible files with write access by the user.
     to_delete_ids = Userfile.accessible_for_user(current_user, :access_requested => :write).where(:id => filelist).pluck(:id)
     not_accessible_count = filelist.size - to_delete_ids.size
 
@@ -1637,7 +1637,7 @@ def extract_from_archive(archive_file_name, file_type = nil, attributes = {}) #:
   # TODO: FIXME . Not sure how to fix.
   #
   # Note on the name of the method: a previous version tried to
-  # create a symlink structure, but that transferred hte values of
+  # create a symlink structure, but that transferred the values of
   # all symbolic links internal to the userfiles on LINUX.
   # See also: the -H option of tar on MacOS X which would do the trick,
   # but doesn't exist on LINUX.

BrainPortal/app/helpers/access_report_helper.rb

@@ -25,12 +25,12 @@ module AccessReportHelper
 
   Revision_info=CbrainFileRevision[__FILE__] #:nodoc:
 
-  # Produces a pretty times symbol (used to show unavailable ressources)
+  # Produces a pretty times symbol (used to show unavailable resources)
   def times_icon(color="red")
     "<span style=\"color:#{color}\" class=\"bold_icon\">&times;</span>".html_safe
   end
 
-  # Produces a pretty o symbol (used to show available ressources)
+  # Produces a pretty o symbol (used to show available resources)
   def o_icon(color="green")
     "<span style=\"color:#{color}\" class=\"bold_icon\">&#927;</span>".html_safe
   end

BrainPortal/app/models/background_activity.rb

@@ -312,7 +312,7 @@ def process_next_item
   # This method should not produce too much text,
   # even when there are thousands of items in the
   # current object; the point is only to let the
-  # user know what happened when error occured.
+  # user know what happened when error occurred.
   #
   # The default behavior is to ignore all blank messages
   # or messages that are numbers (for background activities