openstudio-extension 0.8.1 → 0.8.3

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 9144377a4547713593c7cf889f473d16e75e384d30dea7602ca16a5cc8c39b45
4
- data.tar.gz: 7971d8bd04e54c8d310d0b4b142779d7c7b05082239e8c3359f87190ccc8a842
3
+ metadata.gz: b08465bdea9fbc5dce640b850c81d24026ffa1e68ea7b53ee2409f51330f7503
4
+ data.tar.gz: 5ff5879dcc3fdf93fad39921388b133f96ace24f419baeb7a025747c32a936b2
5
5
  SHA512:
6
- metadata.gz: 8c1030edb0c51790e7dd3cb1501ac57353d335526391852ec5e2278134984d31c627da4ad07c6934b9d73fa5adaaa6f4d355c2c1bf84936a3d02c7940c0f8396
7
- data.tar.gz: 879a0c778856327acb7ba0ff934e0c5809793b51d405e49d6e9c47c78adb95600325132f34ea693741dab540102599d84cf9b201332d83e4fd0138ff9cbd9471
6
+ metadata.gz: 3d2a1f426ade2de0fce06944401dc444d90eb03e0b942c7b524b9e3a4c0f3aeee3daf05ecb43a7570c0000686744ab49ca94c607a1d8c7183c7a774e3b9a58b4
7
+ data.tar.gz: cf3c0942f831a056990095ef318c1f80a1437151b3cdf2c40d71795b9d9045e2bc95849e1b96075f2810a36042c926aa2bf4ae798ee7640ab3dd05adb1fbb40d
data/CHANGELOG.md CHANGED
@@ -1,5 +1,12 @@
1
1
  # OpenStudio(R) Extension Gem
2
2
 
