bundler 2.2.27 → 2.2.31
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of bundler might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/CHANGELOG.md +52 -1
- data/README.md +1 -1
- data/lib/bundler/build_metadata.rb +2 -2
- data/lib/bundler/cli/gem.rb +86 -8
- data/lib/bundler/cli/info.rb +11 -4
- data/lib/bundler/cli/issue.rb +4 -3
- data/lib/bundler/cli/remove.rb +1 -2
- data/lib/bundler/cli.rb +4 -1
- data/lib/bundler/compact_index_client.rb +2 -2
- data/lib/bundler/definition.rb +14 -9
- data/lib/bundler/digest.rb +71 -0
- data/lib/bundler/errors.rb +18 -2
- data/lib/bundler/fetcher.rb +2 -1
- data/lib/bundler/friendly_errors.rb +5 -30
- data/lib/bundler/gem_helper.rb +6 -17
- data/lib/bundler/lockfile_parser.rb +1 -0
- data/lib/bundler/man/bundle-add.1 +1 -1
- data/lib/bundler/man/bundle-binstubs.1 +1 -1
- data/lib/bundler/man/bundle-cache.1 +1 -1
- data/lib/bundler/man/bundle-check.1 +1 -1
- data/lib/bundler/man/bundle-clean.1 +1 -1
- data/lib/bundler/man/bundle-config.1 +3 -3
- data/lib/bundler/man/bundle-config.1.ronn +2 -2
- data/lib/bundler/man/bundle-doctor.1 +1 -1
- data/lib/bundler/man/bundle-exec.1 +1 -1
- data/lib/bundler/man/bundle-gem.1 +14 -1
- data/lib/bundler/man/bundle-gem.1.ronn +16 -0
- data/lib/bundler/man/bundle-info.1 +1 -1
- data/lib/bundler/man/bundle-init.1 +1 -1
- data/lib/bundler/man/bundle-inject.1 +1 -1
- data/lib/bundler/man/bundle-install.1 +1 -1
- data/lib/bundler/man/bundle-list.1 +1 -1
- data/lib/bundler/man/bundle-lock.1 +1 -1
- data/lib/bundler/man/bundle-open.1 +1 -1
- data/lib/bundler/man/bundle-outdated.1 +1 -1
- data/lib/bundler/man/bundle-platform.1 +1 -1
- data/lib/bundler/man/bundle-pristine.1 +1 -1
- data/lib/bundler/man/bundle-remove.1 +1 -1
- data/lib/bundler/man/bundle-show.1 +1 -1
- data/lib/bundler/man/bundle-update.1 +1 -1
- data/lib/bundler/man/bundle-viz.1 +1 -1
- data/lib/bundler/man/bundle.1 +1 -1
- data/lib/bundler/man/gemfile.5 +1 -1
- data/lib/bundler/rubygems_ext.rb +4 -0
- data/lib/bundler/rubygems_gem_installer.rb +20 -4
- data/lib/bundler/rubygems_integration.rb +26 -9
- data/lib/bundler/runtime.rb +2 -2
- data/lib/bundler/source/git/git_proxy.rb +5 -2
- data/lib/bundler/source/git.rb +22 -4
- data/lib/bundler/source/rubygems.rb +36 -72
- data/lib/bundler/spec_set.rb +1 -1
- data/lib/bundler/templates/newgem/Gemfile.tt +5 -2
- data/lib/bundler/templates/newgem/Rakefile.tt +5 -1
- data/lib/bundler/templates/newgem/newgem.gemspec.tt +13 -13
- data/lib/bundler/templates/newgem/standard.yml.tt +4 -0
- data/lib/bundler/vendor/connection_pool/LICENSE +20 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/timed_stack.rb +19 -21
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/version.rb +1 -1
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/wrapper.rb +57 -0
- data/lib/bundler/vendor/connection_pool/lib/connection_pool.rb +39 -74
- data/lib/bundler/vendor/fileutils/LICENSE.txt +22 -0
- data/lib/bundler/vendor/molinillo/LICENSE +9 -0
- data/lib/bundler/vendor/molinillo/lib/molinillo/dependency_graph.rb +2 -2
- data/lib/bundler/vendor/net-http-persistent/README.rdoc +82 -0
- data/lib/bundler/vendor/thor/LICENSE.md +20 -0
- data/lib/bundler/vendor/tsort/LICENSE.txt +22 -0
- data/lib/bundler/vendor/tsort/lib/tsort.rb +453 -0
- data/lib/bundler/vendor/uri/LICENSE.txt +22 -0
- data/lib/bundler/vendored_tsort.rb +4 -0
- data/lib/bundler/version.rb +1 -1
- data/lib/bundler/worker.rb +2 -2
- data/lib/bundler.rb +2 -1
- metadata +18 -7
- data/lib/bundler/vendor/connection_pool/lib/connection_pool/monotonic_time.rb +0 -66
@@ -135,7 +135,7 @@ module Bundler
|
|
135
135
|
force = opts[:force]
|
136
136
|
ensure_builtin_gems_cached = opts[:ensure_builtin_gems_cached]
|
137
137
|
|
138
|
-
if ensure_builtin_gems_cached &&
|
138
|
+
if ensure_builtin_gems_cached && spec.default_gem?
|
139
139
|
if !cached_path(spec)
|
140
140
|
cached_built_in_gem(spec) unless spec.remote
|
141
141
|
force = true
|
@@ -162,7 +162,7 @@ module Bundler
|
|
162
162
|
begin
|
163
163
|
s = Bundler.rubygems.spec_from_gem(path, Bundler.settings["trust-policy"])
|
164
164
|
spec.__swap__(s)
|
165
|
-
rescue
|
165
|
+
rescue Gem::Package::FormatError
|
166
166
|
Bundler.rm_rf(path)
|
167
167
|
raise
|
168
168
|
end
|
@@ -174,6 +174,7 @@ module Bundler
|
|
174
174
|
Bundler.ui.confirm message
|
175
175
|
|
176
176
|
path = cached_gem(spec)
|
177
|
+
raise GemNotFound, "Could not find #{spec.file_name} for installation" unless path
|
177
178
|
if requires_sudo?
|
178
179
|
install_path = Bundler.tmp(spec.full_name)
|
179
180
|
bin_path = install_path.join("bin")
|
@@ -233,12 +234,8 @@ module Bundler
|
|
233
234
|
end
|
234
235
|
|
235
236
|
def cache(spec, custom_path = nil)
|
236
|
-
|
237
|
-
|
238
|
-
else
|
239
|
-
cached_path = cached_gem(spec)
|
240
|
-
end
|
241
|
-
raise GemNotFound, "Missing gem file '#{spec.full_name}.gem'." unless cached_path
|
237
|
+
cached_path = cached_gem(spec)
|
238
|
+
raise GemNotFound, "Missing gem file '#{spec.file_name}'." unless cached_path
|
242
239
|
return if File.dirname(cached_path) == Bundler.app_cache.to_s
|
243
240
|
Bundler.ui.info " * #{File.basename(cached_path)}"
|
244
241
|
FileUtils.cp(cached_path, Bundler.app_cache(custom_path))
|
@@ -352,14 +349,17 @@ module Bundler
|
|
352
349
|
end
|
353
350
|
|
354
351
|
def cached_gem(spec)
|
355
|
-
|
356
|
-
|
357
|
-
|
352
|
+
if spec.default_gem?
|
353
|
+
cached_built_in_gem(spec)
|
354
|
+
else
|
355
|
+
cached_path(spec)
|
358
356
|
end
|
359
|
-
cached_gem
|
360
357
|
end
|
361
358
|
|
362
359
|
def cached_path(spec)
|
360
|
+
global_cache_path = download_cache_path(spec)
|
361
|
+
@caches << global_cache_path if global_cache_path
|
362
|
+
|
363
363
|
possibilities = @caches.map {|p| "#{p}/#{spec.file_name}" }
|
364
364
|
possibilities.find {|p| File.exist?(p) }
|
365
365
|
end
|
@@ -459,19 +459,26 @@ module Bundler
|
|
459
459
|
|
460
460
|
spec.fetch_platform
|
461
461
|
|
462
|
-
|
463
|
-
gem_path = "#{
|
462
|
+
cache_path = download_cache_path(spec) || default_cache_path_for(rubygems_dir)
|
463
|
+
gem_path = "#{cache_path}/#{spec.file_name}"
|
464
|
+
|
465
|
+
if requires_sudo?
|
466
|
+
download_path = Bundler.tmp(spec.full_name)
|
467
|
+
download_cache_path = default_cache_path_for(download_path)
|
468
|
+
else
|
469
|
+
download_cache_path = cache_path
|
470
|
+
end
|
464
471
|
|
465
|
-
SharedHelpers.filesystem_access(
|
472
|
+
SharedHelpers.filesystem_access(download_cache_path) do |p|
|
466
473
|
FileUtils.mkdir_p(p)
|
467
474
|
end
|
468
|
-
download_gem(spec,
|
475
|
+
download_gem(spec, download_cache_path)
|
469
476
|
|
470
477
|
if requires_sudo?
|
471
|
-
SharedHelpers.filesystem_access(
|
478
|
+
SharedHelpers.filesystem_access(cache_path) do |p|
|
472
479
|
Bundler.mkdir_p(p)
|
473
480
|
end
|
474
|
-
Bundler.sudo "mv #{
|
481
|
+
Bundler.sudo "mv #{download_cache_path}/#{spec.file_name} #{gem_path}"
|
475
482
|
end
|
476
483
|
|
477
484
|
gem_path
|
@@ -479,16 +486,8 @@ module Bundler
|
|
479
486
|
Bundler.rm_rf(download_path) if requires_sudo?
|
480
487
|
end
|
481
488
|
|
482
|
-
def builtin_gem?(spec)
|
483
|
-
# Ruby 2.1, where all included gems have this summary
|
484
|
-
return true if spec.summary =~ /is bundled with Ruby/
|
485
|
-
|
486
|
-
# Ruby 2.0, where gemspecs are stored in specifications/default/
|
487
|
-
spec.loaded_from && spec.loaded_from.include?("specifications/default/")
|
488
|
-
end
|
489
|
-
|
490
489
|
def installed?(spec)
|
491
|
-
installed_specs[spec].any?
|
490
|
+
installed_specs[spec].any? && !spec.deleted_gem?
|
492
491
|
end
|
493
492
|
|
494
493
|
def requires_sudo?
|
@@ -499,6 +498,10 @@ module Bundler
|
|
499
498
|
Bundler.rubygems.gem_dir
|
500
499
|
end
|
501
500
|
|
501
|
+
def default_cache_path_for(dir)
|
502
|
+
"#{dir}/cache"
|
503
|
+
end
|
504
|
+
|
502
505
|
def cache_path
|
503
506
|
Bundler.app_cache
|
504
507
|
end
|
@@ -511,52 +514,13 @@ module Bundler
|
|
511
514
|
# @param [Specification] spec
|
512
515
|
# the spec we want to download or retrieve from the cache.
|
513
516
|
#
|
514
|
-
# @param [String]
|
517
|
+
# @param [String] download_cache_path
|
515
518
|
# the local directory the .gem will end up in.
|
516
519
|
#
|
517
|
-
def download_gem(spec,
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
SharedHelpers.filesystem_access(local_path) do
|
522
|
-
FileUtils.cp(cache_path, local_path)
|
523
|
-
end
|
524
|
-
else
|
525
|
-
uri = spec.remote.uri
|
526
|
-
Bundler.ui.confirm("Fetching #{version_message(spec)}")
|
527
|
-
rubygems_local_path = Bundler.rubygems.download_gem(spec, uri, download_path)
|
528
|
-
|
529
|
-
# older rubygems return varying file:// variants depending on version
|
530
|
-
rubygems_local_path = rubygems_local_path.gsub(/\Afile:/, "") unless Bundler.rubygems.provides?(">= 3.2.0.rc.2")
|
531
|
-
rubygems_local_path = rubygems_local_path.gsub(%r{\A//}, "") if Bundler.rubygems.provides?("< 3.1.0")
|
532
|
-
|
533
|
-
if rubygems_local_path != local_path
|
534
|
-
SharedHelpers.filesystem_access(local_path) do
|
535
|
-
FileUtils.mv(rubygems_local_path, local_path)
|
536
|
-
end
|
537
|
-
end
|
538
|
-
cache_globally(spec, local_path)
|
539
|
-
end
|
540
|
-
end
|
541
|
-
|
542
|
-
# Checks if the requested spec exists in the global cache. If it does
|
543
|
-
# not, we create the relevant global cache subdirectory if it does not
|
544
|
-
# exist and copy the spec from the local cache to the global cache.
|
545
|
-
#
|
546
|
-
# @param [Specification] spec
|
547
|
-
# the spec we want to copy to the global cache.
|
548
|
-
#
|
549
|
-
# @param [String] local_cache_path
|
550
|
-
# the local directory from which we want to copy the .gem.
|
551
|
-
#
|
552
|
-
def cache_globally(spec, local_cache_path)
|
553
|
-
return unless cache_path = download_cache_path(spec)
|
554
|
-
return if cache_path.exist?
|
555
|
-
|
556
|
-
SharedHelpers.filesystem_access(cache_path.dirname, &:mkpath)
|
557
|
-
SharedHelpers.filesystem_access(cache_path) do
|
558
|
-
FileUtils.cp(local_cache_path, cache_path)
|
559
|
-
end
|
520
|
+
def download_gem(spec, download_cache_path)
|
521
|
+
uri = spec.remote.uri
|
522
|
+
Bundler.ui.confirm("Fetching #{version_message(spec)}")
|
523
|
+
Bundler.rubygems.download_gem(spec, uri, download_cache_path)
|
560
524
|
end
|
561
525
|
|
562
526
|
# Returns the global cache path of the calling Rubygems::Source object.
|
@@ -575,7 +539,7 @@ module Bundler
|
|
575
539
|
return unless remote = spec.remote
|
576
540
|
return unless cache_slug = remote.cache_slug
|
577
541
|
|
578
|
-
Bundler.user_cache.join("gems", cache_slug
|
542
|
+
Bundler.user_cache.join("gems", cache_slug)
|
579
543
|
end
|
580
544
|
|
581
545
|
def extension_cache_slug(spec)
|
data/lib/bundler/spec_set.rb
CHANGED
@@ -14,7 +14,10 @@ gem "rake-compiler"
|
|
14
14
|
|
15
15
|
gem "<%= config[:test] %>", "~> <%= config[:test_framework_version] %>"
|
16
16
|
<%- end -%>
|
17
|
-
<%- if config[:
|
17
|
+
<%- if config[:linter] == "rubocop" -%>
|
18
18
|
|
19
|
-
gem "rubocop", "~> <%= config[:
|
19
|
+
gem "rubocop", "~> <%= config[:linter_version] %>"
|
20
|
+
<%- elsif config[:linter] == "standard" -%>
|
21
|
+
|
22
|
+
gem "standard", "~> <%= config[:linter_version] %>"
|
20
23
|
<%- end -%>
|
@@ -18,12 +18,16 @@ require "rspec/core/rake_task"
|
|
18
18
|
RSpec::Core::RakeTask.new(:spec)
|
19
19
|
|
20
20
|
<% end -%>
|
21
|
-
<% if config[:
|
21
|
+
<% if config[:linter] == "rubocop" -%>
|
22
22
|
<% default_task_names << :rubocop -%>
|
23
23
|
require "rubocop/rake_task"
|
24
24
|
|
25
25
|
RuboCop::RakeTask.new
|
26
26
|
|
27
|
+
<% elsif config[:linter] == "standard" -%>
|
28
|
+
<% default_task_names << :standard -%>
|
29
|
+
require "standard/rake"
|
30
|
+
|
27
31
|
<% end -%>
|
28
32
|
<% if config[:ext] -%>
|
29
33
|
<% default_task_names.unshift(:clobber, :compile) -%>
|
@@ -3,20 +3,20 @@
|
|
3
3
|
require_relative "lib/<%=config[:namespaced_path]%>/version"
|
4
4
|
|
5
5
|
Gem::Specification.new do |spec|
|
6
|
-
spec.name
|
7
|
-
spec.version
|
8
|
-
spec.authors
|
9
|
-
spec.email
|
10
|
-
|
11
|
-
spec.summary
|
12
|
-
spec.description
|
13
|
-
spec.homepage
|
6
|
+
spec.name = <%= config[:name].inspect %>
|
7
|
+
spec.version = <%= config[:constant_name] %>::VERSION
|
8
|
+
spec.authors = [<%= config[:author].inspect %>]
|
9
|
+
spec.email = [<%= config[:email].inspect %>]
|
10
|
+
|
11
|
+
spec.summary = "TODO: Write a short summary, because RubyGems requires one."
|
12
|
+
spec.description = "TODO: Write a longer description or delete this line."
|
13
|
+
spec.homepage = "TODO: Put your gem's website or public repo URL here."
|
14
14
|
<%- if config[:mit] -%>
|
15
|
-
spec.license
|
15
|
+
spec.license = "MIT"
|
16
16
|
<%- end -%>
|
17
17
|
spec.required_ruby_version = ">= <%= config[:required_ruby_version] %>"
|
18
18
|
|
19
|
-
spec.metadata["allowed_push_host"] = "TODO: Set to 'https://
|
19
|
+
spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
|
20
20
|
|
21
21
|
spec.metadata["homepage_uri"] = spec.homepage
|
22
22
|
spec.metadata["source_code_uri"] = "TODO: Put your gem's public repo URL here."
|
@@ -29,11 +29,11 @@ Gem::Specification.new do |spec|
|
|
29
29
|
(f == __FILE__) || f.match(%r{\A(?:(?:test|spec|features)/|\.(?:git|travis|circleci)|appveyor)})
|
30
30
|
end
|
31
31
|
end
|
32
|
-
spec.bindir
|
33
|
-
spec.executables
|
32
|
+
spec.bindir = "exe"
|
33
|
+
spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
|
34
34
|
spec.require_paths = ["lib"]
|
35
35
|
<%- if config[:ext] -%>
|
36
|
-
spec.extensions
|
36
|
+
spec.extensions = ["ext/<%= config[:underscored_name] %>/extconf.rb"]
|
37
37
|
<%- end -%>
|
38
38
|
|
39
39
|
# Uncomment to register a new dependency of your gem
|
@@ -0,0 +1,20 @@
|
|
1
|
+
Copyright (c) 2011 Mike Perham
|
2
|
+
|
3
|
+
Permission is hereby granted, free of charge, to any person obtaining
|
4
|
+
a copy of this software and associated documentation files (the
|
5
|
+
"Software"), to deal in the Software without restriction, including
|
6
|
+
without limitation the rights to use, copy, modify, merge, publish,
|
7
|
+
distribute, sublicense, and/or sell copies of the Software, and to
|
8
|
+
permit persons to whom the Software is furnished to do so, subject to
|
9
|
+
the following conditions:
|
10
|
+
|
11
|
+
The above copyright notice and this permission notice shall be
|
12
|
+
included in all copies or substantial portions of the Software.
|
13
|
+
|
14
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
15
|
+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
16
|
+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
17
|
+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
18
|
+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
19
|
+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
20
|
+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
@@ -1,13 +1,3 @@
|
|
1
|
-
require 'thread'
|
2
|
-
require 'timeout'
|
3
|
-
require_relative 'monotonic_time'
|
4
|
-
|
5
|
-
##
|
6
|
-
# Raised when you attempt to retrieve a connection from a pool that has been
|
7
|
-
# shut down.
|
8
|
-
|
9
|
-
class Bundler::ConnectionPool::PoolShuttingDownError < RuntimeError; end
|
10
|
-
|
11
1
|
##
|
12
2
|
# The TimedStack manages a pool of homogeneous connections (or any resource
|
13
3
|
# you wish to manage). Connections are created lazily up to a given maximum
|
@@ -25,7 +15,7 @@ class Bundler::ConnectionPool::PoolShuttingDownError < RuntimeError; end
|
|
25
15
|
#
|
26
16
|
# conn = ts.pop
|
27
17
|
# ts.pop timeout: 5
|
28
|
-
# #=> raises
|
18
|
+
# #=> raises Bundler::ConnectionPool::TimeoutError after 5 seconds
|
29
19
|
|
30
20
|
class Bundler::ConnectionPool::TimedStack
|
31
21
|
attr_reader :max
|
@@ -39,8 +29,8 @@ class Bundler::ConnectionPool::TimedStack
|
|
39
29
|
@created = 0
|
40
30
|
@que = []
|
41
31
|
@max = size
|
42
|
-
@mutex = Mutex.new
|
43
|
-
@resource = ConditionVariable.new
|
32
|
+
@mutex = Thread::Mutex.new
|
33
|
+
@resource = Thread::ConditionVariable.new
|
44
34
|
@shutdown_block = nil
|
45
35
|
end
|
46
36
|
|
@@ -59,12 +49,12 @@ class Bundler::ConnectionPool::TimedStack
|
|
59
49
|
@resource.broadcast
|
60
50
|
end
|
61
51
|
end
|
62
|
-
|
52
|
+
alias << push
|
63
53
|
|
64
54
|
##
|
65
55
|
# Retrieves a connection from the stack. If a connection is available it is
|
66
56
|
# immediately returned. If no connection is available within the given
|
67
|
-
# timeout a
|
57
|
+
# timeout a Bundler::ConnectionPool::TimeoutError is raised.
|
68
58
|
#
|
69
59
|
# +:timeout+ is the only checked entry in +options+ and is preferred over
|
70
60
|
# the +timeout+ argument (which will be removed in a future release). Other
|
@@ -74,7 +64,7 @@ class Bundler::ConnectionPool::TimedStack
|
|
74
64
|
options, timeout = timeout, 0.5 if Hash === timeout
|
75
65
|
timeout = options.fetch :timeout, timeout
|
76
66
|
|
77
|
-
deadline =
|
67
|
+
deadline = current_time + timeout
|
78
68
|
@mutex.synchronize do
|
79
69
|
loop do
|
80
70
|
raise Bundler::ConnectionPool::PoolShuttingDownError if @shutdown_block
|
@@ -83,18 +73,20 @@ class Bundler::ConnectionPool::TimedStack
|
|
83
73
|
connection = try_create(options)
|
84
74
|
return connection if connection
|
85
75
|
|
86
|
-
to_wait = deadline -
|
87
|
-
raise
|
76
|
+
to_wait = deadline - current_time
|
77
|
+
raise Bundler::ConnectionPool::TimeoutError, "Waited #{timeout} sec" if to_wait <= 0
|
88
78
|
@resource.wait(@mutex, to_wait)
|
89
79
|
end
|
90
80
|
end
|
91
81
|
end
|
92
82
|
|
93
83
|
##
|
94
|
-
# Shuts down the TimedStack
|
95
|
-
#
|
84
|
+
# Shuts down the TimedStack by passing each connection to +block+ and then
|
85
|
+
# removing it from the pool. Attempting to checkout a connection after
|
86
|
+
# shutdown will raise +Bundler::ConnectionPool::PoolShuttingDownError+ unless
|
87
|
+
# +:reload+ is +true+.
|
96
88
|
|
97
|
-
def shutdown(&block)
|
89
|
+
def shutdown(reload: false, &block)
|
98
90
|
raise ArgumentError, "shutdown must receive a block" unless block_given?
|
99
91
|
|
100
92
|
@mutex.synchronize do
|
@@ -102,6 +94,7 @@ class Bundler::ConnectionPool::TimedStack
|
|
102
94
|
@resource.broadcast
|
103
95
|
|
104
96
|
shutdown_connections
|
97
|
+
@shutdown_block = nil if reload
|
105
98
|
end
|
106
99
|
end
|
107
100
|
|
@@ -121,6 +114,10 @@ class Bundler::ConnectionPool::TimedStack
|
|
121
114
|
|
122
115
|
private
|
123
116
|
|
117
|
+
def current_time
|
118
|
+
Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
119
|
+
end
|
120
|
+
|
124
121
|
##
|
125
122
|
# This is an extension point for TimedStack and is called with a mutex.
|
126
123
|
#
|
@@ -149,6 +146,7 @@ class Bundler::ConnectionPool::TimedStack
|
|
149
146
|
conn = fetch_connection(options)
|
150
147
|
@shutdown_block.call(conn)
|
151
148
|
end
|
149
|
+
@created = 0
|
152
150
|
end
|
153
151
|
|
154
152
|
##
|
@@ -0,0 +1,57 @@
|
|
1
|
+
class Bundler::ConnectionPool
|
2
|
+
class Wrapper < ::BasicObject
|
3
|
+
METHODS = [:with, :pool_shutdown, :wrapped_pool]
|
4
|
+
|
5
|
+
def initialize(options = {}, &block)
|
6
|
+
@pool = options.fetch(:pool) { ::Bundler::ConnectionPool.new(options, &block) }
|
7
|
+
end
|
8
|
+
|
9
|
+
def wrapped_pool
|
10
|
+
@pool
|
11
|
+
end
|
12
|
+
|
13
|
+
def with(&block)
|
14
|
+
@pool.with(&block)
|
15
|
+
end
|
16
|
+
|
17
|
+
def pool_shutdown(&block)
|
18
|
+
@pool.shutdown(&block)
|
19
|
+
end
|
20
|
+
|
21
|
+
def pool_size
|
22
|
+
@pool.size
|
23
|
+
end
|
24
|
+
|
25
|
+
def pool_available
|
26
|
+
@pool.available
|
27
|
+
end
|
28
|
+
|
29
|
+
def respond_to?(id, *args)
|
30
|
+
METHODS.include?(id) || with { |c| c.respond_to?(id, *args) }
|
31
|
+
end
|
32
|
+
|
33
|
+
# rubocop:disable Style/MethodMissingSuper
|
34
|
+
# rubocop:disable Style/MissingRespondToMissing
|
35
|
+
if ::RUBY_VERSION >= "3.0.0"
|
36
|
+
def method_missing(name, *args, **kwargs, &block)
|
37
|
+
with do |connection|
|
38
|
+
connection.send(name, *args, **kwargs, &block)
|
39
|
+
end
|
40
|
+
end
|
41
|
+
elsif ::RUBY_VERSION >= "2.7.0"
|
42
|
+
ruby2_keywords def method_missing(name, *args, &block)
|
43
|
+
with do |connection|
|
44
|
+
connection.send(name, *args, &block)
|
45
|
+
end
|
46
|
+
end
|
47
|
+
else
|
48
|
+
def method_missing(name, *args, &block)
|
49
|
+
with do |connection|
|
50
|
+
connection.send(name, *args, &block)
|
51
|
+
end
|
52
|
+
end
|
53
|
+
end
|
54
|
+
# rubocop:enable Style/MethodMissingSuper
|
55
|
+
# rubocop:enable Style/MissingRespondToMissing
|
56
|
+
end
|
57
|
+
end
|
@@ -1,14 +1,18 @@
|
|
1
|
-
|
2
|
-
require_relative
|
1
|
+
require "timeout"
|
2
|
+
require_relative "connection_pool/version"
|
3
3
|
|
4
|
+
class Bundler::ConnectionPool
|
5
|
+
class Error < ::RuntimeError; end
|
6
|
+
class PoolShuttingDownError < ::Bundler::ConnectionPool::Error; end
|
7
|
+
class TimeoutError < ::Timeout::Error; end
|
8
|
+
end
|
4
9
|
|
5
|
-
# Generic connection pool class for
|
6
|
-
# among many threads. Note:
|
10
|
+
# Generic connection pool class for sharing a limited number of objects or network connections
|
11
|
+
# among many threads. Note: pool elements are lazily created.
|
7
12
|
#
|
8
13
|
# Example usage with block (faster):
|
9
14
|
#
|
10
15
|
# @pool = Bundler::ConnectionPool.new { Redis.new }
|
11
|
-
#
|
12
16
|
# @pool.with do |redis|
|
13
17
|
# redis.lpop('my-list') if redis.llen('my-list') > 0
|
14
18
|
# end
|
@@ -34,29 +38,23 @@ require_relative 'connection_pool/timed_stack'
|
|
34
38
|
class Bundler::ConnectionPool
|
35
39
|
DEFAULTS = {size: 5, timeout: 5}
|
36
40
|
|
37
|
-
class Error < RuntimeError
|
38
|
-
end
|
39
|
-
|
40
41
|
def self.wrap(options, &block)
|
41
42
|
Wrapper.new(options, &block)
|
42
43
|
end
|
43
44
|
|
44
45
|
def initialize(options = {}, &block)
|
45
|
-
raise ArgumentError,
|
46
|
+
raise ArgumentError, "Connection pool requires a block" unless block
|
46
47
|
|
47
48
|
options = DEFAULTS.merge(options)
|
48
49
|
|
49
|
-
@size = options.fetch(:size)
|
50
|
+
@size = Integer(options.fetch(:size))
|
50
51
|
@timeout = options.fetch(:timeout)
|
51
52
|
|
52
53
|
@available = TimedStack.new(@size, &block)
|
53
|
-
@key = :"
|
54
|
-
@key_count = :"
|
54
|
+
@key = :"pool-#{@available.object_id}"
|
55
|
+
@key_count = :"pool-#{@available.object_id}-count"
|
55
56
|
end
|
56
57
|
|
57
|
-
if Thread.respond_to?(:handle_interrupt)
|
58
|
-
|
59
|
-
# MRI
|
60
58
|
def with(options = {})
|
61
59
|
Thread.handle_interrupt(Exception => :never) do
|
62
60
|
conn = checkout(options)
|
@@ -69,28 +67,15 @@ if Thread.respond_to?(:handle_interrupt)
|
|
69
67
|
end
|
70
68
|
end
|
71
69
|
end
|
72
|
-
|
73
|
-
else
|
74
|
-
|
75
|
-
# jruby 1.7.x
|
76
|
-
def with(options = {})
|
77
|
-
conn = checkout(options)
|
78
|
-
begin
|
79
|
-
yield conn
|
80
|
-
ensure
|
81
|
-
checkin
|
82
|
-
end
|
83
|
-
end
|
84
|
-
|
85
|
-
end
|
70
|
+
alias then with
|
86
71
|
|
87
72
|
def checkout(options = {})
|
88
73
|
if ::Thread.current[@key]
|
89
|
-
::Thread.current[@key_count]+= 1
|
74
|
+
::Thread.current[@key_count] += 1
|
90
75
|
::Thread.current[@key]
|
91
76
|
else
|
92
|
-
::Thread.current[@key_count]= 1
|
93
|
-
::Thread.current[@key]= @available.pop(options[:timeout] || @timeout)
|
77
|
+
::Thread.current[@key_count] = 1
|
78
|
+
::Thread.current[@key] = @available.pop(options[:timeout] || @timeout)
|
94
79
|
end
|
95
80
|
end
|
96
81
|
|
@@ -98,64 +83,44 @@ end
|
|
98
83
|
if ::Thread.current[@key]
|
99
84
|
if ::Thread.current[@key_count] == 1
|
100
85
|
@available.push(::Thread.current[@key])
|
101
|
-
::Thread.current[@key]= nil
|
86
|
+
::Thread.current[@key] = nil
|
87
|
+
::Thread.current[@key_count] = nil
|
102
88
|
else
|
103
|
-
::Thread.current[@key_count]-= 1
|
89
|
+
::Thread.current[@key_count] -= 1
|
104
90
|
end
|
105
91
|
else
|
106
|
-
raise Bundler::ConnectionPool::Error,
|
92
|
+
raise Bundler::ConnectionPool::Error, "no connections are checked out"
|
107
93
|
end
|
108
94
|
|
109
95
|
nil
|
110
96
|
end
|
111
97
|
|
98
|
+
##
|
99
|
+
# Shuts down the Bundler::ConnectionPool by passing each connection to +block+ and
|
100
|
+
# then removing it from the pool. Attempting to checkout a connection after
|
101
|
+
# shutdown will raise +Bundler::ConnectionPool::PoolShuttingDownError+.
|
102
|
+
|
112
103
|
def shutdown(&block)
|
113
104
|
@available.shutdown(&block)
|
114
105
|
end
|
115
106
|
|
116
|
-
|
117
|
-
|
118
|
-
|
107
|
+
##
|
108
|
+
# Reloads the Bundler::ConnectionPool by passing each connection to +block+ and then
|
109
|
+
# removing it the pool. Subsequent checkouts will create new connections as
|
110
|
+
# needed.
|
111
|
+
|
112
|
+
def reload(&block)
|
113
|
+
@available.shutdown(reload: true, &block)
|
119
114
|
end
|
120
115
|
|
116
|
+
# Size of this connection pool
|
117
|
+
attr_reader :size
|
118
|
+
|
121
119
|
# Number of pool entries available for checkout at this instant.
|
122
120
|
def available
|
123
121
|
@available.length
|
124
122
|
end
|
125
|
-
|
126
|
-
private
|
127
|
-
|
128
|
-
class Wrapper < ::BasicObject
|
129
|
-
METHODS = [:with, :pool_shutdown]
|
130
|
-
|
131
|
-
def initialize(options = {}, &block)
|
132
|
-
@pool = options.fetch(:pool) { ::Bundler::ConnectionPool.new(options, &block) }
|
133
|
-
end
|
134
|
-
|
135
|
-
def with(&block)
|
136
|
-
@pool.with(&block)
|
137
|
-
end
|
138
|
-
|
139
|
-
def pool_shutdown(&block)
|
140
|
-
@pool.shutdown(&block)
|
141
|
-
end
|
142
|
-
|
143
|
-
def pool_size
|
144
|
-
@pool.size
|
145
|
-
end
|
146
|
-
|
147
|
-
def pool_available
|
148
|
-
@pool.available
|
149
|
-
end
|
150
|
-
|
151
|
-
def respond_to?(id, *args)
|
152
|
-
METHODS.include?(id) || with { |c| c.respond_to?(id, *args) }
|
153
|
-
end
|
154
|
-
|
155
|
-
def method_missing(name, *args, &block)
|
156
|
-
with do |connection|
|
157
|
-
connection.send(name, *args, &block)
|
158
|
-
end
|
159
|
-
end
|
160
|
-
end
|
161
123
|
end
|
124
|
+
|
125
|
+
require_relative "connection_pool/timed_stack"
|
126
|
+
require_relative "connection_pool/wrapper"
|
@@ -0,0 +1,22 @@
|
|
1
|
+
Copyright (C) 1993-2013 Yukihiro Matsumoto. All rights reserved.
|
2
|
+
|
3
|
+
Redistribution and use in source and binary forms, with or without
|
4
|
+
modification, are permitted provided that the following conditions
|
5
|
+
are met:
|
6
|
+
1. Redistributions of source code must retain the above copyright
|
7
|
+
notice, this list of conditions and the following disclaimer.
|
8
|
+
2. Redistributions in binary form must reproduce the above copyright
|
9
|
+
notice, this list of conditions and the following disclaimer in the
|
10
|
+
documentation and/or other materials provided with the distribution.
|
11
|
+
|
12
|
+
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
13
|
+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
14
|
+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
15
|
+
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
16
|
+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
17
|
+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
18
|
+
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
19
|
+
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
20
|
+
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
21
|
+
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
22
|
+
SUCH DAMAGE.
|