openstudio-extension 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27dbd08d5d11f58ea9839b1d8a3750e860964ad4f5075371cacb6f4c1c642c92
-  data.tar.gz: 3353e644a7b21fe23bd9e50dcc4f844e478237868f88001a2c6538c2092464ed
+  metadata.gz: fbd3f65a4f467a9beee5439e58dbeddc445da4dfeb606d23547865a57d461d06
+  data.tar.gz: 4f7c9792f4f9bc5419caff2aa57a4bd8dcdb4252ad8d77b8e6b28b50eedeeb99
 SHA512:
-  metadata.gz: 9c593e49a37e0851ee1886f54f1c1a7b6ed83ef882f6d25ff803c9aefc4067766299f0fa94845cb284101ba02766c6b4c0e8e572a41c25d954ebb4f14314052c
-  data.tar.gz: 10b1a4dade5d911b1611e0d7262fdd3f59d8b7671e1cef0b593e318b50ed4099227b024ed433fe3003d5270984d4e37dd46cf1924d2c978d0061e6a9d1483197
+  metadata.gz: 61f585def76ef5d6998892f74fe8338744df5c90cdb26b906a04dbc5c53e7cfa1524c23e6636b3fd08acfcb8a2a0b9378473c24253265a320585b576ac9c4692
+  data.tar.gz: 6842e2d7eb60fd4d047d26e8b2e2e286819d3ed63a904f436bb1b8a28c2f469efcae2876eebf3372aad12716859d77350129f354a0336f8b4aedd31415cc953f

data/.rubocop.yml

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

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # OpenStudio Extension Gem
 
+## Version 0.2.3
+
+* Use new version of rubocop style from S3
+* Remove frozen string literals in comments
+
 ## Version 0.2.2
 
 * Exclude measure tests from being released with the gem (reduces the size of the installed gem significantly)

data/Gemfile

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 source 'http://rubygems.org'
 
 # Specify your gem's dependencies in openstudio-extension.gemspec

data/Rakefile

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 ########################################################################################################################
 #  openstudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC. All rights reserved.
 #

data/bin/console

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'openstudio/extension'

data/lib/change_log.rb

@@ -1,18 +1,43 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
+# *******************************************************************************
+# OpenStudio(R), Copyright (c) 2008-2020, 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:
+#
+# (1) Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# (2) Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# (3) Neither the name of the copyright holder nor the names of any contributors
+# may be used to endorse or promote products derived from this software without
+# specific prior written permission from the respective party.
+#
+# (4) Other than as required in clauses (1) and (2), distributions in any form
+# of modifications or other derivative works may not use the "OpenStudio"
+# trademark, "OS", "os", or any other confusingly similar designation without
+# specific prior written permission from Alliance for Sustainable Energy, LLC.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE
+# UNITED STATES GOVERNMENT, OR THE UNITED STATES DEPARTMENT OF ENERGY, NOR ANY OF
+# THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
+# OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# *******************************************************************************
 
 require 'octokit'
 require 'date'
 require 'optparse'
 require 'optparse/date'
 
-# Instructions:
-#
-# Example:
-#   ruby change_log.rb -t abcdefghijklmnopqrstuvwxyz -s 2017-09-06
-#
-#
-
 class ChangeLog
   def initialize(user_and_repo, start_date = Date.today - 90, end_date = Date.today, apikey = nil)
     @user_and_repo = user_and_repo
@@ -119,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 { |issue| issue.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/measures/openstudio_extension_test_measure/measure.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

data/lib/openstudio/extension/rake_task.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -51,11 +49,12 @@ module OpenStudio
         setup_subtasks(@name)
       end
 
-      def set_extension_class(extension_class, github_repo='')
+      def set_extension_class(extension_class, github_repo = '')
         @extension_class = extension_class
         @extension = extension_class.new
         @root_dir = @extension.root_dir
-        @measures_dir = @extension.measures_dir
+        # Catch if measures_dir is nil, then just make it an empty string
+        @measures_dir = @extension.measures_dir || ''
         @staged_path = @measures_dir + '/staged'
         @core_dir = @extension.core_dir
         @doc_templates_dir = @extension.doc_templates_dir
@@ -83,8 +82,6 @@ module OpenStudio
 
           desc 'Use openstudio system ruby to run tests'
           task :test_with_openstudio do
-            # puts Dir.pwd
-            # puts Rake.original_dir
             puts 'testing with openstudio'
             runner = OpenStudio::Extension::Runner.new(Dir.pwd)
             result = runner.test_measures_with_cli(@measures_dir)
@@ -176,7 +173,7 @@ module OpenStudio
               results = bcl.search(keyword, "fq[]=bundle:nrel_measure&show_rows=#{num_results}", false)
               puts "there are #{results[:result].count} results"
               results[:result].each do |res|
-                puts (res[:measure][:name]).to_s
+                puts(res[:measure][:name]).to_s
               end
             end
 

data/lib/openstudio/extension/runner.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -563,12 +561,12 @@ module OpenStudio
         puts "Encoding.default_internal = #{Encoding.default_internal}"
 
         paths.each do |path|
-          Dir[path[:glob]].each do |file|
-            puts "Updating license in file #{file}"
-            f = File.read(file)
+          Dir[path[:glob]].each do |dir_file|
+            puts "Updating license in file #{dir_file}"
+            f = File.read(dir_file)
             if f.match?(path[:regex])
               puts '  License found -- updating'
-              File.open(file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
+              File.open(dir_file, 'w') { |write| write << f.gsub(path[:regex], path[:license]) }
             elsif f =~ /\(C\)/i || f =~ /\(Copyright\)/i
               puts '  File already has copyright -- skipping'
             else
@@ -577,7 +575,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(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

data/lib/openstudio/extension/runner_config.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -40,7 +38,7 @@ require 'json'
 module OpenStudio
   module Extension
     class RunnerConfig
-      FILENAME = 'runner.conf'
+      FILENAME = 'runner.conf'.freeze
 
       ##
       # Class to store configuration of the runner options.

data/lib/openstudio/extension/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.
@@ -37,6 +35,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'.freeze
   end
 end

data/lib/openstudio/extension.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

data/lib/openstudio-extension.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # *******************************************************************************
 # OpenStudio(R), Copyright (c) 2008-2020, Alliance for Sustainable Energy, LLC.
 # All rights reserved.

data/openstudio-extension.gemspec

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'openstudio/extension/version'
@@ -30,11 +28,11 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.5.0'
 
-  spec.add_dependency 'bcl', '~> 0.6.0'
+  spec.add_dependency 'bcl', '~> 0.6.1'
   spec.add_dependency 'bundler', '~> 2.1'
-  spec.add_dependency 'octokit', '~> 4.18.0'  # for change logs
-  spec.add_dependency 'openstudio_measure_tester', '~> 0.2.2'
+  spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
   spec.add_dependency 'openstudio-workflow', '~> 2.0.0'
+  spec.add_dependency 'openstudio_measure_tester', '~> 0.2.2'
   spec.add_dependency 'parallel', '~> 1.19.1'
 
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Katherine Fleming
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -55,33 +55,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.18.0
 - !ruby/object:Gem::Dependency
-  name: openstudio_measure_tester
+  name: openstudio-workflow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: openstudio-workflow
+  name: openstudio_measure_tester
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,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.2.2
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.2.3
 post_install_message: 
 rdoc_options: []
 require_paths: