development 1.0.6 → 1.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.
- data/CHANGELOG.md +1 -0
- data/lib/development.rb +5 -0
- data/lib/development/require.rb +39 -2
- metadata +1 -1
data/CHANGELOG.md
CHANGED
|
@@ -8,3 +8,4 @@ Oops! Configuration-file enabling was commented out. So 1.0.3 is the first worki
|
|
|
8
8
|
... And then left comments in.
|
|
9
9
|
Fix for enabling by gemset.
|
|
10
10
|
Directories can now specify either the directory the gem directory is in or the gem directory itself.
|
|
11
|
+
We now support Bundler!
|
data/lib/development.rb
CHANGED
|
@@ -1092,6 +1092,11 @@ require_relative 'development/exception/malformed_expression/malformed_remove_ge
|
|
|
1092
1092
|
#
|
|
1093
1093
|
class ::Object
|
|
1094
1094
|
include ::Development::Require
|
|
1095
|
+
extend ::Development::Require
|
|
1096
|
+
end
|
|
1097
|
+
|
|
1098
|
+
if defined?( ::Bundler )
|
|
1099
|
+
::Development::Require::BundlerSupport.call
|
|
1095
1100
|
end
|
|
1096
1101
|
|
|
1097
1102
|
::Development.load_configuration_file( ::File.join( '~', ::Development::ConfigurationFileName ) )
|
data/lib/development/require.rb
CHANGED
|
@@ -6,6 +6,39 @@
|
|
|
6
6
|
#
|
|
7
7
|
module ::Development::Require
|
|
8
8
|
|
|
9
|
+
###
|
|
10
|
+
# A proc to enable Development support with Bundler.
|
|
11
|
+
#
|
|
12
|
+
BundlerSupport = ::Proc.new do
|
|
13
|
+
|
|
14
|
+
class << ::Kernel
|
|
15
|
+
|
|
16
|
+
#==============#
|
|
17
|
+
# do_require #
|
|
18
|
+
#==============#
|
|
19
|
+
|
|
20
|
+
alias_method :do_require, :require
|
|
21
|
+
|
|
22
|
+
#===========#
|
|
23
|
+
# require #
|
|
24
|
+
#===========#
|
|
25
|
+
|
|
26
|
+
def require( gem_name_or_path )
|
|
27
|
+
|
|
28
|
+
did_load = ::Development.require( gem_name_or_path )
|
|
29
|
+
|
|
30
|
+
if did_load.nil?
|
|
31
|
+
did_load = do_require( gem_name_or_path )
|
|
32
|
+
end
|
|
33
|
+
|
|
34
|
+
return did_load
|
|
35
|
+
|
|
36
|
+
end
|
|
37
|
+
|
|
38
|
+
end
|
|
39
|
+
|
|
40
|
+
end
|
|
41
|
+
|
|
9
42
|
#############
|
|
10
43
|
# require #
|
|
11
44
|
#############
|
|
@@ -20,16 +53,20 @@ module ::Development::Require
|
|
|
20
53
|
#
|
|
21
54
|
# @return [true,false] Whether require loaded gem/file.
|
|
22
55
|
#
|
|
23
|
-
def require( gem_name_or_path )
|
|
56
|
+
def require( gem_name_or_path )
|
|
24
57
|
|
|
25
58
|
did_load = ::Development.require( gem_name_or_path )
|
|
26
59
|
|
|
27
60
|
if did_load.nil?
|
|
28
61
|
did_load = super
|
|
29
62
|
end
|
|
63
|
+
|
|
64
|
+
if gem_name_or_path == 'bundler'
|
|
65
|
+
::Development::Require::BundlerSupport.call
|
|
66
|
+
end
|
|
30
67
|
|
|
31
68
|
return did_load
|
|
32
69
|
|
|
33
70
|
end
|
|
34
|
-
|
|
71
|
+
|
|
35
72
|
end
|