openstudio-analysis 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d469b01b41e34a2532d51c4fee63d0b8d9ed2f48
-  data.tar.gz: 4826616b6e98102ecbaba4643189a919d2722f3d
+  metadata.gz: 15a5a8290b759332184a73846a76ece6de4f90f3
+  data.tar.gz: cd308376243524a8e739758f137859d3cb7d1f85
 SHA512:
-  metadata.gz: d4c0ec3e4fd6f679aca4f3dc2ea5b8f573e1bbe47c42077b3281da349893f97bbbefce73b1121ceaee3ac798fad6bde2b9e1104ba729a0c93fd414258dbf0ac5
-  data.tar.gz: d429af8696a0284fff428f1af84894c95690395af39cbceb6bddb11ef40bf3ccdebe22d1387508aafbb94d807e0f6ef83a7f7fa9f59397e2abd54006ae124834
+  metadata.gz: 4312b0092d6c882efeb3b51036af00b391c4d4f1433749a89415574fc0c0b4ee20bcc8999631364e148ab667e684d443faaef67fe00bc2926a75890b798884a3
+  data.tar.gz: ebf2b276c50fbd32b5fffc6fb8809fc1f21059724fecb32a9372754d234f972d386c4cf55b7a4b530ee6202dee802d22a9a492376c9d2e62f695d5b03671386e

data/lib/openstudio/analysis/server_api.rb

@@ -1,4 +1,4 @@
-# Class manages the communication with the server.  
+# Class manages the communication with the server.
 # Presently, this class is simple and stores all information in hashs
 module OpenStudio
   module Analysis
@@ -6,54 +6,54 @@ module OpenStudio
       attr_reader :hostname
 
       def initialize(options = {})
-        defaults = {:hostname => "http://localhost:8080"}
+        defaults = { hostname: 'http://localhost:8080' }
         options = defaults.merge(options)
-        @logger = Logger.new("faraday.log")
-        
+        @logger = Logger.new('faraday.log')
+
         @hostname = options[:hostname]
 
-        raise "no host defined for server api class" if @hostname.nil?
+        fail 'no host defined for server api class' if @hostname.nil?
 
         # todo: add support for the proxy
-        
+
         # create connection with basic capabilities
-        @conn = Faraday.new(:url => @hostname) do |faraday|
+        @conn = Faraday.new(url: @hostname) do |faraday|
           faraday.request :url_encoded # form-encode POST params
           faraday.use Faraday::Response::Logger, @logger
-          #faraday.response @logger # log requests to STDOUT
+          # faraday.response @logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
         end
 
         # create connection to server api with multipart capabilities
-        @conn_multipart = Faraday.new(:url => @hostname) do |faraday|
+        @conn_multipart = Faraday.new(url: @hostname) do |faraday|
           faraday.request :multipart
           faraday.request :url_encoded # form-encode POST params
           faraday.use Faraday::Response::Logger, @logger
-          #faraday.response :logger # log requests to STDOUT
+          # faraday.response :logger # log requests to STDOUT
           faraday.adapter Faraday.default_adapter # make requests with Net::HTTP
         end
       end
 
-      def get_projects()
+      def get_projects
         response = @conn.get '/projects.json'
 
         projects_json = nil
         if response.status == 200
-          projects_json = JSON.parse(response.body, :symbolize_names => true, :max_nesting => false)
+          projects_json = JSON.parse(response.body, symbolize_names: true, max_nesting: false)
         else
-          raise "did not receive a 200 in get_projects"
+          fail 'did not receive a 200 in get_projects'
         end
 
         projects_json
       end
 
-      def get_project_ids()
-        ids = get_projects()
+      def get_project_ids
+        ids = get_projects
         ids.map { |project| project[:uuid] }
       end
 
-      def delete_all()
-        ids = get_project_ids()
+      def delete_all
+        ids = get_project_ids
         puts "Deleting Projects #{ids}"
         ids.each do |id|
           response = @conn.delete "/projects/#{id}.json"
@@ -66,25 +66,26 @@ module OpenStudio
       end
 
       def new_project(options = {})
-        defaults = {project_name: "project #{(rand()*1000).round}"}
+        defaults = { project_name: "Project #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}" }
         options = defaults.merge(options)
         project_id = nil
 
-        project_hash = {project: {name: "#{options[:project_name]}"}}
+        # TODO: make this a display name and a machine name
+	       project_hash = { project: { name: "#{options[:project_name]}" } }
 
         response = @conn.post do |req|
-          req.url "/projects.json"
+          req.url '/projects.json'
           req.headers['Content-Type'] = 'application/json'
           req.body = project_hash.to_json
         end
 
         if response.status == 201
-          project_id = JSON.parse(response.body)["_id"]
+          project_id = JSON.parse(response.body)['_id']
 
           puts "new project created with ID: #{project_id}"
-          #grab the project id
+          # grab the project id
         elsif response.status == 500
-          puts "500 Error"
+          puts '500 Error'
           puts response.inspect
         end
 
@@ -95,9 +96,9 @@ module OpenStudio
         analysis_ids = []
         response = @conn.get "/projects/#{project_id}.json"
         if response.status == 200
-          puts "received the list of analyses for the project"
+          puts 'received the list of analyses for the project'
 
-          analyses = JSON.parse(response.body, :symbolize_names => true, :max_nesting => false)
+          analyses = JSON.parse(response.body, symbolize_names: true, max_nesting: false)
           if analyses[:analyses]
             analyses[:analyses].each do |analysis|
               analysis_ids << analysis[:_id]
@@ -109,14 +110,14 @@ module OpenStudio
       end
 
       def new_analysis(project_id, options)
-        defaults = {analysis_name: nil, reset_uuids: false}
+        defaults = { analysis_name: nil, reset_uuids: false }
         options = defaults.merge(options)
 
-        raise "No project id passed" if project_id.nil?
-        raise "no formulation passed to new_analysis" if !options[:formulation_file]
-        raise "No formation exists #{options[:formulation_file]}" if !File.exists?(options[:formulation_file])
+        fail 'No project id passed' if project_id.nil?
+        fail 'no formulation passed to new_analysis' unless options[:formulation_file]
+        fail "No formation exists #{options[:formulation_file]}" unless File.exist?(options[:formulation_file])
 
-        formulation_json = JSON.parse(File.read(options[:formulation_file]), :symbolize_names => true)
+        formulation_json = JSON.parse(File.read(options[:formulation_file]), symbolize_names: true)
 
         # read in the analysis id from the analysis.json file
         analysis_id = nil
@@ -143,13 +144,13 @@ module OpenStudio
         else
           analysis_id = formulation_json[:analysis][:uuid]
         end
-        raise "No analysis id defined in analyis.json #{options[:formulation_file]}" if analysis_id.nil?
+        fail "No analysis id defined in analyis.json #{options[:formulation_file]}" if analysis_id.nil?
 
         # set the analysis name
         formulation_json[:analysis][:name] = "#{options[:analysis_name]}" unless options[:analysis_name].nil?
 
         # save out this file to compare
-        #File.open('formulation_merge.json', 'w') { |f| f << JSON.pretty_generate(formulation_json) }
+        # File.open('formulation_merge.json', 'w') { |f| f << JSON.pretty_generate(formulation_json) }
 
         response = @conn.post do |req|
           req.url "projects/#{project_id}/analyses.json"
@@ -159,25 +160,25 @@ module OpenStudio
 
         if response.status == 201
           puts "asked to create analysis with #{analysis_id}"
-          #puts resp.inspect
-          analysis_id = JSON.parse(response.body)["_id"]
+          # puts resp.inspect
+          analysis_id = JSON.parse(response.body)['_id']
 
           puts "new analysis created with ID: #{analysis_id}"
         else
-          raise "Could not create new analysis"
+          fail 'Could not create new analysis'
         end
 
         # check if we need to upload the analysis zip file
         if options[:upload_file]
-          raise "upload file does not exist #{options[:upload_file]}" if !File.exists?(options[:upload_file])
+          fail "upload file does not exist #{options[:upload_file]}" unless File.exist?(options[:upload_file])
 
-          payload = {:file => Faraday::UploadIO.new(options[:upload_file], 'application/zip')}
+          payload = { file: Faraday::UploadIO.new(options[:upload_file], 'application/zip') }
           response = @conn_multipart.post "analyses/#{analysis_id}/upload.json", payload
 
           if response.status == 201
-            puts "Successfully uploaded ZIP file"
+            puts 'Successfully uploaded ZIP file'
           else
-            raise response.inspect
+            fail response.inspect
           end
         end
 
@@ -185,14 +186,14 @@ module OpenStudio
       end
 
       def upload_datapoint(analysis_id, options)
-        defaults = {reset_uuids: false}
+        defaults = { reset_uuids: false }
         options = defaults.merge(options)
 
-        raise "No analysis id passed" if analysis_id.nil?
-        raise "No datapoints file passed to new_analysis" if !options[:datapoint_file]
-        raise "No datapoints_file exists #{options[:datapoint_file]}" if !File.exists?(options[:datapoint_file])
+        fail 'No analysis id passed' if analysis_id.nil?
+        fail 'No datapoints file passed to new_analysis' unless options[:datapoint_file]
+        fail "No datapoints_file exists #{options[:datapoint_file]}" unless File.exist?(options[:datapoint_file])
 
-        dp_hash = JSON.parse(File.open(options[:datapoint_file]).read, :symbolize_names => true)
+        dp_hash = JSON.parse(File.open(options[:datapoint_file]).read, symbolize_names: true)
 
         if options[:reset_uuids]
           dp_hash[:analysis_uuid] = analysis_id
@@ -209,7 +210,7 @@ module OpenStudio
         if response.status == 201
           puts "new datapoints created for analysis #{analysis_id}"
         else
-          raise "could not create new datapoints #{response.body}"
+          fail "could not create new datapoints #{response.body}"
         end
       end
 
@@ -217,11 +218,11 @@ module OpenStudio
         defaults = {}
         options = defaults.merge(options)
 
-        raise "No analysis id passed" if analysis_id.nil?
-        raise "No datapoints file passed to new_analysis" if !options[:datapoints_file]
-        raise "No datapoints_file exists #{options[:datapoints_file]}" if !File.exists?(options[:datapoints_file])
+        fail 'No analysis id passed' if analysis_id.nil?
+        fail 'No datapoints file passed to new_analysis' unless options[:datapoints_file]
+        fail "No datapoints_file exists #{options[:datapoints_file]}" unless File.exist?(options[:datapoints_file])
 
-        dp_hash = JSON.parse(File.open(options[:datapoints_file]).read, :symbolize_names => true)
+        dp_hash = JSON.parse(File.open(options[:datapoints_file]).read, symbolize_names: true)
 
         # merge in the analysis_id as it has to be what is in the database
         response = @conn.post do |req|
@@ -233,12 +234,12 @@ module OpenStudio
         if response.status == 201
           puts "new datapoints created for analysis #{analysis_id}"
         else
-          raise "could not create new datapoints #{response.body}"
+          fail "could not create new datapoints #{response.body}"
         end
       end
 
       def run_analysis(analysis_id, options)
-        defaults = {analysis_action: "start", without_delay: false}
+        defaults = { analysis_action: 'start', without_delay: false }
         options = defaults.merge(options)
 
         puts "Run analysis is configured with #{options.to_json}"
@@ -246,18 +247,18 @@ module OpenStudio
           req.url "analyses/#{analysis_id}/action.json"
           req.headers['Content-Type'] = 'application/json'
           req.body = options.to_json
-          req.options[:timeout] = 1800 #seconds
+          req.options[:timeout] = 1800 # seconds
         end
 
         if response.status == 200
           puts "Recieved request to run analysis #{analysis_id}"
         else
-          raise "Could not start the analysis"
+          fail 'Could not start the analysis'
         end
       end
 
       def kill_analysis(analysis_id)
-        analysis_action = {analysis_action: "stop"}
+        analysis_action = { analysis_action: 'stop' }
 
         response = @conn.post do |req|
           req.url "analyses/#{analysis_id}/action.json"
@@ -268,9 +269,8 @@ module OpenStudio
         if response.status == 200
           puts "Killed analysis #{analysis_id}"
         else
-          #raise "Could not kill the analysis with response of #{response.inspect}"
+          # raise "Could not kill the analysis with response of #{response.inspect}"
         end
-
       end
 
       def kill_all_analyses
@@ -287,21 +287,18 @@ module OpenStudio
         end
       end
 
-
       def get_datapoint_status(analysis_id, filter = nil)
         # get the status of all the entire analysis
-        if !analysis_id.nil?
-          if filter.nil? || filter == ""
+        unless analysis_id.nil?
+          if filter.nil? || filter == ''
             resp = @conn.get "analyses/#{analysis_id}/status.json"
             puts "Data points (all): #{resp}"
           else
-            resp = @conn.get "#{@hostname}/analyses/#{analysis_id}/status.json", {jobs: filter}
+            resp = @conn.get "#{@hostname}/analyses/#{analysis_id}/status.json", jobs: filter
             puts "Data points (#{filter}): #{resp}"
           end
         end
       end
-
     end
   end
-
 end