openstudio-extension 0.9.0 → 0.9.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.rubocop.yml +1 -1
- data/CHANGELOG.md +6 -0
- data/Gemfile +5 -1
- data/LICENSE.md +1 -1
- data/README.md +1 -0
- data/Rakefile +1 -3
- data/bin/console +1 -3
- data/doc_templates/LICENSE.md +1 -1
- data/init_templates/spec_helper.rb +1 -3
- data/lib/change_log.rb +5 -5
- data/lib/openstudio/extension/rake_task.rb +2 -5
- data/lib/openstudio/extension/runner.rb +11 -16
- data/lib/openstudio/extension/runner_config.rb +3 -6
- data/lib/openstudio/extension/version.rb +1 -1
- data/lib/openstudio/extension.rb +2 -1
- data/openstudio-extension.gemspec +4 -3
- metadata +28 -28
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c2d24568cc3a507abd4fe8398c3d26f3fac728ee6973c0c8dfa9cd78f24dc1f6
|
4
|
+
data.tar.gz: 7aa52d86d63b46582025bf90264b63ad5d9a8975eb86dfb8ffc3ad9e28542425
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0116caa809b243e8f0082ad30854f3b25ff24b162935f26c84a349364ad546c3bffec59bf4e3fd1965f17e60fc148a3a020a3a0d9673496d00474b2af60488ea
|
7
|
+
data.tar.gz: 5e83116da937ff7e7b11c00a284d9c09c5b33ef8e56d7d681c34fbf8e604846fbaee767d69a9c0fa311af420687648a74bfeb308aaf283eb0f453268f0334cfa
|
data/.rubocop.yml
CHANGED
data/CHANGELOG.md
CHANGED
@@ -1,4 +1,10 @@
|
|
1
1
|
# OpenStudio(R) Extension Gem
|
2
|
+
## Version 0.9.2
|
3
|
+
* Updating LICENSE.md in doc_templates to use 2025 for the year
|
4
|
+
* Fixed some rubocop offenses
|
5
|
+
|
6
|
+
## Version 0.9.1
|
7
|
+
* Updating faraday to 1.10.4 to remove deprecation notice
|
2
8
|
|
3
9
|
## Version 0.9.0
|
4
10
|
* Updating dependencies for OpenStudio 3.10
|
data/Gemfile
CHANGED
@@ -1,5 +1,8 @@
|
|
1
1
|
source 'http://rubygems.org'
|
2
2
|
|
3
|
+
# Specify your gem's dependencies in openstudio-extension.# gemspec commented out to avoid circular dependency during bundle install
|
4
|
+
# gemspec
|
5
|
+
|
3
6
|
# Specify your gem's dependencies in openstudio-extension.gemspec
|
4
7
|
|
5
8
|
# 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
|
@@ -7,5 +10,6 @@ source 'http://rubygems.org'
|
|
7
10
|
|
8
11
|
gemspec
|
9
12
|
|
13
|
+
# gem 'openstudio-standards', '= 0.2.17.rc1', :github => 'NREL/openstudio-standards', :ref => '3.5.0_changes'
|
10
14
|
|
11
|
-
|
15
|
+
gem 'rubocop-performance', '~> 1.20'
|
data/LICENSE.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
|
2
2
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
4
4
|
|
data/README.md
CHANGED
data/Rakefile
CHANGED
@@ -3,9 +3,7 @@
|
|
3
3
|
# See also https://openstudio.net/license
|
4
4
|
# *******************************************************************************
|
5
5
|
|
6
|
-
|
7
|
-
require 'bundler/gem_tasks'
|
8
|
-
end
|
6
|
+
require 'bundler/gem_tasks'
|
9
7
|
require 'rspec/core/rake_task'
|
10
8
|
|
11
9
|
RSpec::Core::RakeTask.new(:spec)
|
data/bin/console
CHANGED
data/doc_templates/LICENSE.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
OpenStudio(R), Copyright (c) 2008,
|
1
|
+
OpenStudio(R), Copyright (c) 2008, 2025 Alliance for Sustainable Energy, LLC.
|
2
2
|
|
3
3
|
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
|
4
4
|
|
@@ -3,9 +3,7 @@
|
|
3
3
|
# See also https://openstudio.net/license
|
4
4
|
# *******************************************************************************
|
5
5
|
|
6
|
-
|
7
|
-
require 'bundler/setup'
|
8
|
-
end
|
6
|
+
require 'bundler/setup'
|
9
7
|
require 'openstudio/GEM_NAME_UNDERSCORES'
|
10
8
|
|
11
9
|
RSpec.configure do |config|
|
data/lib/change_log.rb
CHANGED
@@ -89,10 +89,10 @@ class ChangeLog
|
|
89
89
|
end
|
90
90
|
end
|
91
91
|
|
92
|
-
@closed_issues.
|
93
|
-
@new_issues.
|
94
|
-
@accepted_pull_requests.
|
95
|
-
@total_open_pull_requests.
|
92
|
+
@closed_issues.sort_by!(&:number)
|
93
|
+
@new_issues.sort_by!(&:number)
|
94
|
+
@accepted_pull_requests.sort_by!(&:number)
|
95
|
+
@total_open_pull_requests.sort_by!(&:number)
|
96
96
|
rescue StandardError => e
|
97
97
|
puts e.message
|
98
98
|
ChangeLog.help
|
@@ -122,6 +122,6 @@ class ChangeLog
|
|
122
122
|
puts "\nAccepted Pull Requests: #{@accepted_pull_requests.length}"
|
123
123
|
@accepted_pull_requests.each { |issue| puts print_issue(issue) }
|
124
124
|
|
125
|
-
puts "\nAll Open Issues: #{@total_open_issues.length} (
|
125
|
+
puts "\nAll Open Issues: #{@total_open_issues.length} (#{@total_open_issues.map { |issue| "\##{issue.number}" }.join(', ')})"
|
126
126
|
end
|
127
127
|
end
|
@@ -14,6 +14,7 @@ module OpenStudio
|
|
14
14
|
attr_accessor :name, :measures_dir, :core_dir, :doc_templates_dir, :files_dir
|
15
15
|
|
16
16
|
def initialize(*args, &task_block)
|
17
|
+
super
|
17
18
|
@name = args.shift || :openstudio
|
18
19
|
|
19
20
|
setup_subtasks(@name)
|
@@ -124,11 +125,7 @@ module OpenStudio
|
|
124
125
|
bcl = ::BCL::ComponentMethods.new
|
125
126
|
|
126
127
|
# check for env var specifying keyword first
|
127
|
-
|
128
|
-
keyword = ENV['bcl_search_keyword']
|
129
|
-
else
|
130
|
-
keyword = 'Space'
|
131
|
-
end
|
128
|
+
keyword = ENV['bcl_search_keyword'] || 'Space'
|
132
129
|
num_results = 10
|
133
130
|
# bcl.search params: search_string, filter_string, return_all_results?
|
134
131
|
puts "searching BCL measures for keyword: #{keyword}"
|
@@ -3,16 +3,12 @@
|
|
3
3
|
# See also https://openstudio.net/license
|
4
4
|
# *******************************************************************************
|
5
5
|
|
6
|
-
|
7
|
-
if !defined?(Bundler)
|
8
|
-
require 'bundler'
|
9
|
-
end
|
6
|
+
require 'bundler'
|
10
7
|
require 'fileutils'
|
11
8
|
require 'json'
|
12
9
|
require 'open3'
|
13
10
|
require 'openstudio'
|
14
11
|
require 'yaml'
|
15
|
-
require 'fileutils'
|
16
12
|
require 'parallel'
|
17
13
|
require 'bcl'
|
18
14
|
|
@@ -51,7 +47,7 @@ module OpenStudio
|
|
51
47
|
runner_config = OpenStudio::Extension::RunnerConfig.new(dirname)
|
52
48
|
# use the default values overriden with runner.conf values where not
|
53
49
|
# nil nor empty strings
|
54
|
-
@options = @options.merge(runner_config.options.reject{|k, v| v.nil? || (v.
|
50
|
+
@options = @options.merge(runner_config.options.reject { |k, v| v.nil? || (v.is_a?(String) && v == '') })
|
55
51
|
end
|
56
52
|
|
57
53
|
if !options.empty?
|
@@ -64,8 +60,8 @@ module OpenStudio
|
|
64
60
|
@dirname = File.absolute_path(dirname)
|
65
61
|
|
66
62
|
# use passed options, otherwise assume @dirname
|
67
|
-
@gemfile_path = !@options.key?(:gemfile_path) || @options[:gemfile_path]
|
68
|
-
@bundle_install_path = !@options.key?(:bundle_install_path) || @options[:bundle_install_path]
|
63
|
+
@gemfile_path = !@options.key?(:gemfile_path) || @options[:gemfile_path] == '' ? File.join(@dirname, 'Gemfile') : @options[:gemfile_path]
|
64
|
+
@bundle_install_path = !@options.key?(:bundle_install_path) || @options[:bundle_install_path] == '' ? File.join(@dirname, '.bundle/install/') : @options[:bundle_install_path]
|
69
65
|
@original_dir = Dir.pwd
|
70
66
|
|
71
67
|
# gemfile directory
|
@@ -103,7 +99,7 @@ module OpenStudio
|
|
103
99
|
|
104
100
|
# check existing config
|
105
101
|
needs_config = true
|
106
|
-
if conf_bpath = Bundler.configured_bundle_path.explicit_path
|
102
|
+
if (conf_bpath = Bundler.configured_bundle_path.explicit_path)
|
107
103
|
puts 'bundler config exists'
|
108
104
|
needs_config = false
|
109
105
|
|
@@ -365,7 +361,7 @@ module OpenStudio
|
|
365
361
|
puts "#{measures.length} MEASURES FOUND"
|
366
362
|
measures.each do |measure|
|
367
363
|
name = measure.split('/')[-2]
|
368
|
-
puts name
|
364
|
+
puts name
|
369
365
|
end
|
370
366
|
end
|
371
367
|
|
@@ -500,9 +496,9 @@ module OpenStudio
|
|
500
496
|
FileUtils.cp(File.join(doc_templates_dir, 'LICENSE.md'), File.join(root_dir, 'LICENSE.md'))
|
501
497
|
end
|
502
498
|
|
503
|
-
ruby_regex = /^\#\s?[
|
504
|
-
erb_regex = /^<%\s*\#\s?[
|
505
|
-
js_regex =
|
499
|
+
ruby_regex = /^\#\s?[\#*]{12,}.*copyright.*?\#\s?[\#*]{12,}\s*$/mi
|
500
|
+
erb_regex = /^<%\s*\#\s?[\#*]{12,}.*copyright.*?\#\s?[\#*]{12,}\s*%>$/mi
|
501
|
+
js_regex = %r{^/\* @preserve.*copyright.*?\*/}mi
|
506
502
|
|
507
503
|
filename = File.join(doc_templates_dir, 'copyright_ruby.txt')
|
508
504
|
puts "Copyright file path: #{filename}"
|
@@ -545,14 +541,13 @@ module OpenStudio
|
|
545
541
|
{ glob: "#{root_dir}/**/*.js.erb", license: js_header_text, regex: js_regex }
|
546
542
|
]
|
547
543
|
# This is the bundle deployment folder
|
548
|
-
excluded_subfolders = ['vendor'].map{|d| "#{root_dir}/vendor/bundle"}
|
549
|
-
|
544
|
+
excluded_subfolders = ['vendor'].map { |d| "#{root_dir}/vendor/bundle" }
|
550
545
|
|
551
546
|
puts "Encoding.default_external = #{Encoding.default_external}"
|
552
547
|
puts "Encoding.default_internal = #{Encoding.default_internal}"
|
553
548
|
|
554
549
|
paths.each do |path|
|
555
|
-
Dir[path[:glob]].reject{|f| excluded_subfolders.any?{|d| f[d]} }.each do |dir_file|
|
550
|
+
Dir[path[:glob]].reject { |f| excluded_subfolders.any? { |d| f[d] } }.each do |dir_file|
|
556
551
|
puts "Updating license in file #{dir_file}"
|
557
552
|
f = File.read(dir_file)
|
558
553
|
if f.match?(path[:regex])
|
@@ -3,10 +3,7 @@
|
|
3
3
|
# See also https://openstudio.net/license
|
4
4
|
# *******************************************************************************
|
5
5
|
|
6
|
-
|
7
|
-
if !defined?(Bundler)
|
8
|
-
require 'bundler'
|
9
|
-
end
|
6
|
+
require 'bundler'
|
10
7
|
require 'fileutils'
|
11
8
|
require 'json'
|
12
9
|
require 'parallel'
|
@@ -72,7 +69,7 @@ module OpenStudio
|
|
72
69
|
run_simulations: true,
|
73
70
|
verbose: false,
|
74
71
|
gemfile_path: '',
|
75
|
-
bundle_install_path: get_local_bundle_config_path(dirname)
|
72
|
+
bundle_install_path: get_local_bundle_config_path(dirname)
|
76
73
|
}
|
77
74
|
end
|
78
75
|
|
@@ -84,7 +81,7 @@ module OpenStudio
|
|
84
81
|
def self.init(dirname)
|
85
82
|
runner_conf_file = File.join(dirname, FILENAME)
|
86
83
|
if File.exist?(runner_conf_file)
|
87
|
-
puts
|
84
|
+
puts 'runner.conf already exists, saving a runner.conf.bak, previous config:'
|
88
85
|
puts File.read(runner_conf_file)
|
89
86
|
FileUtils.cp(runner_conf_file, "#{FILENAME}.bak")
|
90
87
|
end
|
data/lib/openstudio/extension.rb
CHANGED
@@ -56,9 +56,10 @@ module OpenStudio
|
|
56
56
|
# DLM: consider calling Bundler.require in this method
|
57
57
|
# do not call Bundler.require when requiring this file, only when calling this method
|
58
58
|
result = []
|
59
|
-
|
59
|
+
|
60
60
|
ObjectSpace.each_object(::Class) do |obj|
|
61
61
|
next if !obj.ancestors.include?(OpenStudio::Extension::Extension)
|
62
|
+
|
62
63
|
result << obj
|
63
64
|
end
|
64
65
|
|
@@ -1,5 +1,6 @@
|
|
1
1
|
lib = File.expand_path('lib', __dir__)
|
2
2
|
$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
3
|
+
# Define version directly to avoid circular dependency during gemspec evaluation
|
3
4
|
require 'openstudio/extension/version'
|
4
5
|
|
5
6
|
Gem::Specification.new do |spec|
|
@@ -28,17 +29,17 @@ Gem::Specification.new do |spec|
|
|
28
29
|
|
29
30
|
spec.required_ruby_version = '~> 3.2.2'
|
30
31
|
|
31
|
-
spec.add_dependency 'bcl', '~> 0.9.
|
32
|
+
spec.add_dependency 'bcl', '~> 0.9.1'
|
32
33
|
# This only runs on the builders' machine
|
33
34
|
spec.add_dependency 'bundler', '2.4.10'
|
34
35
|
spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
|
35
36
|
spec.add_dependency 'openstudio_measure_tester', '~> 0.5.0'
|
36
37
|
spec.add_dependency 'openstudio-workflow', '~> 2.5.0'
|
37
38
|
# parallel, regexp_parser, and addressable versions are pinned to avoid test_with_openstudio errors
|
39
|
+
spec.add_dependency 'addressable', '2.8.1'
|
38
40
|
spec.add_dependency 'parallel', '~> 1.19.1'
|
39
41
|
spec.add_dependency 'regexp_parser', '2.9.0'
|
40
|
-
spec.add_dependency 'addressable', '2.8.1'
|
41
42
|
spec.add_development_dependency 'rake', '~> 13.0'
|
42
|
-
spec.add_development_dependency 'rubocop', '1.50'
|
43
43
|
spec.add_development_dependency 'rspec', '~> 3.9'
|
44
|
+
spec.add_development_dependency 'rubocop', '1.50'
|
44
45
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openstudio-extension
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.9.
|
4
|
+
version: 0.9.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Katherine Fleming
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: exe
|
13
13
|
cert_chain: []
|
14
|
-
date: 2025-
|
14
|
+
date: 2025-08-01 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: bcl
|
@@ -19,14 +19,14 @@ dependencies:
|
|
19
19
|
requirements:
|
20
20
|
- - "~>"
|
21
21
|
- !ruby/object:Gem::Version
|
22
|
-
version: 0.9.
|
22
|
+
version: 0.9.1
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
27
|
- - "~>"
|
28
28
|
- !ruby/object:Gem::Version
|
29
|
-
version: 0.9.
|
29
|
+
version: 0.9.1
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: bundler
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
@@ -84,47 +84,47 @@ dependencies:
|
|
84
84
|
- !ruby/object:Gem::Version
|
85
85
|
version: 2.5.0
|
86
86
|
- !ruby/object:Gem::Dependency
|
87
|
-
name:
|
87
|
+
name: addressable
|
88
88
|
requirement: !ruby/object:Gem::Requirement
|
89
89
|
requirements:
|
90
|
-
- -
|
90
|
+
- - '='
|
91
91
|
- !ruby/object:Gem::Version
|
92
|
-
version:
|
92
|
+
version: 2.8.1
|
93
93
|
type: :runtime
|
94
94
|
prerelease: false
|
95
95
|
version_requirements: !ruby/object:Gem::Requirement
|
96
96
|
requirements:
|
97
|
-
- -
|
97
|
+
- - '='
|
98
98
|
- !ruby/object:Gem::Version
|
99
|
-
version:
|
99
|
+
version: 2.8.1
|
100
100
|
- !ruby/object:Gem::Dependency
|
101
|
-
name:
|
101
|
+
name: parallel
|
102
102
|
requirement: !ruby/object:Gem::Requirement
|
103
103
|
requirements:
|
104
|
-
- -
|
104
|
+
- - "~>"
|
105
105
|
- !ruby/object:Gem::Version
|
106
|
-
version:
|
106
|
+
version: 1.19.1
|
107
107
|
type: :runtime
|
108
108
|
prerelease: false
|
109
109
|
version_requirements: !ruby/object:Gem::Requirement
|
110
110
|
requirements:
|
111
|
-
- -
|
111
|
+
- - "~>"
|
112
112
|
- !ruby/object:Gem::Version
|
113
|
-
version:
|
113
|
+
version: 1.19.1
|
114
114
|
- !ruby/object:Gem::Dependency
|
115
|
-
name:
|
115
|
+
name: regexp_parser
|
116
116
|
requirement: !ruby/object:Gem::Requirement
|
117
117
|
requirements:
|
118
118
|
- - '='
|
119
119
|
- !ruby/object:Gem::Version
|
120
|
-
version: 2.
|
120
|
+
version: 2.9.0
|
121
121
|
type: :runtime
|
122
122
|
prerelease: false
|
123
123
|
version_requirements: !ruby/object:Gem::Requirement
|
124
124
|
requirements:
|
125
125
|
- - '='
|
126
126
|
- !ruby/object:Gem::Version
|
127
|
-
version: 2.
|
127
|
+
version: 2.9.0
|
128
128
|
- !ruby/object:Gem::Dependency
|
129
129
|
name: rake
|
130
130
|
requirement: !ruby/object:Gem::Requirement
|
@@ -140,33 +140,33 @@ dependencies:
|
|
140
140
|
- !ruby/object:Gem::Version
|
141
141
|
version: '13.0'
|
142
142
|
- !ruby/object:Gem::Dependency
|
143
|
-
name:
|
143
|
+
name: rspec
|
144
144
|
requirement: !ruby/object:Gem::Requirement
|
145
145
|
requirements:
|
146
|
-
- -
|
146
|
+
- - "~>"
|
147
147
|
- !ruby/object:Gem::Version
|
148
|
-
version: '
|
148
|
+
version: '3.9'
|
149
149
|
type: :development
|
150
150
|
prerelease: false
|
151
151
|
version_requirements: !ruby/object:Gem::Requirement
|
152
152
|
requirements:
|
153
|
-
- -
|
153
|
+
- - "~>"
|
154
154
|
- !ruby/object:Gem::Version
|
155
|
-
version: '
|
155
|
+
version: '3.9'
|
156
156
|
- !ruby/object:Gem::Dependency
|
157
|
-
name:
|
157
|
+
name: rubocop
|
158
158
|
requirement: !ruby/object:Gem::Requirement
|
159
159
|
requirements:
|
160
|
-
- -
|
160
|
+
- - '='
|
161
161
|
- !ruby/object:Gem::Version
|
162
|
-
version: '
|
162
|
+
version: '1.50'
|
163
163
|
type: :development
|
164
164
|
prerelease: false
|
165
165
|
version_requirements: !ruby/object:Gem::Requirement
|
166
166
|
requirements:
|
167
|
-
- -
|
167
|
+
- - '='
|
168
168
|
- !ruby/object:Gem::Version
|
169
|
-
version: '
|
169
|
+
version: '1.50'
|
170
170
|
description: openstudio base gem for creating generic extensions with encapsulated
|
171
171
|
data and measures. Also contains ruby libraries that required by many measures.
|
172
172
|
email:
|
@@ -224,7 +224,7 @@ licenses: []
|
|
224
224
|
metadata:
|
225
225
|
bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
|
226
226
|
changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
|
227
|
-
source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.9.
|
227
|
+
source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.9.2
|
228
228
|
post_install_message:
|
229
229
|
rdoc_options: []
|
230
230
|
require_paths:
|