3
+ ## Version 0.8.3
4
+ * [#199]( https://github.com/NREL/openstudio-extension-gem/pull/199), Patch for bundler conflict issue
5
+
6
+ ## Version 0.8.2
7
+
8
+ * [#192]( https://github.com/NREL/openstudio-extension-gem/pull/192), Pinned regexp_parser version
9
+
3
10
  ## Version 0.8.1
4
11
 
5
12
  * [#190]( https://github.com/NREL/openstudio-extension-gem/pull/190), Don't raise error when bundle path mismatch occurs
data/Jenkinsfile CHANGED
@@ -1,10 +1,10 @@
1
- //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs
2
-
1
+ //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
2
+
3
3
  @Library('cbci_shared_libs') _
4
4
 
5
- // Build for PR to develop branch only.
5
+ // Build for PR to develop branch only.
6
6
  if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set
7
7
 
8
8
  openstudio_extension_gems()
9
-
9
+
10
10
  }
data/Rakefile CHANGED
@@ -3,15 +3,20 @@
3
3
  # See also https://openstudio.net/license
4
4
  # *******************************************************************************
5
5
 
6
- require 'bundler/gem_tasks'
6
+ if !defined?(Bundler)
7
+ require 'bundler/gem_tasks'
8
+ end
7
9
  require 'rspec/core/rake_task'
8
10
 
9
11
  RSpec::Core::RakeTask.new(:spec)
10
12
 
11
- require 'openstudio/extension/rake_task'
12
- require 'openstudio/extension'
13
- rake_task = OpenStudio::Extension::RakeTask.new
14
- rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')
13
+ # Only load extension tasks if we're not installing
14
+ unless ARGV.include?('install')
15
+ require 'openstudio/extension/rake_task'
16
+ require 'openstudio/extension'
17
+ rake_task = OpenStudio::Extension::RakeTask.new
18
+ rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')
19
+ end
15
20
 
16
21
  require 'rubocop/rake_task'
17
22
  RuboCop::RakeTask.new
data/bin/console CHANGED
@@ -1,6 +1,8 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
- require 'bundler/setup'
3
+ if !defined?(Bundler)
4
+ require 'bundler/setup'
5
+ end
4
6
  require 'openstudio/extension'
5
7
 
6
8
  # You can add fixtures and/or initialization code here to make experimenting
@@ -3,7 +3,9 @@
3
3
  # See also https://openstudio.net/license
4
4
  # *******************************************************************************
5
5
 
6
- require 'bundler/setup'
6
+ if !defined?(Bundler)
7
+ require 'bundler/setup'
8
+ end
7
9
  require 'openstudio/GEM_NAME_UNDERSCORES'
8
10
 
9
11
  RSpec.configure do |config|
@@ -3,7 +3,10 @@
3
3
  # See also https://openstudio.net/license
4
4
  # *******************************************************************************
5
5
 
6
- require 'bundler'
6
+ # Check if Bundler is already loaded
7
+ if !defined?(Bundler)
8
+ require 'bundler'
9
+ end
7
10
  require 'fileutils'
8
11
  require 'json'
9
12
  require 'open3'
@@ -3,7 +3,10 @@
3
3
  # See also https://openstudio.net/license
4
4
  # *******************************************************************************
5
5
 
6
- require 'bundler'
6
+ # Check if Bundler is already loaded
7
+ if !defined?(Bundler)
8
+ require 'bundler'
9
+ end
7
10
  require 'fileutils'
8
11
  require 'json'
9
12
  require 'parallel'
@@ -5,6 +5,6 @@
5
5
 
6
6
  module OpenStudio
7
7
  module Extension
8
- VERSION = '0.8.1'.freeze
8
+ VERSION = '0.8.3'.freeze
9
9
  end
10
10
  end
@@ -34,8 +34,10 @@ Gem::Specification.new do |spec|
34
34
  spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
35
35
  spec.add_dependency 'openstudio_measure_tester', '~> 0.4.0'
36
36
  spec.add_dependency 'openstudio-workflow', '~> 2.4.0'
37
+ # parallel, regexp_parser, and addressable versions are pinned to avoid test_with_openstudio errors
37
38
  spec.add_dependency 'parallel', '~> 1.19.1'
38
-
39
+ spec.add_dependency 'regexp_parser', '2.9.0'
40
+ spec.add_dependency 'addressable', '2.8.1'
39
41
  spec.add_development_dependency 'rake', '~> 13.0'
40
42
  spec.add_development_dependency 'rspec', '~> 3.9'
41
43
  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.8.1
4
+ version: 0.8.3
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: 2024-07-27 00:00:00.000000000 Z
14
+ date: 2025-01-10 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: bcl
@@ -97,6 +97,34 @@ dependencies:
97
97
  - - "~>"
98
98
  - !ruby/object:Gem::Version
99
99
  version: 1.19.1
100
+ - !ruby/object:Gem::Dependency
101
+ name: regexp_parser
102
+ requirement: !ruby/object:Gem::Requirement
103
+ requirements:
104
+ - - '='
105
+ - !ruby/object:Gem::Version
106
+ version: 2.9.0
107
+ type: :runtime
108
+ prerelease: false
109
+ version_requirements: !ruby/object:Gem::Requirement
110
+ requirements:
111
+ - - '='
112
+ - !ruby/object:Gem::Version
113
+ version: 2.9.0
114
+ - !ruby/object:Gem::Dependency
115
+ name: addressable
116
+ requirement: !ruby/object:Gem::Requirement
117
+ requirements:
118
+ - - '='
119
+ - !ruby/object:Gem::Version
120
+ version: 2.8.1
121
+ type: :runtime
122
+ prerelease: false
123
+ version_requirements: !ruby/object:Gem::Requirement
124
+ requirements:
125
+ - - '='
126
+ - !ruby/object:Gem::Version
127
+ version: 2.8.1
100
128
  - !ruby/object:Gem::Dependency
101
129
  name: rake
102
130
  requirement: !ruby/object:Gem::Requirement
@@ -182,7 +210,7 @@ licenses: []
182
210
  metadata:
183
211
  bug_tracker_uri: https://github.com/NREL/openstudio-extension-gem/issues
184
212
  changelog_uri: https://github.com/NREL/openstudio-extension-gem/blob/develop/CHANGELOG.md
185
- source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.8.1
213
+ source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.8.3
186
214
  post_install_message:
187
215
  rdoc_options: []
188
216
  require_paths: