openstudio-extension 0.3.0 → 0.4.2

data/lib/openstudio/extension/core/os_lib_model_simplification.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/os_lib_outdoorair_and_infiltration.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/os_lib_reporting_qaqc.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/core/os_lib_schedules.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/rake_task.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/runner.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -62,6 +62,8 @@ module OpenStudio
       #  @option options [String] :num_parallel Number of simulations to run in parallel at a time
       #  @option options [String] :run_simulations Set to true to run the simulations
       #  @option options [String] :verbose Set to true to receive extra information while running simulations
+      #  @option options [String] :gemfile_path Path to gemfile to use
+      #  @option options [String] :bundle_install_path Path where the bundle should be installed
       def initialize(dirname = Dir.pwd, bundle_without = [], options = {})
         # DLM: I am not sure if we want to use the main root directory to create these bundles
         # had the idea of passing in a Gemfile name/alias and path to Gemfile, then doing the bundle
@@ -71,15 +73,18 @@ module OpenStudio
 
         @options = OpenStudio::Extension::RunnerConfig.default_config
         # ORDER of PRECEDENCE: default config < runner.conf file < options passed in directly
-        if File.exist?(File.join(dirname, OpenStudio::Extension::RunnerConfig::FILENAME)) && options.empty?
+        if File.exist?(File.join(dirname, OpenStudio::Extension::RunnerConfig::FILENAME))
           puts 'Using runner options from runner.conf file'
           runner_config = OpenStudio::Extension::RunnerConfig.new(dirname)
           # use the default values overriden with runner.conf values
           @options = @options.merge(runner_config.options)
         end
 
-        # use the passed values or defaults overriden by passed options
-        @options = @options.merge(options)
+        if !options.empty?
+          puts 'Merging in passed-in options'
+          # use the passed values or defaults overriden by passed options
+          @options = @options.merge(options)
+        end
 
         puts "Initializing runner with dirname: '#{dirname}' and options: #{@options}"
         @dirname = File.absolute_path(dirname)
@@ -88,9 +93,14 @@ module OpenStudio
         @gemfile_path = !@options.key?(:gemfile_path) || @options[:gemfile_path] === '' ? File.join(@dirname, 'Gemfile') : @options[:gemfile_path]
         @bundle_install_path = !@options.key?(:bundle_install_path) || @options[:bundle_install_path] === '' ? File.join(@dirname, '.bundle/install/') : @options[:bundle_install_path]
         @original_dir = Dir.pwd
+
+        # gemfile directory
+        @gemfile_dir = File.dirname(@gemfile_path)
+
         # puts "DIRNAME: #{@dirname}"
         # puts "@gemfile_path set to: #{@gemfile_path}"
         # puts "@bundle_install_path set to: #{@bundle_install_path}"
+        # puts "@gemfile directory: #{@gemfile_dir}"
 
         @bundle_without = bundle_without || []
         @bundle_without_string = @bundle_without.join(' ')
@@ -106,8 +116,8 @@ module OpenStudio
         else
           # there is a gemfile, attempt to create a bundle
           begin
-            # go to the directory with the gemfile
-            Dir.chdir(@dirname)
+            # go to the directory with the gemfile to run these commands
+            Dir.chdir(@gemfile_dir)
 
             # test to see if bundle is installed
             check_bundle = run_command('bundle -v', get_clean_env)
@@ -119,7 +129,7 @@ module OpenStudio
 
             # check existing config
             needs_config = true
-            if File.exist?('./.bundle/config')
+            if File.exist?('./.bundle/config')  # checking wrt gemfile_dir
               puts 'config exists'
               needs_config = false
               config = YAML.load_file('./.bundle/config')
@@ -135,7 +145,7 @@ module OpenStudio
 
             # check existing platform
             needs_platform = true
-            if File.exist?('Gemfile.lock')
+            if File.exist?('Gemfile.lock') # checking wrt gemfile_dir
               puts 'Gemfile.lock exists'
               gemfile_lock = Bundler::LockfileParser.new(Bundler.read_file('Gemfile.lock'))
               if gemfile_lock.platforms.include?('ruby')
@@ -164,9 +174,7 @@ module OpenStudio
 
             puts "needs_update = #{needs_update}"
             if needs_update
-              # run_command('bundle update', get_clean_env)
-              # KAF: updated to include specified gemfile_path...this didn't seem to work before
-              run_command("bundle update --gemfile=#{@gemfile_path}", get_clean_env)
+              run_command('bundle update', get_clean_env)
             end
           ensure
             Dir.chdir(@original_dir)
@@ -220,8 +228,7 @@ module OpenStudio
         result = false
         original_dir = Dir.pwd
         begin
-          Dir.chdir(@dirname)
-
+          Dir.chdir(@gemfile_dir)
           # DLM: using popen3 here can result in deadlocks
           stdout_str, stderr_str, status = Open3.capture3(env, command)
           if status.success?
@@ -656,7 +663,16 @@ module OpenStudio
           puts 'simulations are not performed, since to the @options[:run_simulations] is set to false'
         end
 
-        # DLM: this does not always return false for failed CLI runs, consider checking for failed.job file as backup test
+        if @options[:run_simulations]
+          # Additional checks for failed CLI
+          if File.exist?(File.join(run_dir, 'failed.job'))
+            result = false
+          end
+
+          if !File.exist?(File.join(run_dir, 'finished.job'))
+            result = false
+          end
+        end
 
         return result
       end

data/lib/openstudio/extension/runner_config.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

data/lib/openstudio/extension/version.rb

@@ -1,5 +1,5 @@
 # *******************************************************************************
-# OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
+# OpenStudio(R), Copyright (c) 2008-2021, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.3.0'.freeze
+    VERSION = '0.4.2'.freeze
   end
 end

data/openstudio-extension.gemspec

@@ -6,12 +6,12 @@ Gem::Specification.new do |spec|
   spec.name          = 'openstudio-extension'
   spec.version       = OpenStudio::Extension::VERSION
   spec.platform      = Gem::Platform::RUBY
-  spec.authors       = ['Katherine Fleming', 'Nicholas Long', 'Daniel Macumber']
-  spec.email         = ['katherine.fleming@nrel.gov', 'nicholas.long@nrel.gov', 'daniel.macumber@nrel.gov']
+  spec.authors       = ['Katherine Fleming', 'Nicholas Long', 'Daniel Macumber', 'David Goldwasser']
+  spec.email         = ['katherine.fleming@nrel.gov', 'nicholas.long@nrel.gov', 'daniel.macumber@nrel.gov', 'david.goldwasser@nrel.gov']
 
   spec.homepage      = 'https://openstudio.net'
   spec.summary       = 'openstudio base gem for creating generic extensions with encapsulated data and measures.'
-  spec.description   = 'openstudio base gem for creating generic extensions with encapsulated data and measures.'
+  spec.description   = 'openstudio base gem for creating generic extensions with encapsulated data and measures. Also contains ruby libraries that required by many measures.'
   spec.metadata = {
     'bug_tracker_uri' => 'https://github.com/NREL/openstudio-extension-gem/issues',
     'changelog_uri' => 'https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md',
@@ -26,15 +26,16 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.5.0'
+  spec.required_ruby_version = '~> 2.7.0'
 
-  spec.add_dependency 'bcl', '~> 0.6.1'
-  spec.add_dependency 'bundler', '~> 2.1'
+  spec.add_dependency 'bcl', '~> 0.7.0'
+  spec.add_dependency 'bundler', '>= 2.1.0'
   spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
-  spec.add_dependency 'openstudio-workflow', '~> 2.1.0'
-  spec.add_dependency 'openstudio_measure_tester', '~> 0.2.3'
+  spec.add_dependency 'openstudio-workflow', '~> 2.2.0'
+  spec.add_dependency 'openstudio_measure_tester', '~> 0.3.0'
   spec.add_dependency 'parallel', '~> 1.19.1'
 
+  spec.add_development_dependency 'openstudio-standards', '~> 0.2.13' # for os_lib unit tests
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Katherine Fleming
 - Nicholas Long
 - Daniel Macumber
+- David Goldwasser
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-28 00:00:00.000000000 Z
+date: 2021-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -18,28 +19,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +61,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +97,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.19.1
+- !ruby/object:Gem::Dependency
+  name: openstudio-standards
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.13
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -125,11 +140,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.9'
 description: openstudio base gem for creating generic extensions with encapsulated
-  data and measures.
+  data and measures. Also contains ruby libraries that required by many measures.
 email:
 - katherine.fleming@nrel.gov
 - nicholas.long@nrel.gov
 - daniel.macumber@nrel.gov
+- david.goldwasser@nrel.gov
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -217,7 +233,7 @@ licenses: []
 metadata:
   bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
   changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
-  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.3.0
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.4.2
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -226,15 +242,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: openstudio base gem for creating generic extensions with encapsulated data