@@ -630,7 +630,7 @@ module IRB # :nodoc:
630
630
631
631
@CONF[:IRB_RC].call(irb.context) if @CONF[:IRB_RC]
632
632
# puts @CONF[:PROMPT_MODE]
633
- os_version = "3.8 .0" # OpenStudio::openStudioVersion
633
+ os_version = "3.9 .0" # OpenStudio::openStudioVersion
634
634
@CONF[:PROMPT][:OPENSTUDIO] = {
635
635
:PROMPT_I=>"(os #{os_version}) :%03n > ",
636
636
:PROMPT_S=>"(os #{os_version}) :%03n%l> ",
@@ -758,6 +758,15 @@ ENV.reject! { |k, _| ['GEM', 'BUNDLE'].any? { |x| k.start_with?(x) } }
758
758
if md = /specifications\/.*\.gemspec$/.match(f) ||
759
759
md = /bundler\/.*\.gemspec$/.match(f)
760
760
begin
761
+ puts "* #{f}"
762
+ if /bundler.*gemspec/.match(f)
763
+ if f.include?('specifications')
764
+ puts "Skipping bundler from specifications/: #{f}"
765
+ next
766
+ else
767
+ puts "Catching #{f}"
768
+ end
769
+ end
761
770
spec = EmbeddedScripting::getFileAsString(f)
762
771
s = eval(spec)
763
772
@@ -851,6 +860,7 @@ ENV.reject! { |k, _| ['GEM', 'BUNDLE'].any? { |x| k.start_with?(x) } }
851
860
852
861
if (use_bundler) {
853
862
initCmd += R"ruby(
863
+ puts "embedded_gems_to_activate=#{embedded_gems_to_activate}"
854
864
# Load the bundle before activating any embedded gems
855
865
embedded_gems_to_activate.each do |spec|
856
866
if spec.name == "bundler"
@@ -861,7 +871,12 @@ ENV.reject! { |k, _| ['GEM', 'BUNDLE'].any? { |x| k.start_with?(x) } }
861
871
862
872
begin
863
873
# Activate will manipulate the $LOAD_PATH to include the gem
874
+ puts "=" * 80
875
+ puts "LOAD_PATH=#{$LOAD_PATH}"
876
+ puts "Activating spec"
864
877
spec.activate
878
+ puts "LOAD_PATH=#{$LOAD_PATH}"
879
+ puts "=" * 80
865
880
rescue Gem::LoadError => e
866
881
# There may be conflicts between the bundle and the embedded gems,
867
882
# those will be logged here
@@ -884,53 +899,54 @@ ENV.reject! { |k, _| ['GEM', 'BUNDLE'].any? { |x| k.start_with?(x) } }
884
899
RbConfig::CONFIG['arch'] = 'x64-mingw32'
885
900
end
886
901
887
- # require bundler
888
- # have to do some forward declaration and pre-require to get around autoload cycles
889
- require 'bundler/errors'
890
- #require 'bundler/environment_preserver'
891
- require 'bundler/plugin'
892
- #require 'bundler/rubygems_ext'
893
- require 'bundler/rubygems_integration'
894
-
895
- # Global list, to be populated below
896
- $ignore_native_gem_names = []
902
+ puts "Requiring bundler"
903
+ # require bundler
904
+ # have to do some forward declaration and pre-require to get around autoload cycles
905
+ require 'bundler/errors'
906
+ #require 'bundler/environment_preserver'
907
+ require 'bundler/plugin'
908
+ #require 'bundler/rubygems_ext'
909
+ require 'bundler/rubygems_integration'
897
910
898
- module Bundler
899
- class RubygemsIntegration
911
+ # Global list, to be populated below
912
+ $ignore_native_gem_names = []
900
913
901
- alias :ori_spec_missing_extensions? :spec_missing_extensions?
914
+ module Bundler
915
+ class RubygemsIntegration
902
916
903
- def spec_missing_extensions?(spec, default = true)
917
+ alias :ori_spec_missing_extensions? : spec_missing_extensions?
904
918
905
- # This avoids getting an annoying message for no reason
906
- if $ignore_native_gem_names.any? {|name| name == spec.name }
907
- return false
908
- end
919
+ def spec_missing_extensions?(spec, default = true)
909
920
910
- return ori_spec_missing_extensions?(spec, default)
921
+ # This avoids getting an annoying message for no reason
922
+ if $ignore_native_gem_names.any? {|name| name == spec.name }
923
+ return false
911
924
end
925
+
926
+ return ori_spec_missing_extensions?(spec, default)
912
927
end
913
928
end
929
+ end
914
930
915
- require 'bundler/version'
916
- require 'bundler/ruby_version'
917
- #require 'bundler/constants'
918
- #require 'bundler/current_ruby'
919
- require 'bundler/gem_helpers'
920
- #require 'bundler/plugin'
921
- require 'bundler/source'
922
- require 'bundler/definition'
923
- require 'bundler/dsl'
924
- require 'bundler/uri_credentials_filter'
925
- require 'bundler/uri_normalizer'
926
- require 'bundler/index'
927
- require 'bundler/digest'
928
- require 'bundler/source/git'
929
- require 'bundler/source/git/git_proxy'
930
- require 'bundler/match_remote_metadata'
931
- require 'bundler/remote_specification'
932
- require 'bundler/stub_specification'
933
- require 'bundler'
931
+ require 'bundler/version'
932
+ require 'bundler/ruby_version'
933
+ #require 'bundler/constants'
934
+ #require 'bundler/current_ruby'
935
+ require 'bundler/gem_helpers'
936
+ #require 'bundler/plugin'
937
+ require 'bundler/source'
938
+ require 'bundler/definition'
939
+ require 'bundler/dsl'
940
+ require 'bundler/uri_credentials_filter'
941
+ require 'bundler/uri_normalizer'
942
+ require 'bundler/index'
943
+ require 'bundler/digest'
944
+ require 'bundler/source/git'
945
+ require 'bundler/source/git/git_proxy'
946
+ require 'bundler/match_remote_metadata'
947
+ require 'bundler/remote_specification'
948
+ require 'bundler/stub_specification'
949
+ require 'bundler'
934
950
935
951
begin
936
952
# activate bundled gems
0 commit comments