lib/openstudio/analysis/server_api.rb in openstudio-analysis-0.3.6 vs lib/openstudio/analysis/server_api.rb in openstudio-analysis-0.3.7

@@ -267,11 +267,11 @@
       def download_database(save_directory = '.')
         downloaded = false
         file_path_and_name = nil
 
         response = @conn.get do |r|
-          r.url  '/admin/backup_database?full_backup=true'
+          r.url '/admin/backup_database?full_backup=true'
           r.options.timeout = 3600 # 60 minutes
         end
 
         if response.status == 200
           filename = response['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
@@ -377,24 +377,24 @@
 
         # read in the analysis id from the analysis.json file
         analysis_id = nil
         if formulation_json
           if options[:reset_uuids]
-            analysis_id = UUID.new.generate
+            analysis_id = SecureRandom.uuid
             formulation_json[:analysis][:uuid] = analysis_id
 
             formulation_json[:analysis][:problem][:workflow].each do |wf|
-              wf[:uuid] = UUID.new.generate
+              wf[:uuid] = SecureRandom.uuid
               if wf[:arguments]
                 wf[:arguments].each do |arg|
-                  arg[:uuid] = UUID.new.generate
+                  arg[:uuid] = SecureRandom.uuid
                 end
               end
               if wf[:variables]
                 wf[:variables].each do |var|
-                  var[:uuid] = UUID.new.generate
-                  var[:argument][:uuid] = UUID.new.generate if var[:argument]
+                  var[:uuid] = SecureRandom.uuid
+                  var[:argument][:uuid] = SecureRandom.uuid if var[:argument]
                 end
               end
             end
           else
             analysis_id = formulation_json[:analysis][:uuid]
@@ -405,11 +405,11 @@
         else
           formulation_json = {
             analysis: options
           }
           puts formulation_json
-          analysis_id = UUID.new.generate
+          analysis_id = SecureRandom.uuid
           formulation_json[:analysis][:uuid] = analysis_id
         end
         fail "No analysis id defined in analyis.json #{options[:formulation_file]}" if analysis_id.nil?
 
         # save out this file to compare
@@ -438,11 +438,10 @@
           payload = { file: Faraday::UploadIO.new(options[:upload_file], 'application/zip') }
           response = @conn_multipart.post "analyses/#{analysis_id}/upload.json", payload do |req|
             req.options[:timeout] = 1800 # seconds
           end
 
-
           if response.status == 201
             puts 'Successfully uploaded ZIP file'
           else
             fail response.inspect
           end
@@ -461,10 +460,10 @@
 
         dp_hash = JSON.parse(File.open(options[:datapoint_file]).read, symbolize_names: true)
 
         if options[:reset_uuids]
           dp_hash[:analysis_uuid] = analysis_id
-          dp_hash[:uuid] = UUID.new.generate
+          dp_hash[:uuid] = SecureRandom.uuid
         end
 
         # merge in the analysis_id as it has to be what is in the database
         response = @conn.post do |req|
           req.url "analyses/#{analysis_id}/data_points.json"