pry-debundle 0.6 → 0.7

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.
@@ -39,7 +39,7 @@ class << Pry
39
39
  return unless defined?(Bundler)
40
40
  loaded = false
41
41
 
42
- if rubygems_18?
42
+ if rubygems_18_or_better?
43
43
  if Gem.post_reset_hooks.reject!{ |hook| hook.source_location.first =~ %r{/bundler/} }
44
44
  Gem::Specification.reset
45
45
  remove_bundler_monkeypatches
@@ -80,15 +80,23 @@ class << Pry
80
80
 
81
81
  private
82
82
 
83
- def rubygems_18?
83
+ def rubygems_18_or_better?
84
84
  defined?(Gem.post_reset_hooks)
85
85
  end
86
86
 
87
+ def rubygems_20_or_better?
88
+ Gem::VERSION.to_i >= 2
89
+ end
90
+
87
91
  # Ugh, this stuff is quite vile.
88
92
  def remove_bundler_monkeypatches
89
- load 'rubygems/custom_require.rb'
93
+ if rubygems_20_or_better?
94
+ load 'rubygems/core_ext/kernel_require.rb'
95
+ else
96
+ load 'rubygems/custom_require.rb'
97
+ end
90
98
 
91
- if rubygems_18?
99
+ if rubygems_18_or_better?
92
100
  Kernel.module_eval do
93
101
  def gem(gem_name, *requirements) # :doc:
94
102
  skip_list = (ENV['GEM_SKIP'] || "").split(/:/)
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "pry-debundle"
3
- s.version = "0.6"
3
+ s.version = "0.7"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.author = "Conrad Irwin"
6
6
  s.email = "conrad.irwin@gmail.com"
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: pry-debundle
3
3
  version: !ruby/object:Gem::Version
4
- version: '0.6'
4
+ version: '0.7'
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-09-28 00:00:00.000000000 Z
12
+ date: 2013-04-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: pry