openstudio-extension 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6456304e43da453f3513232c09309b8f41c697cd102e1edd458ac3ae5c2eae2
-  data.tar.gz: 377a17ee89c1314c61a92d8d397c8ec947010ae987c466d9f0d0b3179b6d38ae
+  metadata.gz: b08465bdea9fbc5dce640b850c81d24026ffa1e68ea7b53ee2409f51330f7503
+  data.tar.gz: 5ff5879dcc3fdf93fad39921388b133f96ace24f419baeb7a025747c32a936b2
 SHA512:
-  metadata.gz: 55eb67c4ea67a4c198f6d01572bf35b7cfc5ffcb0849edc654de111fbd2c0f4f0672025c3db5589f96da733be4612eebf3bcb1269ca621f8bb59b500f5f45432
-  data.tar.gz: 26f11a0782c2d4681ae02173bd0bdc5c822d48f88ec11f9b71f6c7fdbd1fa8aab16beaf23fd3633e35791705d48e87ec9ec43a4890d7fc1be4841159e55762d4
+  metadata.gz: 3d2a1f426ade2de0fce06944401dc444d90eb03e0b942c7b524b9e3a4c0f3aeee3daf05ecb43a7570c0000686744ab49ca94c607a1d8c7183c7a774e3b9a58b4
+  data.tar.gz: cf3c0942f831a056990095ef318c1f80a1437151b3cdf2c40d71795b9d9045e2bc95849e1b96075f2810a36042c926aa2bf4ae798ee7640ab3dd05adb1fbb40d

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # OpenStudio(R) Extension Gem
 
+## Version 0.8.3
+* [#199]( https://github.com/NREL/openstudio-extension-gem/pull/199), Patch for bundler conflict issue
+
 ## Version 0.8.2
 
 * [#192]( https://github.com/NREL/openstudio-extension-gem/pull/192), Pinned regexp_parser version

data/Jenkinsfile

@@ -1,6 +1,6 @@
 //Jenkins pipelines are stored in shared libraries. Please see: https://github.com/NREL/cbci_jenkins_libs
 
-@Library('cbci_shared_libs@develop') _
+@Library('cbci_shared_libs') _
 
 // Build for PR to develop branch only.
 if ((env.CHANGE_ID) && (env.CHANGE_TARGET) ) { // check if set

data/Rakefile

@@ -3,15 +3,20 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-require 'bundler/gem_tasks'
+if !defined?(Bundler)
+  require 'bundler/gem_tasks'
+end
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-require 'openstudio/extension/rake_task'
-require 'openstudio/extension'
-rake_task = OpenStudio::Extension::RakeTask.new
-rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')
+# Only load extension tasks if we're not installing
+unless ARGV.include?('install')
+  require 'openstudio/extension/rake_task'
+  require 'openstudio/extension'
+  rake_task = OpenStudio::Extension::RakeTask.new
+  rake_task.set_extension_class(OpenStudio::Extension::Extension, 'nrel/openstudio-extension-gem')
+end
 
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new

data/bin/console

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
+if !defined?(Bundler)
+  require 'bundler/setup'
+end
 require 'openstudio/extension'
 
 # You can add fixtures and/or initialization code here to make experimenting

data/init_templates/spec_helper.rb

@@ -3,7 +3,9 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-require 'bundler/setup'
+if !defined?(Bundler)
+  require 'bundler/setup'
+end
 require 'openstudio/GEM_NAME_UNDERSCORES'
 
 RSpec.configure do |config|

data/lib/openstudio/extension/runner.rb

@@ -3,7 +3,10 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-require 'bundler'
+# Check if Bundler is already loaded
+if !defined?(Bundler)
+  require 'bundler'
+end
 require 'fileutils'
 require 'json'
 require 'open3'

data/lib/openstudio/extension/runner_config.rb

@@ -3,7 +3,10 @@
 # See also https://openstudio.net/license
 # *******************************************************************************
 
-require 'bundler'
+# Check if Bundler is already loaded
+if !defined?(Bundler)
+  require 'bundler'
+end
 require 'fileutils'
 require 'json'
 require 'parallel'

data/lib/openstudio/extension/version.rb

@@ -5,6 +5,6 @@
 
 module OpenStudio
   module Extension
-    VERSION = '0.8.2'.freeze
+    VERSION = '0.8.3'.freeze
   end
 end

data/openstudio-extension.gemspec

@@ -34,8 +34,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'octokit', '~> 4.18.0' # for change logs
   spec.add_dependency 'openstudio_measure_tester', '~> 0.4.0'
   spec.add_dependency 'openstudio-workflow', '~> 2.4.0'
+  # parallel, regexp_parser, and addressable versions are pinned to avoid test_with_openstudio errors
   spec.add_dependency 'parallel', '~> 1.19.1'
   spec.add_dependency 'regexp_parser', '2.9.0'
+  spec.add_dependency 'addressable', '2.8.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-extension
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - Katherine Fleming
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcl
@@ -111,6 +111,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.9.0
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.8.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +210,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.8.2
+  source_code_uri: https://github.com/NREL/openstudio-extension-gem/tree/v0.8.3
 post_install_message:
 rdoc_options: []
 require_paths: