openstudio-workflow 0.0.4 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0530685f749da9f5112920053f26b8934ab4861e
-  data.tar.gz: 312ebc0a8b2844f94796214054605e414fc5606f
+  metadata.gz: e81fcf5450aa2cf5f13bc03f0a253f14b95d74e9
+  data.tar.gz: 90a64f53393b213e23b9961a3096895de4fe4f4b
 SHA512:
-  metadata.gz: eebca1c2eac830150a5c8cace44e77724d12090109bd34b224a228645930f85ca7f3bb068bbc254e0437719e9e8a5a23aaf5850aad18fdf45fe439cfe5b29f23
-  data.tar.gz: 6eb722576d2142d9de21aa193703783ee4115ffa203a4d5f99c38438524cfa974e9972dc7485289790fc83736bf1fc97be1aba0bf4c099ac9eb4bf41a036bab8
+  metadata.gz: 6d95bdac9f31a85775003125291db53cabf63be1bf2a054fe79def4a1281f05f422b68cd23d4cc2f37132d286288ed0cdcf610b790ea7c92103f42ae20499dd2
+  data.tar.gz: 22491f3a0392364381028ef6287cf0dc2a4a837388da2a62013caa981799cb797f98a2150176b05b6055f87fb350230609e99c95c7ca7ccfc301435111758636

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 OpenStudio::Workflow Change Log
 ==================================
 
-Version 0.0.4 (Unreleased)
+Version 0.1.1
+------------------
+* Catch exception when loading a measure file.
+* Enable running simulations on windows and mac
+  * Use rubyzip gem instead of system call
+  * Fix the double directory which caused the zip files to behave strangely on windows
+  * New find_energyplus method which tries to use OpenStudio's version of EnergyPlus
+* Copy all EnergyPlus files into run directory
+* Better cleanup after EnergyPlus simulation
+* Read machine information from /etc/openstudio-server directory, if available
+
+
+Version 0.1.0
+-------------
+* Tests for programmatically creating the analysis.json files from the OpenStudio-analysis-gem
+* Upgrade to EnergyPlus 8.2. Right now the run energyplus and run runmanager job hard code these paths.
+* Upgrade and fix Facter facts to grab the correct ip address when running on EC2
+
+Version 0.0.4
 -------------
 * Include rubyXL gem for reading/writing MS Excel files
 * Remove invalid characters from OpenStudio Measure Attributes. /[|!@#\$%^&\*\(\)\{\}\\\[\]|;:'",<.>\/?\+=]+/

data/README.md

@@ -1,19 +1,19 @@
 # OpenStudio::Workflow
+[![Dependency Status](https://www.versioneye.com/user/projects/5531fb7b10e714121100102e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5531fb7b10e714121100102e)
 
 Run an EnergyPlus simulation using a file-based workflow that is read from a Local or MongoDB adapter.
 
 ## Installation
 
-This applications has the following dependencies
+The OpenStudio Workflow Gem has the following dependencies:
 
 * Ruby 2.0
 * OpenStudio with Ruby 2.0 bindings
-* EnergyPlus 8.1 (assuming OpenStudio ~> 1.3.1)
+* EnergyPlus 8.2 (assuming OpenStudio >= 1.5.4)
 * MongoDB if using MongoDB Adapter (or when running rspec)
 
 [OpenStudio](http://developer.nrel.gov/downloads/buildings/openstudio/builds/) needs to be installed
-and in your path.  On Mac/Linux it is easiest to add the following to your .bash_profile or /etc/profile.d in order
-to make sure that OpenStudio can be loaded.
+and in your path.  On Mac/Linux it is easiest to add the following to your .bash_profile or /etc/profile.d/<file>.sh to ensure OpenStudio can be loaded.
 
     export OPENSTUDIO_ROOT=/usr/local
     export RUBYLIB=$OPENSTUDIO_ROOT/lib/ruby/site_ruby/2.0.0
@@ -24,18 +24,27 @@ Add this line to your application's Gemfile:
 
 Use this line if you want the bleeding edge:
 
-    gem 'OpenStudio-workflow', :git => 'git@github.com:NREL/OpenStudio-workflow-gem.git'
+    gem 'OpenStudio-workflow', github: 'NREL/OpenStudio-workflow-gem', branch: 'EnergyPlus-8.2.0'
 
 And then execute:
+    
+    Mac/Linux:
 
-    $ bundle
+        $ bundle
+        
+    Windows (avoids native extensions):
+    
+        $ bundle install --without xml profile
 
 Or install it yourself as:
-
+    
     $ gem install OpenStudio-workflow
-
+    
 ## Usage
 
+Note that the branches of the Workflow Gem depict which version of EnergyPlus is in use. The develop branch at the
+moment should not be used.
+
 There are currently two adapters to run OpenStudio workflow. The first is a simple Local adapter
 allowing the user to pass in the directory to simulation. The directory must have an
 [analysis/problem JSON file](spec/files/local_ex1/analysis_1.json) and a [datapoint JSON file](spec/files/local_ex1/datapoint_1.json).
@@ -57,11 +66,11 @@ The workflow manager can also use MongoDB to receive instructions on the workflo
 
 ### Todos
 
-* Read the analysis.json file to determine the states that are going to run instead of (or inaddition to) passing them into the constructor
+* Read the analysis.json file to determine the states that are going to run instead of (or in addition to) passing them into the constructor
 * Implement better error handling with custom exception classes
-* Implement a different measure directory, seed model directory, and weather file directory option
+* ~Implement a different measure directory, seed model directory, and weather file directory option~
 * ~Dynamically add other "states" to the workflow~
-* Create and change into a unique directory when running measures
+* ~~Create and change into a unique directory when running measures~~
 * ~~Implement Error State~~
 * ~~Implement MongoDB Adapter~~
 * ~~Implement remaining Adapter states (i.e. communicate success, communicate failure etc~~
@@ -108,7 +117,7 @@ If you are testing changes to OpenStudio source code and want to test these on t
 ** echo 'export CC=/usr/bin/clang-3.5' >> ~/.bashrc
 ** echo 'export CXX=/usr/bin/clang++-3.5' >> ~/.bashrc
 ** source ~/.bashrc
-** cd /home/vagrant
+* cd /home/vagrant
 * git clone https://github.com/NREL/OpenStudio.git openstudio
 * cd openstudio
 * git checkout your_branch_name

data/Rakefile

@@ -1,5 +1,5 @@
 require 'bundler'
-require 'bundler/gem_tasks'
+
 begin
   Bundler.setup
 rescue Bundler::BundlerError => e
@@ -8,16 +8,21 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'rake'
-require 'rspec/core'
 require 'rspec/core/rake_task'
 
-# require 'rubocop/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
+# Always create spec reports
+require 'ci/reporter/rake/rspec'
+
+# Gem tasks
+require 'bundler/gem_tasks'
+
+RSpec::Core::RakeTask.new('spec:unit') do |spec|
   spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
+task 'spec:unit' => 'ci:setup:rspec'
+
 require 'rubocop/rake_task'
 desc 'Run RuboCop on the lib directory'
 RuboCop::RakeTask.new(:rubocop) do |task|
@@ -28,4 +33,4 @@ RuboCop::RakeTask.new(:rubocop) do |task|
   task.fail_on_error = false
 end
 
-task default: [:spec]
+task default: 'spec:unit'

data/lib/openstudio-workflow.rb

@@ -22,14 +22,15 @@ require 'rubyXL'
 require 'multi_json'
 require 'colored'
 require 'fileutils'
-require 'securerandom'
+require 'securerandom' # uuids
 require 'json' # needed for a single pretty generate call
 require 'pathname'
+require 'mkmf' # for finding files
 
 begin
   require 'facter'
 rescue LoadError => e
-  puts 'Could not load Facter. Will not be able to save the IP address to the log'.red
+  warn 'Could not load Facter. Will not be able to save the IP address to the log'.red
 end
 
 require 'openstudio/workflow/version'
@@ -86,8 +87,12 @@ module OpenStudio
     end
 
     # predefined method that simply runs EnergyPlus in the specified directory. It does not apply any workflow steps
-    # such as preprocessing / postprocessing.
-    # The directory must have the IDF and EPW file in the folder. The simulations will run in the directory/run path
+    # such as preprocessing / postprocessing. The directory must have the IDF and EPW file in the folder. The
+    # simulations will run in the directory/run path
+    #
+    # @param adapter_name [String] Type of adapter, local or mongo.
+    # @param run_directory [String] Path to where the simulation is to run
+    # @param options [Hash] List of options for the adapter
     def run_energyplus(adapter_name, run_directory, options = {})
       unless (Pathname.new run_directory).absolute?
         # relative to wherever you are running the script
@@ -114,9 +119,30 @@ module OpenStudio
 
       adapter = load_adapter adapter_name, options[:adapter_options]
       run_klass = OpenStudio::Workflow::Run.new(adapter, run_directory, options)
+
       run_klass
     end
 
+    # Extract an archive to a specific location
+    # @param archive_filename [String] Path and name of the file to extract
+    # @param destination [String] Path to extract to
+    # @param overwrite [Boolean] If true, will overwrite any extracted file that may already exist
+    def extract_archive(archive_filename, destination, overwrite = true)
+      Zip::File.open(archive_filename) do |zf|
+        zf.each do |f|
+          f_path = File.join(destination, f.name)
+          FileUtils.mkdir_p(File.dirname(f_path))
+
+          if File.exist?(f_path) && overwrite
+            FileUtils.rm_rf(f_path)
+            zf.extract(f, f_path)
+          elsif !File.exist? f_path
+            zf.extract(f, f_path)
+          end
+        end
+      end
+    end
+
     private
 
     def load_adapter(name, adapter_options = {})

data/lib/openstudio/workflow/adapter.rb

@@ -26,6 +26,7 @@ module OpenStudio
       def initialize(options = {})
         @options = options
         @log = nil
+        @datapoint = nil
       end
 
       # class << self
@@ -62,6 +63,69 @@ module OpenStudio
       def get_logger(file, options = {})
         instance.get_logger file, options
       end
+
+      protected
+
+      # Zip up a folder and it's contents
+      def zip_directory(directory, zip_filename, pattern = '*')
+        # Submethod for adding the directory to the zip folder.
+        def add_directory_to_zip(zip_file, local_directory, root_directory)
+          Dir[File.join("#{local_directory}", '**', '**')].each do |file|
+            # remove the base directory from the zip file
+            rel_dir = local_directory.sub("#{root_directory}/", '')
+            zip_file_to_add = file.gsub("#{local_directory}", "#{rel_dir}")
+            zip_file.add(zip_file_to_add, file)
+          end
+
+          zip_file
+        end
+
+        FileUtils.rm_f(zip_filename) if File.exist?(zip_filename)
+
+        Zip.default_compression = Zlib::BEST_COMPRESSION
+        Zip::File.open(zip_filename, Zip::File::CREATE) do |zf|
+          Dir[File.join(directory, pattern)].each do |file|
+            if File.directory?(file)
+              # skip a few directory that should not be zipped as they are inputs
+              if File.basename(file) =~ /seed|measures|weather/
+                next
+              end
+              add_directory_to_zip(zf, file, directory)
+            else
+              next if File.extname(file) =~ /\.rb.*/
+              next if File.extname(file) =~ /\.zip.*/
+
+              zip_file_to_add = file.gsub("#{directory}/", '')
+              zf.add(zip_file_to_add, file)
+            end
+          end
+        end
+
+        File.chmod(0664, zip_filename)
+      end
+
+      # Main method to zip up the results of the simulation results. This will append the UUID of the data point
+      # if it exists. This method will create two zip files. One for the reports and one for the entire data point. The
+      # Data Point ZIP will also contain the reports.
+      #
+      # @param directory [String] The data point directory to zip up.
+      # @return nil
+      def zip_results(directory)
+        # create zip file using a system call
+        if Dir.exist?(directory) && File.directory?(directory)
+          zip_filename = @datapoint ? "data_point_#{@datapoint.uuid}.zip" : 'data_point.zip'
+          zip_filename = File.join(directory, zip_filename)
+          zip_directory directory, zip_filename
+        end
+
+        # zip up only the reports folder
+        report_dir = File.join(directory, 'reports')
+        if Dir.exist?(report_dir) && File.directory?(report_dir)
+          zip_filename = @datapoint ? "data_point_#{@datapoint.uuid}_reports.zip" : 'data_point_reports.zip'
+          zip_filename = File.join(directory, zip_filename)
+          zip_directory directory, zip_filename, 'reports'
+        end
+      end
     end
   end
 end

data/lib/openstudio/workflow/adapters/local.rb

@@ -76,10 +76,10 @@ module OpenStudio
         end
 
         def communicate_results(directory, results)
-          zip_results(directory, 'workflow')
+          zip_results(directory)
 
           if results.is_a? Hash
-            File.open("#{directory}/datapoint_out.json", 'w') { |f| f << JSON.pretty_generate(results) }
+            File.open("#{directory}/data_point_out.json", 'w') { |f| f << JSON.pretty_generate(results) }
           else
             pp "Unknown datapoint result type. Please handle #{results.class}"
             # data_point_json_path = OpenStudio::Path.new(run_dir) / OpenStudio::Path.new('data_point_out.json')
@@ -90,33 +90,11 @@ module OpenStudio
 
         # For the local adapter send back a handle to a file to append the data. For this adapter
         # the log messages are likely to be the same as the run.log messages.
-        # TODO: do we really want two local logs from the Local adapter? One is in the run dir and the other is in the root
+        # ?: do we really want two local logs from the Local adapter? One is in the run dir and the other is in the root
         def get_logger(directory, _options = {})
           @log ||= File.open("#{directory}/local_adapter.log", 'w')
           @log
         end
-
-        # TODO: this uses a system call to zip results at the moment
-        def zip_results(directory, _analysis_type = 'workflow')
-          current_dir = Dir.pwd
-          begin
-            # create zip file using a system call
-            # @logger.info "Zipping up data point #{analysis_dir}"
-            if File.directory? directory
-              Dir.chdir(directory)
-              `zip -9 -r --exclude=*.rb* data_point.zip .`
-            end
-
-            # zip up only the reports folder
-            report_dir = 'reports'
-            # @logger.info "Zipping up Analysis Reports Directory #{report_dir}/reports"
-            if File.directory? report_dir
-              `zip -9 -r data_point_reports.zip reports`
-            end
-          ensure
-            Dir.chdir(current_dir)
-          end
-        end
       end
     end
   end

data/lib/openstudio/workflow/adapters/mongo.rb

@@ -47,8 +47,6 @@ module OpenStudio
 
           Dir["#{base_path}/models/*.rb"].each { |f| require f }
           Mongoid.load!("#{base_path}/mongoid.yml", :development)
-
-          @datapoint = nil
         end
 
         # Tell the system that the process has started
@@ -61,52 +59,60 @@ module OpenStudio
           @datapoint.status_message = ''
           @datapoint.run_start_time = ::Time.now
 
-          # TODO: Get Facter to play well on windows and replace 'socket'
           # TODO: use the ComputeNode model to pull out the information so that we can reuse the methods
           # Determine what the IP address is of the worker node and save in the data point
 
-          retries = 0
-          begin
-            require 'socket'
-            if Socket.gethostname =~ /os-.*/
-              # Maybe use this in the future: /sbin/ifconfig eth1|grep inet|head -1|sed 's/\:/ /'|awk '{print $3}'
-              # Must be on vagrant and just use the hostname to do a lookup
-              map = {
-                'os-server' => '192.168.33.10',
-                'os-worker-1' => '192.168.33.11',
-                'os-worker-2' => '192.168.33.12'
-              }
-              @datapoint.ip_address = map[Socket.gethostname]
-              @datapoint.internal_ip_address = @datapoint.ip_address
-            else
-              if Gem.loaded_specs['facter']
-                # Check if we are on amazon
-                if Facter.fact(:ec2_metadata)
-                  # must be on amazon
-                  m = Facter.fact(:ec2_metadata).value
-
-                  @datapoint.ip_address = m['public-ipv4'] ? m['public-ipv4'] : 'unknown'
-                  @datapoint.internal_ip_address = m['local-ipv4'] ? m['local-ipv4'] : 'unknown'
-                else
-                  @datapoint.ip_address = Facter.fact(:ipaddress).value
+          # ami-id: ami-7c7e4e14
+          # instance-id: i-c52e0412
+          # instance-type: m3.medium
+          # local-hostname: ip-10-99-169-57.ec2.internal
+          # local-ipv4: 10.99.169.57
+          # placement: us-east-1a
+          # public-hostname: ec2-54-161-221-129.compute-1.amazonaws.com
+          # public-ipv4: 54.161.221.129
+          # number_of_cores: 1
+          if File.exist? '/etc/openstudio-server/instance.yml'
+            y = YAML.load_file('/etc/openstudio-server/instance.yml')
+            @datapoint.ip_address = y['public-ipv4'] if y['public-ipv4']
+            @datapoint.internal_ip_address = y['local-ipv4'] if y['local-ipv4']
+          else
+            # try to infer it from the socket/facter information
+            # note, facter will be deprecated in the future, so don't extend it!
+            retries = 0
+            begin
+              require 'socket'
+              if Socket.gethostname =~ /os-.*/
+                # Maybe use this in the future: /sbin/ifconfig eth1|grep inet|head -1|sed 's/\:/ /'|awk '{print $3}'
+                # Must be on vagrant and just use the hostname to do a lookup
+                map = {
+                  'os-server' => '192.168.33.10',
+                  'os-worker-1' => '192.168.33.11',
+                  'os-worker-2' => '192.168.33.12'
+                }
+                @datapoint.ip_address = map[Socket.gethostname]
+                @datapoint.internal_ip_address = @datapoint.ip_address
+              else
+                if Gem.loaded_specs['facter']
+                  # Use EC2 public to check if we are on AWS.
+                  @datapoint.ip_address = Facter.fact(:ec2_public_ipv4) ? Facter.fact(:ec2_public_ipv4).value : Facter.fact(:ipaddress).value
                   @datapoint.internal_ip_address = Facter.fact(:ipaddress).value
                 end
               end
-            end
-          rescue => e
-            # catch any exceptions. It appears that if a new instance of amazon starts, then it is likely that
-            # the Facter for AWS may not be initialized yet. Retry after waiting for 15 seconds if this happens.
-            # If this fails out, then the only issue with this is that the data point won't be downloaded because
-            # the worker node is not known
-
-            # retry just in case
-            if retries < 30 # try for up to 5 minutes
-              retries += 1
-              sleep 10
-              retry
-            else
-              raise "could not find Facter based data for worker node after #{retries} retries with message #{e.message}"
-              # just do nothing for now
+            rescue => e
+              # catch any exceptions. It appears that if a new instance of amazon starts, then it is likely that
+              # the Facter for AWS may not be initialized yet. Retry after waiting for 15 seconds if this happens.
+              # If this fails out, then the only issue with this is that the data point won't be downloaded because
+              # the worker node is not known
+
+              # retry just in case
+              if retries < 30 # try for up to 5 minutes
+                retries += 1
+                sleep 10
+                retry
+              else
+                raise "could not find Facter based data for worker node after #{retries} retries with message #{e.message}"
+                # just do nothing for now
+              end
             end
           end
 
@@ -190,19 +196,13 @@ module OpenStudio
         end
 
         def communicate_results(directory, results)
-          zip_results(directory, 'workflow')
+          zip_results(directory)
 
           # @logger.info 'Saving EnergyPlus JSON file'
           if results
             @datapoint.results ? @datapoint.results.merge!(results) : @datapoint.results = results
           end
           result = @datapoint.save! # redundant because next method calls save too.
-
-          if result
-            # @logger.info 'Successfully saved result to database'
-          else
-            # @logger.error 'ERROR saving result to database'
-          end
         end
 
         # TODO: Implement the writing to the mongo_db for logging
@@ -221,28 +221,6 @@ module OpenStudio
           # keep @datapoint as the model instance
           DataPoint.find_or_create_by(uuid: uuid)
         end
-
-        # TODO: this uses a system call to zip results at the moment, replace with rubylib
-        def zip_results(directory, _analysis_type = 'workflow')
-          current_dir = Dir.pwd
-          begin
-            # create zip file using a system call
-            # @logger.info "Zipping up data point #{analysis_dir}"
-            if File.directory? directory
-              Dir.chdir(directory)
-              `zip -9 -r --exclude=*.rb* data_point_#{@datapoint.uuid}.zip .`
-            end
-
-            # zip up only the reports folder
-            report_dir = 'reports'
-            # @logger.info "Zipping up Analysis Reports Directory #{report_dir}/reports"
-            if File.directory? report_dir
-              `zip -9 -r data_point_#{@datapoint.uuid}_reports.zip reports`
-            end
-          ensure
-            Dir.chdir(current_dir)
-          end
-        end
       end
     end
   end

data/lib/openstudio/workflow/jobs/lib/apply_measures.rb

@@ -39,12 +39,12 @@ module OpenStudio
         success = true
 
         unless argument[:value].nil?
-          @logger.info "Setting argument value #{argument[:name]} to #{argument[:value]}"
+          @logger.info "Setting argument value '#{argument[:name]}' to '#{argument[:value]}'"
 
           v = argument_map[argument[:name]]
           fail "Could not find argument map in measure for '#{argument[:name]}' with value '#{argument[:value]}'" unless v
           value_set = v.setValue(argument[:value])
-          fail "Could not set argument #{argument[:name]} of value #{argument[:value]} on model" unless value_set
+          fail "Could not set argument '#{argument[:name]}' of value '#{argument[:value]}' on model" unless value_set
           argument_map[argument[:name]] = v.clone
         else
           @logger.warn "Value for argument '#{argument[:name]}' not set in argument list therefore will use default"
@@ -97,7 +97,7 @@ module OpenStudio
       def apply_measure(workflow_item)
         @logger.info "Starting #{__method__} for #{workflow_item[:name]}"
         @time_logger.start("Measure:#{workflow_item[:name]}")
-        #start_time = ::Time.now
+        # start_time = ::Time.now
         current_dir = Dir.pwd
         begin
           measure_working_directory = "#{@run_directory}/#{workflow_item[:measure_definition_class_name]}"
@@ -120,41 +120,56 @@ module OpenStudio
           @logger.info "Loading Measure from #{measure_file_path}"
           fail "Measure file does not exist #{measure_name} in #{measure_file_path}" unless File.exist? measure_file_path
 
-          require measure_file_path
-          measure = Object.const_get(measure_name).new
-          runner = OpenStudio::Ruleset::OSRunner.new
+          measure = nil
+          runner = nil
           result = nil
+          begin
+            require measure_file_path
+            measure = Object.const_get(measure_name).new
+            runner = OpenStudio::Ruleset::OSRunner.new
+          rescue => e
+            log_message = "Error requiring measure #{__FILE__}. Failed with #{e.message}, #{e.backtrace.join("\n")}"
+            raise log_message
+          end
 
           arguments = nil
-          if workflow_item[:measure_type] == 'RubyMeasure'
-            arguments = measure.arguments(@model)
-          elsif workflow_item[:measure_type] == 'EnergyPlusMeasure'
-            arguments = measure.arguments(@model)
-          elsif workflow_item[:measure_type] == 'ReportingMeasure'
-            arguments = measure.arguments
-          end
 
-          # Create argument map and initialize all the arguments
-          argument_map = OpenStudio::Ruleset::OSArgumentMap.new
-          arguments.each do |v|
-            argument_map[v.name] = v.clone
-          end
-          # @logger.info "Argument map for measure is #{argument_map}"
+          begin
+            if workflow_item[:measure_type] == 'RubyMeasure'
+              arguments = measure.arguments(@model)
+            elsif workflow_item[:measure_type] == 'EnergyPlusMeasure'
+              arguments = measure.arguments(@model)
+            elsif workflow_item[:measure_type] == 'ReportingMeasure'
+              arguments = measure.arguments
+            end
+
+            @logger.info "Extracted the following arguments: #{arguments}"
 
-          @logger.info "Iterating over arguments for workflow item '#{workflow_item[:name]}'"
-          if workflow_item[:arguments]
-            workflow_item[:arguments].each do |argument|
-              success = apply_arguments(argument_map, argument)
-              fail 'Could not set arguments' unless success
+            # Create argument map and initialize all the arguments
+            argument_map = OpenStudio::Ruleset::OSArgumentMap.new
+            arguments.each do |v|
+              argument_map[v.name] = v.clone
             end
-          end
+            # @logger.info "Argument map for measure is #{argument_map}"
 
-          @logger.info "Iterating over variables for workflow item '#{workflow_item[:name]}'"
-          if workflow_item[:variables]
-            workflow_item[:variables].each do |variable|
-              success = apply_variables(argument_map, variable)
-              fail 'Could not set variables' unless success
+            @logger.info "Iterating over arguments for workflow item '#{workflow_item[:name]}'"
+            if workflow_item[:arguments]
+              workflow_item[:arguments].each do |argument|
+                success = apply_arguments(argument_map, argument)
+                fail 'Could not set arguments' unless success
+              end
             end
+
+            @logger.info "Iterating over variables for workflow item '#{workflow_item[:name]}'"
+            if workflow_item[:variables]
+              workflow_item[:variables].each do |variable|
+                success = apply_variables(argument_map, variable)
+                fail 'Could not set variables' unless success
+              end
+            end
+          rescue => e
+            log_message = "Error assigning argument in measure #{__FILE__}. Failed with #{e.message}, #{e.backtrace.join("\n")}"
+            raise log_message
           end
 
           begin
@@ -200,9 +215,13 @@ module OpenStudio
             measure_attributes = JSON.parse(OpenStudio.toJSON(result.attributes), symbolize_names: true)
             @output_attributes[workflow_item[:name].to_sym] = measure_attributes[:attributes]
           rescue => e
-            log_message = "TODO: #{__FILE__} failed with #{e.message}, #{e.backtrace.join("\n")}"
-            @logger.warn log_message
+            log_message = "#{__FILE__} failed with #{e.message}, #{e.backtrace.join("\n")}"
+            @logger.error log_message
           end
+        rescue => e
+          log_message = "#{__FILE__} failed with message #{e.message} in #{e.backtrace.join("\n")}"
+          @logger.error log_message
+          raise log_message
         ensure
           Dir.chdir current_dir
           @time_logger.stop("Measure:#{workflow_item[:name]}")

data/lib/openstudio/workflow/jobs/run_energyplus/run_energyplus.rb

@@ -17,18 +17,19 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
+# Force the MakeMakefile logger write file output to null.
+module MakeMakefile::Logging
+  @logfile = File::NULL
+end
+
 class RunEnergyplus
   # Initialize
   # param directory: base directory where the simulation files are prepared
   # param logger: logger object in which to write log messages
   def initialize(directory, logger, time_logger, adapter, options = {})
-    energyplus_path = nil
-    if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-      energyplus_path = 'C:/EnergyPlus-8-1-0'
-    else
-      energyplus_path = '/usr/local/EnergyPlus-8-1-0'
-    end
+    @logger = logger
 
+    energyplus_path = find_energyplus
     defaults = {
       energyplus_path: energyplus_path
     }
@@ -38,10 +39,15 @@ class RunEnergyplus
     @directory = directory
     @run_directory = "#{@directory}/run"
     @adapter = adapter
-    @logger = logger
     @time_logger = time_logger
     @results = {}
 
+    # container for storing the energyplus files there were copied into the local directory. These will be
+    # removed at the end of the simulation.
+    @energyplus_files = []
+    @energyplus_exe = nil
+    @expand_objects_exe = nil
+
     @logger.info "#{self.class} passed the following options #{@options}"
   end
 
@@ -98,35 +104,90 @@ class RunEnergyplus
     end
 
     # can't create symlinks because the /vagrant mount is actually a windows mount
-    @logger.info "Copying EnergyPlus files to run directory: #{@run_directory}"
-    @time_logger.start("Copying EnergyPlus files")
-    FileUtils.copy("#{@options[:energyplus_path]}/libbcvtb.so", "#{@run_directory}/libbcvtb.so")
-    FileUtils.copy("#{@options[:energyplus_path]}/libepexpat.so", "#{@run_directory}/libepexpat.so")
-    FileUtils.copy("#{@options[:energyplus_path]}/libepfmiimport.so", "#{@run_directory}/libepfmiimport.so")
-    FileUtils.copy("#{@options[:energyplus_path]}/libDElight.so", "#{@run_directory}/libDElight.so")
-    FileUtils.copy("#{@options[:energyplus_path]}/libDElight.so", "#{@run_directory}/libDElight.so")
-    FileUtils.copy("#{@options[:energyplus_path]}/ExpandObjects", "#{@run_directory}/ExpandObjects")
-    FileUtils.copy("#{@options[:energyplus_path]}/EnergyPlus", "#{@run_directory}/EnergyPlus")
-    FileUtils.copy("#{@options[:energyplus_path]}/Energy+.idd", "#{@run_directory}/Energy+.idd")
-    @time_logger.stop("Copying EnergyPlus files")
-
-    @time_logger.start("Running EnergyPlus")
+    @time_logger.start('Copying EnergyPlus files')
+    prepare_energyplus_dir
+    @time_logger.stop('Copying EnergyPlus files')
+
+    @time_logger.start('Running EnergyPlus')
     @results = call_energyplus
-    @time_logger.stop("Running EnergyPlus")
+    @time_logger.stop('Running EnergyPlus')
 
     @results
   end
 
   private
 
+  # Look for the location of EnergyPlus
+  def find_energyplus
+    if ENV['ENERGYPLUSDIR']
+      return ENV['ENERGYPLUSDIR']
+    elsif ENV['RUBYLIB'] =~ /OpenStudio/
+      path = ENV['RUBYLIB'].split(':')
+      path = File.dirname(path.find { |p| p =~ /OpenStudio/ })
+      # Grab the version out of the openstudio path
+      path += '/sharedresources/EnergyPlus-8-2-0'
+      @logger.info "found EnergyPlus path of #{path}"
+      return path
+    else
+      if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
+        energyplus_path = 'C:/EnergyPlus-8-2-0'
+      else
+        energyplus_path = '/usr/local/EnergyPlus-8-2-0'
+      end
+
+    end
+  end
+
+  def clean_directory
+    @logger.info 'Removing any copied EnergyPlus files'
+    @energyplus_files.each do |file|
+      if File.exist? file
+        FileUtils.rm_f file
+      end
+    end
+
+    paths_to_rm = []
+    paths_to_rm << "#{@run_directory}/packaged_measures"
+    paths_to_rm << "#{@run_directory}/Energy+.ini"
+    paths_to_rm.each { |p| FileUtils.rm_rf(p) if File.exist?(p) }
+  end
+
+  # Prepare the directory to run EnergyPlus. In EnergyPlus < 8.2, we have to copy all the files into the directory.
+  #
+  # @return [Boolean] Returns true is there is more than one file copied
+  def prepare_energyplus_dir
+    @logger.info "Copying EnergyPlus files to run directory: #{@run_directory}"
+    Dir["#{@options[:energyplus_path]}/*"].each do |file|
+      next if File.directory? file
+      next if File.extname(file).downcase =~ /.pdf|.app|.html|.gif|.txt|.xlsx/
+
+      dest_file = "#{@run_directory}/#{File.basename(file)}"
+      @energyplus_files << dest_file
+
+      @energyplus_exe = File.basename(dest_file) if File.basename(dest_file) =~ /^energyplus.{0,4}$/i
+      @expand_objects_exe = File.basename(dest_file) if File.basename(dest_file) =~ /^ExpandObjects.{0,4}$/i
+      FileUtils.copy file, dest_file
+    end
+
+    fail "Could not find EnergyPlus Executable in #{@options[:energyplus_path]}" unless @energyplus_exe
+    fail "Could not find ExpandObjects Executable in #{@options[:energyplus_path]}" unless @expand_objects_exe
+
+    @energyplus_files.size > 0
+  end
+
   def call_energyplus
     begin
       current_dir = Dir.pwd
       Dir.chdir(@run_directory)
       @logger.info "Starting simulation in run directory: #{Dir.pwd}"
 
+      # @logger.info "Contents of: #{Dir.pwd}"
+      # Dir.glob("*").each do |f|
+      #  @logger.info "  #{f}"
+      # end
+
       File.open('stdout-expandobject', 'w') do |file|
-        IO.popen('./ExpandObjects') do |io|
+        IO.popen("./#{@expand_objects_exe}") do |io|
           while (line = io.gets)
             file << line
           end
@@ -141,7 +202,7 @@ class RunEnergyplus
 
       # create stdout
       File.open('stdout-energyplus', 'w') do |file|
-        IO.popen('./EnergyPlus + 2>&1') do |io|
+        IO.popen("./#{@energyplus_exe} 2>&1") do |io|
           while (line = io.gets)
             file << line
           end
@@ -149,25 +210,25 @@ class RunEnergyplus
       end
       r = $?
 
-      @logger.info "System call to EnergyPlus returned #{r}"
-
-      paths_to_rm = []
-      paths_to_rm << Pathname.glob("#{@run_directory}/*.ini")
-      paths_to_rm << Pathname.glob("#{@run_directory}/*.so")
-      paths_to_rm << Pathname.glob("#{@run_directory}/*.idd")
-      paths_to_rm << Pathname.glob("#{@run_directory}/ExpandObjects")
-      paths_to_rm << Pathname.glob("#{@run_directory}/EnergyPlus")
-      paths_to_rm << Pathname.glob("#{@run_directory}/packaged_measures")
-      paths_to_rm.each { |p| FileUtils.rm_rf(p) }
-
+      @logger.info "EnergyPlus returned '#{r}'"
       unless r == 0
-        fail 'EnergyPlus returned a non-zero exit code. Check the stdout-energyplus log.'
+        @logger.warn 'EnergyPlus returned a non-zero exit code. Check the stdout-energyplus log.'
+      end
+
+      if File.exist? 'eplusout.end'
+        f = File.read('eplusout.end').force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
+        warnings_count = f[/(\d*).Warning/, 1]
+        error_count = f[/(\d*).Severe.Errors/, 1]
+        @logger.info "EnergyPlus finished with #{warnings_count} warnings and #{error_count} severe errors"
+        if f =~ /EnergyPlus Terminated--Fatal Error Detected/
+          fail 'EnergyPlus Terminated with a Fatal Error. Check eplusout.err log.'
+        end
+      else
+        fail 'EnergyPlus failed and did not create an eplusout.end file. Check the stdout-energyplus log.'
       end
 
-      # TODO: check the end or err file
       if File.exist? 'eplusout.err'
-        eplus_err = File.read('eplusout.err')
-        eplus_err = eplus_err.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
+        eplus_err = File.read('eplusout.err').force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
         if eplus_err =~ /EnergyPlus Terminated--Fatal Error Detected/
           fail 'EnergyPlus Terminated with a Fatal Error. Check eplusout.err log.'
         end
@@ -177,11 +238,13 @@ class RunEnergyplus
       @logger.error log_message
       raise log_message
     ensure
+      @logger.info "Ensuring 'clean' directory"
+      clean_directory
+
       Dir.chdir(current_dir)
       @logger.info 'EnergyPlus Completed'
     end
 
-    # TODO: get list of all the files that are generated and return
     {}
   end
 end

data/lib/openstudio/workflow/jobs/run_openstudio/run_openstudio.rb

@@ -64,9 +64,9 @@ class RunOpenstudio
 
       apply_measures(:openstudio_measure)
 
-      @time_logger.start("Translating to EnergyPlus")
+      @time_logger.start('Translating to EnergyPlus')
       translate_to_energyplus
-      @time_logger.stop("Translating to EnergyPlus")
+      @time_logger.stop('Translating to EnergyPlus')
 
       apply_measures(:energyplus_measure)
 
@@ -84,14 +84,14 @@ class RunOpenstudio
       end
 
       @logger.info 'Saving measure output attributes JSON'
-      File.open("#{@run_directory}/measure_attributes.json", 'w') do
-          |f| f << JSON.pretty_generate(@output_attributes)
+      File.open("#{@run_directory}/measure_attributes.json", 'w') do |f|
+        f << JSON.pretty_generate(@output_attributes)
       end
     end
 
-    @time_logger.start("Saving OSM and IDF")
+    @time_logger.start('Saving OSM and IDF')
     save_osm_and_idf
-    @time_logger.stop("Saving OSM and IDF")
+    @time_logger.stop('Saving OSM and IDF')
 
     @results
   end
@@ -135,7 +135,7 @@ class RunOpenstudio
 
         # assume that the seed model has been placed in the directory
         baseline_model_path = File.expand_path(
-            File.join(@options[:analysis_root_path], @analysis_json[:analysis][:seed][:path]))
+          File.join(@options[:analysis_root_path], @analysis_json[:analysis][:seed][:path]))
       else
         fail 'No seed model path in JSON defined'
       end
@@ -173,7 +173,7 @@ class RunOpenstudio
     elsif @analysis_json[:analysis][:weather_file]
       if @analysis_json[:analysis][:weather_file][:path]
         weather_filename = File.expand_path(
-            File.join(@options[:analysis_root_path], @analysis_json[:analysis][:weather_file][:path])
+          File.join(@options[:analysis_root_path], @analysis_json[:analysis][:weather_file][:path])
         )
         @weather_file_path = File.dirname(weather_filename)
       else

data/lib/openstudio/workflow/jobs/run_postprocess/run_postprocess.rb

@@ -88,7 +88,10 @@ class RunPostprocess
     end
 
     # Remove empty directories in run folder
-    Dir["#{@run_directory}/*"].select { |d| File.directory? d }.select { |d| (Dir.entries(d) - %w(. ..)).empty? }.each { |d| Dir.rmdir d }
+    Dir["#{@run_directory}/*"].select { |d| File.directory? d }.select { |d| (Dir.entries(d) - %w(. ..)).empty? }.each do |d|
+      @logger.info "Removing empty directory #{d}"
+      Dir.rmdir d
+    end
 
     paths_to_rm = []
     # paths_to_rm << Pathname.glob("#{@run_directory}/*.osm")

data/lib/openstudio/workflow/jobs/run_reporting_measures/run_reporting_measures.rb

@@ -60,13 +60,13 @@ class RunReportingMeasures
       @datapoint_json = @adapter.get_datapoint(@directory, @options)
       @analysis_json = @adapter.get_problem(@directory, @options)
 
-      @time_logger.start("Running standard post process")
+      @time_logger.start('Running standard post process')
       if @options[:use_monthly_reports]
         run_monthly_postprocess
       else
         run_standard_postprocess
       end
-      @time_logger.stop("Running standard post process")
+      @time_logger.stop('Running standard post process')
 
       translate_csv_to_json
 
@@ -77,8 +77,7 @@ class RunReportingMeasures
       end
 
       @logger.info 'Saving reporting measures output attributes JSON'
-      File.open("#{@run_directory}/reporting_measure_attributes.json", 'w') do
-      |f|
+      File.open("#{@run_directory}/reporting_measure_attributes.json", 'w') do |f|
         f << JSON.pretty_generate(@output_attributes)
       end
 
@@ -371,7 +370,6 @@ class RunReportingMeasures
         ['INTERIORLIGHTS:ELECTRICITY', 'EXTERIORLIGHTS:ELECTRICITY', 'INTERIOREQUIPMENT:ELECTRICITY', 'EXTERIOREQUIPMENT:ELECTRICITY',
          'FANS:ELECTRICITY', 'PUMPS:ELECTRICITY', 'HEATING:ELECTRICITY', 'COOLING:ELECTRICITY', 'HEATREJECTION:ELECTRICITY',
          'HUMIDIFIER:ELECTRICITY', 'HEATRECOVERY:ELECTRICITY', 'WATERSYSTEMS:ELECTRICITY', 'COGENERATION:ELECTRICITY', 'REFRIGERATION:ELECTRICITY'].each do |end_use|
-
           tmp_query = query + " AND ColumnName='#{end_use}'"
           tmp_val = sql_query(sql, 'BUILDING ENERGY PERFORMANCE - ELECTRICITY', tmp_query)
           val += tmp_val unless tmp_val.nil?

data/lib/openstudio/workflow/jobs/run_runmanager/run_runmanager.rb

@@ -30,9 +30,9 @@ class RunRunmanager
   def initialize(directory, logger, time_logger, adapter, options = {})
     energyplus_path = nil
     if /cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM
-      energyplus_path = 'C:/EnergyPlus-8-1-0'
+      energyplus_path = 'C:/EnergyPlus-8-2-0'
     else
-      energyplus_path = '/usr/local/EnergyPlus-8-1-0'
+      energyplus_path = '/usr/local/EnergyPlus-8-2-0'
     end
 
     defaults = {

data/lib/openstudio/workflow/jobs/run_xml/run_xml.rb

@@ -73,8 +73,7 @@ class RunXml
       end
 
       # @logger.debug "XML measure output attributes JSON is #{@output_attributes}"
-      File.open("#{@run_directory}/measure_attributes_xml.json", 'w') do
-      |f|
+      File.open("#{@run_directory}/measure_attributes_xml.json", 'w') do |f|
         f << JSON.pretty_generate(@output_attributes)
       end
     end
@@ -96,7 +95,7 @@ class RunXml
 
         # assume that the seed model has been placed in the directory
         baseline_model_path = File.expand_path(
-            File.join(@options[:analysis_root_path], @analysis_json[:analysis][:seed][:path]))
+          File.join(@options[:analysis_root_path], @analysis_json[:analysis][:seed][:path]))
 
         if File.exist? baseline_model_path
           @logger.info "Reading in baseline model #{baseline_model_path}"
@@ -125,7 +124,7 @@ class RunXml
         # This last(4) needs to be cleaned up.  Why don't we know the path of the file?
         # assume that the seed model has been placed in the directory
         weather_filename = File.expand_path(
-            File.join(@options[:analysis_root_path], @analysis_json[:analysis][:weather_file][:path]))
+          File.join(@options[:analysis_root_path], @analysis_json[:analysis][:weather_file][:path]))
         unless File.exist?(weather_filename)
           @logger.warn "Could not find weather file for simulation #{weather_filename}. Will continue because may change"
         end
@@ -190,7 +189,7 @@ class RunXml
 
           @logger.info "Loading measure in relative path #{measure_path}"
           measure_file_path = File.expand_path(
-              File.join(@options[:analysis_root_path], measure_path, 'measure.rb'))
+            File.join(@options[:analysis_root_path], measure_path, 'measure.rb'))
           fail "Measure file does not exist #{measure_name} in #{measure_file_path}" unless File.exist? measure_file_path
 
           require measure_file_path
@@ -211,14 +210,14 @@ class RunXml
           if wf[:arguments]
             wf[:arguments].each do |wf_arg|
               if wf_arg[:value]
-                @logger.info "Setting argument value #{wf_arg[:name]} to #{wf_arg[:value]}"
+                @logger.info "Setting argument value '#{wf_arg[:name]}' to '#{wf_arg[:value]}'"
                 # Note that these measures have symbolized hash keys and not strings.  I really want indifferential access here!
                 args[wf_arg[:name].to_sym] = wf_arg[:value]
               end
             end
           end
 
-          @logger.info "iterate over variables for workflow item #{wf[:name]}"
+          @logger.info "iterate over variables for workflow item '#{wf[:name]}'"
           if wf[:variables]
             wf[:variables].each do |wf_var|
               # Argument hash in workflow looks like the following

data/lib/openstudio/workflow/run.rb

@@ -157,7 +157,7 @@ module OpenStudio
             @adapter.communicate_results @directory, @job_results[:run_runmanager]
           elsif @job_results[:run_reporting_measures]
             @logger.info 'Sending the reporting measuers results back to the adapter'
-            @time_logger.save(File.join(@directory,'profile.json'))
+            @time_logger.save(File.join(@directory, 'profile.json'))
             @adapter.communicate_results @directory, @job_results[:run_reporting_measures]
           end
         ensure
@@ -169,9 +169,7 @@ module OpenStudio
 
           @logger.info 'Workflow complete'
           # Write out the TimeLogger once again in case the run_reporting_measures didn't exist
-          @time_logger.save(File.join(@directory,'profile.json'))
-
-
+          @time_logger.save(File.join(@directory, 'profile.json'))
 
           # TODO: define the outputs and figure out how to show it correctly
           obj_function_array ||= ['NA']
@@ -285,7 +283,7 @@ module OpenStudio
 
       def next_state
         @logger.info "Current state: '#{@current_state}'"
-        ns = @transitions.select { |h| h[:from] == @current_state }.first[:to]
+        ns = @transitions.find { |h| h[:from] == @current_state }[:to]
         @logger.info "Next state will be: '#{ns}'"
 
         # Set the next state before calling the method
@@ -304,7 +302,7 @@ module OpenStudio
 
         # result
 
-        # TODO fix this so that it gets the base config options plus its job options. Need to
+        # TODO: fix this so that it gets the base config options plus its job options. Need to
         # also merge in all the former job results.
         @options.merge(@job_results)
       end

data/lib/openstudio/workflow/time_logger.rb

@@ -13,17 +13,17 @@ class TimeLogger
   def start(channel)
     # warning -- "will reset timer for #{moniker}" if @monikers.key? moniker
     s = ::Time.now
-    @channels[channel] = {start_time_str: "#{s}", start_time: s.to_f}
+    @channels[channel] = { start_time_str: "#{s}", start_time: s.to_f }
   end
 
   def stop(channel)
     end_time = ::Time.now.to_f
     @logger << {
-        channel: channel,
-        start_time: @channels[channel][:start_time],
-        start_time_str: @channels[channel][:start_time_str],
-        end_time: end_time,
-        delta: end_time - @channels[channel][:start_time]
+      channel: channel,
+      start_time: @channels[channel][:start_time],
+      start_time_str: @channels[channel][:start_time_str],
+      end_time: end_time,
+      delta: end_time - @channels[channel][:start_time]
     }
 
     # remove the channel
@@ -43,11 +43,11 @@ class TimeLogger
 
   # this will report all the values for all the channels with this name.
   def delta(channel)
-    @logger.map { |k| {channel.to_s => k[:delta]} if k[:channel] == channel }
+    @logger.map { |k| { channel.to_s => k[:delta] } if k[:channel] == channel }.compact
   end
 
   # save the data to a file. This will overwrite the file if it already exists
   def save(filename)
     File.open(filename, 'w') { |f| f << JSON.pretty_generate(@logger) }
   end
-end
+end

data/lib/openstudio/workflow/version.rb

@@ -19,6 +19,6 @@
 
 module OpenStudio
   module Workflow
-    VERSION = '0.0.4'
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-workflow
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: facter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.6
+        version: 1.1.7
 description: Run OpenStudio based simulations using EnergyPlus
 email:
 - nicholas.long@nrel.gov
@@ -115,6 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- README.md
+- Rakefile
+- lib/openstudio-workflow.rb
 - lib/openstudio/workflow/adapter.rb
 - lib/openstudio/workflow/adapters/local.rb
 - lib/openstudio/workflow/adapters/mongo.rb
@@ -135,10 +139,6 @@ files:
 - lib/openstudio/workflow/run.rb
 - lib/openstudio/workflow/time_logger.rb
 - lib/openstudio/workflow/version.rb
-- lib/openstudio-workflow.rb
-- README.md
-- CHANGELOG.md
-- Rakefile
 homepage: https://github.com/NREL/OpenStudio-workflow-gem
 licenses:
 - LGPL
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Workflow Manager