openstudio-extension 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b97c709824bf3884fb41b661e80677e74e968e21d8af1b5fc45fbece3c419b9
-  data.tar.gz: c225a47bec7fb5d176be730e7e3d21a17b0acdf455f71f5cad41853abbbda684
+  metadata.gz: 567f2008ed2e8d3fab092b962d34f0d2a59881d8617839ba8ed977dc2cfddc4b
+  data.tar.gz: d575f3db0ff84c9a2d8af9030976b6fad068903b63c9ab5daa6717cc5902a96d
 SHA512:
-  metadata.gz: 43720385e7e367fa63f21775d66b69ff52df63c289f5155f65b1d49023cf184ab854bfbde63254596aad9986b3d8b4db5ad358f17c121ea9153bd9fa7aefa66a
-  data.tar.gz: 2fc1e01489b19a2797465e682dc86a387697e1c3cfc34ce6110994300213cf3b50de8cfa0b62983c21c360ed5537ce9ff7b03b023ea074590a73e4a813834155
+  metadata.gz: 194ecd22b5cbc12c75133487c21b0df4dd1ad746d270819a2558d9c8c1831b8558faa9e6a581ca1f7890894be4e5059fb9e730c7e714b8f912cbebaa0689934e
+  data.tar.gz: b2193e267204d75bbdda44eaee353727eb20b75cb9923d649ddb5e740e97de5926b8b5f1e47e58c78b123bed7c33f1602dcc1b0ce4583c68006efdfe5392f2b0

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
     - lib/measures/**/resources/*
     - lib/openstudio/extension/core/**/*
 
+require: rubocop-performance
 inherit_from:
-  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v3.yml
+  - http://s3.amazonaws.com/openstudio-resources/styles/rubocop_v4.yml
 

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # OpenStudio Extension Gem
 
+## Version 0.4.3
+
+* Update measure tester gem which upgrades Rubocop to 1.15
+* Update styles to v4 based on new version of Rubocop
+
 ## Version 0.4.2
 
+* Fixes [#113](https://github.com/NREL/openstudio-extension-gem/issues/113) Fix bad args behavior on bar_from_building_type_ratios
+* Fixes [#103](https://github.com/NREL/openstudio-extension-gem/issues/103) make check_upstream_measure_for_arg more robust for non string arguments
 * Updatd version of openstudio-standards for development to openstudio-standards 0.2.13
 * Added ASHRAE 90.1 2016 and 2019 to get_doe_templates method in os_lib_model_generation.rb file. This method is used by a number of measures to generate allowable argument values
 

data/Gemfile

@@ -3,7 +3,6 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in openstudio-extension.gemspec
 
 # line below used for testing when need to test against branch instead of release of standards. Should be commented out prior to merge to develop
-#gem 'openstudio-standards', github: 'NREL/openstudio-standards', branch: 'fix/901_2016_2019_properties' # for os_lib unit tests
+# gem 'openstudio-standards', github: 'NREL/openstudio-standards', branch: 'fix/901_2016_2019_properties' # for os_lib unit tests
 
 gemspec
-

data/Rakefile

@@ -45,10 +45,10 @@ desc 'Initialize a new gem'
 task :init_new_gem do
   puts 'Initializing a new extension gem'
   print "\n Enter the name of the new gem directory (ex: openstudio-something-gem. Should end with '-gem'): "
-  gem_name = STDIN.gets.chomp
+  gem_name = $stdin.gets.chomp
 
   print "\n Enter the path (full or relative to this repo) where you want the new gem directory to be created: "
-  dir_path = STDIN.gets.chomp
+  dir_path = $stdin.gets.chomp
 
   # check if directory already exists at path, if so error
   full_dir_name = dir_path + gem_name
@@ -61,7 +61,7 @@ task :init_new_gem do
   end
 
   # copy file structure
-  FileUtils.cp('.gitignore', full_dir_name + '/.gitignore')
+  FileUtils.cp('.gitignore', "#{full_dir_name}/.gitignore")
   FileUtils.cp_r(File.join(File.dirname(__FILE__), 'init_templates/template_gemfile.txt'), File.join(full_dir_name, 'Gemfile'))
   FileUtils.cp_r(File.join(File.dirname(__FILE__), 'doc_templates'), full_dir_name)
 

data/lib/change_log.rb

@@ -144,7 +144,7 @@ class ChangeLog
     puts "Total Open Issues: #{@total_open_issues.length}"
     puts "Total Open Pull Requests: #{@total_open_pull_requests.length}"
     puts "\nDate Range: #{@start_date.strftime('%m/%d/%y')} - #{@end_date.strftime('%m/%d/%y')}:"
-    puts "\nNew Issues: #{@new_issues.length} (" + @new_issues.map(&:number).join(', ') + ')'
+    puts "\nNew Issues: #{@new_issues.length} (#{@new_issues.map(&:number).join(', ')})"
 
     puts "\nClosed Issues: #{@closed_issues.length}"
     @closed_issues.each { |issue| puts print_issue(issue) }

data/lib/openstudio/extension.rb

@@ -209,11 +209,9 @@ module OpenStudio
     def self.set_measure_argument(osw, measure_dir_name, argument_name, argument_value, step_name = nil)
       result = false
       osw[:steps].each do |step|
-        if step[:measure_dir_name] == measure_dir_name
-          if step_name.nil? || step[:name] == step_name
-            step[:arguments][argument_name.to_sym] = argument_value
-            result = true
-          end
+        if step[:measure_dir_name] == measure_dir_name && (step_name.nil? || step[:name] == step_name)
+          step[:arguments][argument_name.to_sym] = argument_value
+          result = true
         end
       end
 
@@ -239,10 +237,8 @@ module OpenStudio
     def self.measure_in_osw(osw, measure_dir_name, step_name = nil)
       result = false
       osw[:steps].each do |step|
-        if step[:measure_dir_name] == measure_dir_name
-          if step_name.nil? || step[:name] == step_name
-            result = true
-          end
+        if step[:measure_dir_name] == measure_dir_name && (step_name.nil? || step[:name] == step_name)
+          result = true
         end
       end
 

data/lib/openstudio/extension/rake_task.rb

@@ -55,7 +55,7 @@ module OpenStudio
         @root_dir = @extension.root_dir
         # Catch if measures_dir is nil, then just make it an empty string
         @measures_dir = @extension.measures_dir || ''
-        @staged_path = @measures_dir + '/staged'
+        @staged_path = "#{@measures_dir}/staged"
         @core_dir = @extension.core_dir
         @doc_templates_dir = @extension.doc_templates_dir
         @files_dir = @extension.files_dir
@@ -201,9 +201,9 @@ module OpenStudio
               end
 
               # create new and existing directories
-              FileUtils.mkdir_p(@staged_path.to_s + '/update')
-              FileUtils.mkdir_p(@staged_path.to_s + '/push/component')
-              FileUtils.mkdir_p(@staged_path.to_s + '/push/measure')
+              FileUtils.mkdir_p("#{@staged_path}/update")
+              FileUtils.mkdir_p("#{@staged_path}/push/component")
+              FileUtils.mkdir_p("#{@staged_path}/push/measure")
 
               # keep track of noop, update, push
               noops = 0
@@ -215,6 +215,7 @@ module OpenStudio
 
               dirs.each do |dir|
                 next if dir.include?('Rakefile') || File.basename(dir) == 'staged'
+
                 current_d = Dir.pwd
                 content_name = File.basename(dir)
                 puts '', '---'
@@ -235,6 +236,7 @@ module OpenStudio
                   next if file.to_s.start_with?('tests/test') # From openstudio-measure-tester-gem
                   next if file.to_s.start_with?('tests/coverage') # From openstudio-measure-tester-gem
                   next if file.to_s.start_with?('test_results') # From openstudio-measure-tester-gem
+
                   paths << file.to_s
                   if file.to_s =~ /^.{0,2}component.xml$/ || file.to_s =~ /^.{0,2}measure.xml$/
                     if file.to_s.match?(/^.{0,2}component.xml$/)
@@ -246,21 +248,22 @@ module OpenStudio
                 end
                 puts "UUID: #{uuid}, VID: #{vid}"
 
-                # note: if uuid is missing, will assume new content
+                # NOTE: if uuid is missing, will assume new content
                 action = bcl.search_by_uuid(uuid, vid)
                 puts "#{content_name} ACTION TO TAKE: #{action}"
                 # new content functionality needs to know if measure or component.  update is agnostic.
-                if action == 'noop' # ignore up-to-date content
+                case action
+                when 'noop' # ignore up-to-date content
                   puts "  - WARNING: local #{content_name} uuid and vid match BCL... no update will be performed"
                   noops += 1
                   next
-                elsif action == 'update'
+                when 'update'
                   # puts "#{content_name} labeled as update for BCL"
-                  destination = @staged_path + '/' + action + '/' + "#{content_name}.tar.gz"
+                  destination = "#{@staged_path}/#{action}/#{content_name}.tar.gz"
                   updates += 1
-                elsif action == 'push'
+                when 'push'
                   # puts "#{content_name} labeled as new content for BCL"
-                  destination = @staged_path + '/' + action + '/' + content_type + "/#{content_name}.tar.gz"
+                  destination = "#{@staged_path}/#{action}/#{content_type}/#{content_name}.tar.gz"
                   new_ones += 1
                 end
 
@@ -309,7 +312,7 @@ module OpenStudio
                   puts item.split('/').last
                   total_count += 1
 
-                  receipt_file = File.dirname(item) + '/' + File.basename(item, '.tar.gz') + '.receipt'
+                  receipt_file = "#{File.dirname(item)}/#{File.basename(item, '.tar.gz')}.receipt"
                   if !reset && File.exist?(receipt_file)
                     skipped += 1
                     puts 'SKIP: receipt file found'
@@ -333,7 +336,7 @@ module OpenStudio
 
               # grab all the updated content (measures and components) tar files and push to bcl
               items = []
-              paths = Pathname.glob(@staged_path.to_s + '/update/*.tar.gz')
+              paths = Pathname.glob("#{@staged_path}/update/*.tar.gz")
               paths.each do |path|
                 # puts path
                 items << path.to_s
@@ -342,7 +345,7 @@ module OpenStudio
                 puts item.split('/').last
                 total_count += 1
 
-                receipt_file = File.dirname(item) + '/' + File.basename(item, '.tar.gz') + '.receipt'
+                receipt_file = "#{File.dirname(item)}/#{File.basename(item, '.tar.gz')}.receipt"
                 if !reset && File.exist?(receipt_file)
                   skipped += 1
                   puts 'SKIP: receipt file found'

data/lib/openstudio/extension/runner.rb

@@ -121,15 +121,15 @@ module OpenStudio
 
             # test to see if bundle is installed
             check_bundle = run_command('bundle -v', get_clean_env)
-            if !check_bundle
-              raise "Failed to run command 'bundle -v', check that bundle is installed" if !File.exist?(@dirname)
+            if !check_bundle && !File.exist?(@dirname)
+              raise "Failed to run command 'bundle -v', check that bundle is installed"
             end
 
             # TODO: check that ruby version is correct
 
             # check existing config
             needs_config = true
-            if File.exist?('./.bundle/config')  # checking wrt gemfile_dir
+            if File.exist?('./.bundle/config') # checking wrt gemfile_dir
               puts 'config exists'
               needs_config = false
               config = YAML.load_file('./.bundle/config')
@@ -166,10 +166,8 @@ module OpenStudio
             end
 
             needs_update = needs_config || needs_platform
-            if !needs_update
-              if !File.exist?('Gemfile.lock') || File.mtime(@gemfile_path) > File.mtime('Gemfile.lock')
-                needs_update = true
-              end
+            if !needs_update && (!File.exist?('Gemfile.lock') || File.mtime(@gemfile_path) > File.mtime('Gemfile.lock'))
+              needs_update = true
             end
 
             puts "needs_update = #{needs_update}"
@@ -241,7 +239,7 @@ module OpenStudio
             puts "Error running command: '#{command}'"
             puts "stdout: #{stdout_str}"
             puts "stderr: #{stderr_str}"
-            STDOUT.flush
+            $stdout.flush
             result = false
           end
         ensure
@@ -318,10 +316,10 @@ module OpenStudio
 
         puts 'SYSTEM CALL:'
         puts the_call
-        STDOUT.flush
+        $stdout.flush
         result = run_command(the_call, get_clean_env)
         puts "DONE, result = #{result}"
-        STDOUT.flush
+        $stdout.flush
 
         return result
       end
@@ -358,10 +356,10 @@ module OpenStudio
 
           puts 'SYSTEM CALL:'
           puts the_call
-          STDOUT.flush
+          $stdout.flush
           result &&= run_command(the_call, get_clean_env)
           puts "DONE, result = #{result}"
-          STDOUT.flush
+          $stdout.flush
         end
 
         return result
@@ -425,7 +423,7 @@ module OpenStudio
           measures = Dir.glob(File.join(measures_dir, '**/**/resources/*.rb'))
         end
 
-        # Note: some older measures like AEDG use 'OsLib_SomeName' instead of 'os_lib_some_name'
+        # NOTE: some older measures like AEDG use 'OsLib_SomeName' instead of 'os_lib_some_name'
         # this script isn't replacing those copies
 
         # loop through resource files
@@ -523,11 +521,9 @@ module OpenStudio
           return false
         end
 
-        if File.exist?(File.join(doc_templates_dir, 'LICENSE.md'))
-          if File.exist?(File.join(root_dir, 'LICENSE.md'))
-            puts 'updating LICENSE.md in root dir'
-            FileUtils.cp(File.join(doc_templates_dir, 'LICENSE.md'), File.join(root_dir, 'LICENSE.md'))
-          end
+        if File.exist?(File.join(doc_templates_dir, 'LICENSE.md')) && File.exist?(File.join(root_dir, 'LICENSE.md'))
+          puts 'updating LICENSE.md in root dir'
+          FileUtils.cp(File.join(doc_templates_dir, 'LICENSE.md'), File.join(root_dir, 'LICENSE.md'))
         end
 
         ruby_regex = /^\#\s?[\#\*]{12,}.*copyright.*?\#\s?[\#\*]{12,}\s*$/mi
@@ -593,7 +589,7 @@ module OpenStudio
                 puts '  CANNOT add license to file automatically, add it manually and it will update automatically in the future'
                 next
               end
-              File.open(dir_file, 'w') { |write| write << f.insert(0, path[:license] + "\n") }
+              File.open(dir_file, 'w') { |write| write << f.insert(0, "#{path[:license]}\n") }
             end
           end
         end
@@ -631,7 +627,7 @@ module OpenStudio
 
         if @options[:run_simulations]
           cli = OpenStudio.getOpenStudioCLI
-          out_log = run_osw_path + '.log'
+          out_log = "#{run_osw_path}.log"
           # if Gem.win_platform?
           #   # out_log = "nul"
           # else
@@ -655,10 +651,10 @@ module OpenStudio
 
           puts 'SYSTEM CALL:'
           puts the_call
-          STDOUT.flush
+          $stdout.flush
           result = run_command(the_call, get_clean_env)
           puts "DONE, result = #{result}"
-          STDOUT.flush
+          $stdout.flush
         else
           puts 'simulations are not performed, since to the @options[:run_simulations] is set to false'
         end

data/lib/openstudio/extension/version.rb

@@ -35,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.4.2'.freeze
+    VERSION = '0.4.3'.freeze
   end
 end

data/openstudio-extension.gemspec

@@ -31,8 +31,8 @@ Gem::Specification.new do |spec|
   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_measure_tester', '~> 0.3.1'
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Katherine Fleming
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-22 00:00:00.000000000 Z
+date: 2021-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -56,33 +56,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.18.0
 - !ruby/object:Gem::Dependency
-  name: openstudio-workflow
+  name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 0.3.1
 - !ruby/object:Gem::Dependency
-  name: openstudio_measure_tester
+  name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -233,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.4.2
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.4.3
 post_install_message: 
 rdoc_options: []
 require_paths: