bundler 1.6.0 → 1.6.1
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/.travis.yml +29 -26
- data/CHANGELOG.md +11 -1
- data/Rakefile +8 -3
- data/lib/bundler.rb +4 -3
- data/lib/bundler/fetcher.rb +2 -2
- data/lib/bundler/installer.rb +9 -8
- data/lib/bundler/rubygems_ext.rb +9 -0
- data/lib/bundler/rubygems_integration.rb +11 -0
- data/lib/bundler/source/git.rb +4 -0
- data/lib/bundler/source/path/installer.rb +8 -4
- data/lib/bundler/source/rubygems.rb +21 -7
- data/lib/bundler/version.rb +1 -1
- data/spec/install/gemfile/git_spec.rb +37 -0
- data/spec/install/gems/sudo_spec.rb +34 -8
- data/spec/quality_spec.rb +1 -1
- data/spec/spec_helper.rb +5 -1
- data/spec/support/rubygems_ext.rb +1 -1
- data/spec/support/sudo.rb +0 -4
- metadata +28 -29
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9badf28b802fec90f725b4ff52a5a222552ebe32
|
4
|
+
data.tar.gz: 274ae3d0b61cfc32012342791182d5af829e8895
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 09eefdb50afa1afcb9daa00bc1a5d149621ce58c82373176ec11ee5bc019516471c06acc2b32100c5be87b6c604777c91eb6b53cff299174de472d9de96df4e9
|
7
|
+
data.tar.gz: 2de981c2e0c4d42b127c65ca0c4ca03a4d97b699d8db9c87bb849a9d5e663991545f5b0f8f4a590afe18d301b4433773dd7bd639bafec73ca4ae6323ec4f51da
|
data/.travis.yml
CHANGED
@@ -4,6 +4,7 @@ before_script: travis_retry rake spec:travis:deps
|
|
4
4
|
branches:
|
5
5
|
only:
|
6
6
|
- master
|
7
|
+
- 1-6-stable
|
7
8
|
- 1-5-stable
|
8
9
|
- 1-3-stable
|
9
10
|
- 1-2-stable
|
@@ -22,7 +23,7 @@ notifications:
|
|
22
23
|
# Bundler Ops
|
23
24
|
secure: MNTSGIySYwHia5gIgRiZxXtPMPDIP9KmzQk7Kq2ZoVvP3mIk8W1TMkvcyFkEf6uCasyVZZixzUBfY+E0BlHAz1ycQpTh1jvSpuIpEVYW48ShJldJ+8W8xfzafyOHii3z7VrDaomEffmMDdmHRsbQAfekMjdR4bTpXtT9V+wOXlg=
|
24
25
|
rvm:
|
25
|
-
- 2.1.
|
26
|
+
- 2.1.1
|
26
27
|
- 2.0.0
|
27
28
|
- 1.9.3
|
28
29
|
- 1.8.7
|
@@ -32,34 +33,15 @@ env:
|
|
32
33
|
# We need to know if changes to rubygems will break bundler on release
|
33
34
|
- RGV=master
|
34
35
|
# Test the latest rubygems release with all of our supported rubies
|
35
|
-
- RGV=v2.2.
|
36
|
-
# Test the latest stable branch so we know the next minor will work
|
37
|
-
- RGV=2.2
|
36
|
+
- RGV=v2.2.2
|
38
37
|
matrix:
|
39
|
-
allow_failures:
|
40
|
-
# We want to know how we're doing with head, but not fail the build
|
41
|
-
- rvm: ruby-head
|
42
|
-
- env: RGV=master
|
43
|
-
# 1.9.2 is simply too slow. it sometimes exceeds the Travis hard limit.
|
44
|
-
- rvm: 1.9.2
|
45
|
-
# Alternate implementations are good data points but not maintained
|
46
|
-
- rvm: jruby
|
47
|
-
- rvm: rbx
|
48
38
|
include:
|
49
|
-
#
|
50
|
-
- rvm: ruby-head
|
51
|
-
env: RGV=master
|
52
|
-
# Alternate implementations
|
53
|
-
- rvm: jruby
|
54
|
-
env: RGV=v2.2.1
|
55
|
-
- rvm: rbx
|
56
|
-
env: RGV=v2.2.1
|
57
|
-
# Rubygems goes down to 2.0 on Ruby 2.0.0
|
39
|
+
# Ruby 2.0.0, Rubygems 2.0 and up
|
58
40
|
- rvm: 2.0.0
|
59
41
|
env: RGV=v2.1.11
|
60
42
|
- rvm: 2.0.0
|
61
43
|
env: RGV=v2.0.14
|
62
|
-
#
|
44
|
+
# Ruby 1.9.3, Rubygems 1.5.3 and up
|
63
45
|
- rvm: 1.9.3
|
64
46
|
env: RGV=v2.1.11
|
65
47
|
- rvm: 1.9.3
|
@@ -72,10 +54,11 @@ matrix:
|
|
72
54
|
env: RGV=v1.6.2
|
73
55
|
- rvm: 1.9.3
|
74
56
|
env: RGV=v1.5.3
|
75
|
-
#
|
76
|
-
- rvm: 1.
|
57
|
+
# Ruby 1.8.7, Rubygems 1.3.6 and up
|
58
|
+
- rvm: 1.8.7
|
77
59
|
env: RGV=v2.1.11
|
78
|
-
|
60
|
+
- rvm: 1.8.7
|
61
|
+
env: RGV=v2.0.14
|
79
62
|
- rvm: 1.8.7
|
80
63
|
env: RGV=v1.8.29
|
81
64
|
- rvm: 1.8.7
|
@@ -90,3 +73,23 @@ matrix:
|
|
90
73
|
env: RGV=v1.3.7
|
91
74
|
- rvm: 1.8.7
|
92
75
|
env: RGV=v1.3.6
|
76
|
+
|
77
|
+
# ALLOWED FAILURES
|
78
|
+
# Ruby 1.9.2 sanity check
|
79
|
+
# (but it's just too slow and sometimes goes over the Travis limit)
|
80
|
+
- rvm: 1.9.2
|
81
|
+
env: RGV=v2.2.2
|
82
|
+
# Ruby-head (we want to know how we're doing, but not fail the build)
|
83
|
+
- rvm: ruby-head
|
84
|
+
env: RGV=master
|
85
|
+
# JRuby, the latest (not maintained, but good to know)
|
86
|
+
- rvm: jruby
|
87
|
+
env: RGV=v2.2.2
|
88
|
+
# Rubinius, the latest (not maintained, but good to know)
|
89
|
+
- rvm: rbx
|
90
|
+
env: RGV=v2.2.2
|
91
|
+
allow_failures:
|
92
|
+
- rvm: ruby-head
|
93
|
+
- rvm: 1.9.2
|
94
|
+
- rvm: jruby
|
95
|
+
- rvm: rbx
|
data/CHANGELOG.md
CHANGED
data/Rakefile
CHANGED
@@ -46,6 +46,11 @@ namespace :spec do
|
|
46
46
|
sh "#{Gem.ruby} -S gem list -i '^#{name}$' -v '#{version}' || " \
|
47
47
|
"#{Gem.ruby} -S gem install #{name} -v '#{version}' --no-ri --no-rdoc"
|
48
48
|
end
|
49
|
+
|
50
|
+
# Download and install gems used inside tests
|
51
|
+
$LOAD_PATH.unshift("./spec")
|
52
|
+
require 'support/rubygems_ext'
|
53
|
+
Spec::Rubygems.setup
|
49
54
|
end
|
50
55
|
|
51
56
|
namespace :travis do
|
@@ -111,7 +116,7 @@ begin
|
|
111
116
|
rubyopt = ENV["RUBYOPT"]
|
112
117
|
# When editing this list, also edit .travis.yml!
|
113
118
|
branches = %w(master 2.2)
|
114
|
-
releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.
|
119
|
+
releases = %w(v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.2)
|
115
120
|
(branches + releases).each do |rg|
|
116
121
|
desc "Run specs with Rubygems #{rg}"
|
117
122
|
RSpec::Core::RakeTask.new(rg) do |t|
|
@@ -127,7 +132,7 @@ begin
|
|
127
132
|
|
128
133
|
task "clone_rubygems_#{rg}" do
|
129
134
|
unless File.directory?("tmp/rubygems")
|
130
|
-
system("git clone
|
135
|
+
system("git clone https://github.com/rubygems/rubygems.git tmp/rubygems")
|
131
136
|
end
|
132
137
|
hash = nil
|
133
138
|
|
@@ -136,7 +141,7 @@ begin
|
|
136
141
|
if rg == "master"
|
137
142
|
system("git checkout origin/master")
|
138
143
|
else
|
139
|
-
system("git checkout #{rg}")
|
144
|
+
system("git checkout #{rg}") || raise("Unknown Rubygems ref #{rg}")
|
140
145
|
end
|
141
146
|
hash = `git rev-parse HEAD`.chomp
|
142
147
|
end
|
data/lib/bundler.rb
CHANGED
@@ -165,7 +165,7 @@ module Bundler
|
|
165
165
|
end
|
166
166
|
|
167
167
|
def ruby_scope
|
168
|
-
"#{Bundler.rubygems.ruby_engine}/#{
|
168
|
+
"#{Bundler.rubygems.ruby_engine}/#{Bundler.rubygems.config_map[:ruby_version]}"
|
169
169
|
end
|
170
170
|
|
171
171
|
def user_bundle_path
|
@@ -203,8 +203,9 @@ module Bundler
|
|
203
203
|
path.join("vendor/cache")
|
204
204
|
end
|
205
205
|
|
206
|
-
def tmp
|
207
|
-
|
206
|
+
def tmp(name = Process.pid.to_s)
|
207
|
+
@tmp ||= Pathname.new Dir.mktmpdir("bundler")
|
208
|
+
@tmp.join(name)
|
208
209
|
end
|
209
210
|
|
210
211
|
def settings
|
data/lib/bundler/fetcher.rb
CHANGED
@@ -54,7 +54,7 @@ module Bundler
|
|
54
54
|
def download_gem_from_uri(spec, uri)
|
55
55
|
spec.fetch_platform
|
56
56
|
|
57
|
-
download_path = Bundler.requires_sudo? ? Bundler.tmp : Bundler.rubygems.gem_dir
|
57
|
+
download_path = Bundler.requires_sudo? ? Bundler.tmp(spec.full_name) : Bundler.rubygems.gem_dir
|
58
58
|
gem_path = "#{Bundler.rubygems.gem_dir}/cache/#{spec.full_name}.gem"
|
59
59
|
|
60
60
|
FileUtils.mkdir_p("#{download_path}/cache")
|
@@ -62,7 +62,7 @@ module Bundler
|
|
62
62
|
|
63
63
|
if Bundler.requires_sudo?
|
64
64
|
Bundler.mkdir_p "#{Bundler.rubygems.gem_dir}/cache"
|
65
|
-
Bundler.sudo "mv #{Bundler.tmp}/cache/#{spec.full_name}.gem #{gem_path}"
|
65
|
+
Bundler.sudo "mv #{Bundler.tmp(spec.full_name)}/cache/#{spec.full_name}.gem #{gem_path}"
|
66
66
|
end
|
67
67
|
|
68
68
|
gem_path
|
data/lib/bundler/installer.rb
CHANGED
@@ -48,13 +48,7 @@ module Bundler
|
|
48
48
|
#
|
49
49
|
# Finally: TODO add documentation for how the standalone process works.
|
50
50
|
def run(options)
|
51
|
-
|
52
|
-
begin
|
53
|
-
Bundler.bundle_path.mkpath unless Bundler.bundle_path.exist?
|
54
|
-
rescue Errno::EEXIST
|
55
|
-
raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " +
|
56
|
-
"because of an invalid symlink. Remove the symlink so the directory can be created."
|
57
|
-
end
|
51
|
+
create_bundle_path
|
58
52
|
|
59
53
|
if Bundler.settings[:frozen]
|
60
54
|
@definition.ensure_equivalent_gemfile_and_lockfile(options[:deployment])
|
@@ -124,7 +118,6 @@ module Bundler
|
|
124
118
|
generate_bundler_executable_stubs(spec, :force => true)
|
125
119
|
end
|
126
120
|
|
127
|
-
FileUtils.rm_rf(Bundler.tmp)
|
128
121
|
post_install_message
|
129
122
|
rescue Exception => e
|
130
123
|
# if install hook failed or gem signature is bad, just die
|
@@ -326,5 +319,13 @@ module Bundler
|
|
326
319
|
remains[dep.name]
|
327
320
|
end
|
328
321
|
end
|
322
|
+
|
323
|
+
def create_bundle_path
|
324
|
+
Bundler.mkdir_p(Bundler.bundle_path.to_s) unless Bundler.bundle_path.exist?
|
325
|
+
rescue Errno::EEXIST
|
326
|
+
raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " +
|
327
|
+
"because of an invalid symlink. Remove the symlink so the directory can be created."
|
328
|
+
end
|
329
|
+
|
329
330
|
end
|
330
331
|
end
|
data/lib/bundler/rubygems_ext.rb
CHANGED
@@ -45,6 +45,15 @@ module Gem
|
|
45
45
|
end
|
46
46
|
end
|
47
47
|
|
48
|
+
if method_defined?(:extension_dir)
|
49
|
+
alias_method :rg_extension_dir, :extension_dir
|
50
|
+
def extension_dir
|
51
|
+
@extension_dir ||= source.respond_to?(:extension_dir_name) ?
|
52
|
+
File.expand_path(File.join(extensions_dir, source.extension_dir_name)) :
|
53
|
+
rg_extension_dir
|
54
|
+
end
|
55
|
+
end
|
56
|
+
|
48
57
|
# RubyGems 1.8+ used only.
|
49
58
|
remove_method :gem_dir if instance_methods(false).include?(:gem_dir)
|
50
59
|
def gem_dir
|
@@ -105,6 +105,14 @@ module Bundler
|
|
105
105
|
Gem::MARSHAL_SPEC_DIR
|
106
106
|
end
|
107
107
|
|
108
|
+
def config_map
|
109
|
+
Gem::ConfigMap
|
110
|
+
end
|
111
|
+
|
112
|
+
def repository_subdirectories
|
113
|
+
%w[cache doc gems specifications]
|
114
|
+
end
|
115
|
+
|
108
116
|
def clear_paths
|
109
117
|
Gem.clear_paths
|
110
118
|
end
|
@@ -533,6 +541,9 @@ module Bundler
|
|
533
541
|
Gem::Package.build(spec, skip_validation)
|
534
542
|
end
|
535
543
|
|
544
|
+
def repository_subdirectories
|
545
|
+
Gem::REPOSITORY_SUBDIRECTORIES
|
546
|
+
end
|
536
547
|
end
|
537
548
|
|
538
549
|
end
|
data/lib/bundler/source/git.rb
CHANGED
@@ -5,7 +5,9 @@ module Bundler
|
|
5
5
|
class Installer < Bundler::GemInstaller
|
6
6
|
def initialize(spec, options = {})
|
7
7
|
@spec = spec
|
8
|
-
@
|
8
|
+
@tmp_bin_dir = "#{Bundler.tmp(spec.full_name)}/bin"
|
9
|
+
@gem_bin_dir = "#{Bundler.rubygems.gem_dir}/bin"
|
10
|
+
@bin_dir = Bundler.requires_sudo? ? @tmp_bin_dir : @gem_bin_dir
|
9
11
|
@gem_dir = Bundler.rubygems.path(spec.full_gem_path)
|
10
12
|
@wrappers = options[:wrappers] || true
|
11
13
|
@env_shebang = options[:env_shebang] || true
|
@@ -17,13 +19,15 @@ module Bundler
|
|
17
19
|
return if spec.executables.nil? || spec.executables.empty?
|
18
20
|
|
19
21
|
if Bundler.requires_sudo?
|
20
|
-
FileUtils.mkdir_p(
|
22
|
+
FileUtils.mkdir_p(@tmp_bin_dir) unless File.exist?(@tmp_bin_dir)
|
21
23
|
end
|
24
|
+
|
22
25
|
super
|
26
|
+
|
23
27
|
if Bundler.requires_sudo?
|
24
|
-
Bundler.mkdir_p
|
28
|
+
Bundler.mkdir_p @gem_bin_dir
|
25
29
|
spec.executables.each do |exe|
|
26
|
-
Bundler.sudo "cp -R #{
|
30
|
+
Bundler.sudo "cp -R #{@tmp_bin_dir}/#{exe} #{@gem_bin_dir}"
|
27
31
|
end
|
28
32
|
end
|
29
33
|
end
|
@@ -79,7 +79,7 @@ module Bundler
|
|
79
79
|
|
80
80
|
path = cached_gem(spec)
|
81
81
|
if Bundler.requires_sudo?
|
82
|
-
install_path = Bundler.tmp
|
82
|
+
install_path = Bundler.tmp(spec.full_name)
|
83
83
|
bin_path = install_path.join("bin")
|
84
84
|
else
|
85
85
|
install_path = Bundler.rubygems.gem_dir
|
@@ -99,18 +99,32 @@ module Bundler
|
|
99
99
|
|
100
100
|
# SUDO HAX
|
101
101
|
if Bundler.requires_sudo?
|
102
|
-
Bundler.
|
103
|
-
|
104
|
-
|
105
|
-
|
102
|
+
Bundler.rubygems.repository_subdirectories.each do |name|
|
103
|
+
src = File.join(install_path, name, "*")
|
104
|
+
dst = File.join(Bundler.rubygems.gem_dir, name)
|
105
|
+
if name == "extensions" && Dir.glob(src).any?
|
106
|
+
src = File.join(src, "*/*")
|
107
|
+
ext_src = Dir.glob(src).first
|
108
|
+
ext_src.gsub!(src[0..-6], '')
|
109
|
+
dst = File.dirname(File.join(dst, ext_src))
|
110
|
+
end
|
111
|
+
Bundler.mkdir_p dst
|
112
|
+
Bundler.sudo "cp -R #{src} #{dst}" if Dir[src].any?
|
113
|
+
end
|
114
|
+
|
106
115
|
spec.executables.each do |exe|
|
107
116
|
Bundler.mkdir_p Bundler.system_bindir
|
108
|
-
Bundler.sudo "cp -R #{
|
117
|
+
Bundler.sudo "cp -R #{install_path}/bin/#{exe} #{Bundler.system_bindir}/"
|
109
118
|
end
|
110
119
|
end
|
111
|
-
|
120
|
+
|
112
121
|
spec.loaded_from = "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
|
122
|
+
installed_spec.loaded_from = spec.loaded_from
|
113
123
|
["Installing #{version_message(spec)}", spec.post_install_message]
|
124
|
+
ensure
|
125
|
+
if install_path && Bundler.requires_sudo?
|
126
|
+
FileUtils.remove_entry_secure(install_path)
|
127
|
+
end
|
114
128
|
end
|
115
129
|
|
116
130
|
def cache(spec, custom_path = nil)
|
data/lib/bundler/version.rb
CHANGED
@@ -2,5 +2,5 @@ module Bundler
|
|
2
2
|
# We're doing this because we might write tests that deal
|
3
3
|
# with other versions of bundler and we are unsure how to
|
4
4
|
# handle this better.
|
5
|
-
VERSION = "1.6.
|
5
|
+
VERSION = "1.6.1" unless defined?(::Bundler::VERSION)
|
6
6
|
end
|
@@ -854,6 +854,43 @@ describe "bundle install with git sources" do
|
|
854
854
|
expect(out).to eq("YES")
|
855
855
|
end
|
856
856
|
|
857
|
+
it "does not use old extension after ref changes" do
|
858
|
+
git_reader = build_git "foo", :no_default => true do |s|
|
859
|
+
s.extensions = ["ext/extconf.rb"]
|
860
|
+
s.write "ext/extconf.rb", <<-RUBY
|
861
|
+
require "mkmf"
|
862
|
+
create_makefile("foo")
|
863
|
+
RUBY
|
864
|
+
s.write "ext/foo.c", "void Init_foo() {}"
|
865
|
+
end
|
866
|
+
|
867
|
+
2.times do |i|
|
868
|
+
Dir.chdir(git_reader.path) do
|
869
|
+
File.open("ext/foo.c", "w") do |file|
|
870
|
+
file.write <<-C
|
871
|
+
#include "ruby.h"
|
872
|
+
VALUE foo() { return INT2FIX(#{i}); }
|
873
|
+
void Init_foo() { rb_define_global_function("foo", &foo, 0); }
|
874
|
+
C
|
875
|
+
end
|
876
|
+
`git commit -m 'commit for iteration #{i}' ext/foo.c`
|
877
|
+
end
|
878
|
+
git_sha = git_reader.ref_for("HEAD")
|
879
|
+
|
880
|
+
install_gemfile <<-G
|
881
|
+
source "file://#{gem_repo1}"
|
882
|
+
gem "foo", :git => "#{lib_path('foo-1.0')}", :ref => "#{git_sha}"
|
883
|
+
G
|
884
|
+
|
885
|
+
run <<-R
|
886
|
+
require 'foo'
|
887
|
+
puts foo
|
888
|
+
R
|
889
|
+
|
890
|
+
expect(out).to eq(i.to_s)
|
891
|
+
end
|
892
|
+
end
|
893
|
+
|
857
894
|
it "does not prompt to gem install if extension fails" do
|
858
895
|
build_git "foo" do |s|
|
859
896
|
s.add_dependency "rake"
|
@@ -40,13 +40,13 @@ describe "when using sudo", :sudo => true do
|
|
40
40
|
end
|
41
41
|
|
42
42
|
it "installs rake and a gem dependent on rake in the same session" do
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
43
|
+
gemfile <<-G
|
44
|
+
source "file://#{gem_repo1}"
|
45
|
+
gem "rake"
|
46
|
+
gem "another_implicit_rake_dep"
|
47
|
+
G
|
48
|
+
bundle "install"
|
49
|
+
expect(system_gem_path("gems/another_implicit_rake_dep-1.0")).to exist
|
50
50
|
end
|
51
51
|
|
52
52
|
|
@@ -66,7 +66,33 @@ describe "when using sudo", :sudo => true do
|
|
66
66
|
should_be_installed "rack 1.0"
|
67
67
|
end
|
68
68
|
|
69
|
-
it "installs when BUNDLE_PATH does not exist"
|
69
|
+
it "installs when BUNDLE_PATH does not exist" do
|
70
|
+
root_path = tmp("owned_by_root")
|
71
|
+
FileUtils.mkdir_p root_path
|
72
|
+
sudo "chown -R root #{root_path}"
|
73
|
+
bundle_path = root_path.join("does_not_exist")
|
74
|
+
|
75
|
+
ENV['BUNDLE_PATH'] = bundle_path.to_s
|
76
|
+
install_gemfile <<-G
|
77
|
+
source "file://#{gem_repo1}"
|
78
|
+
gem "rack", '1.0'
|
79
|
+
G
|
80
|
+
|
81
|
+
expect(bundle_path.join("gems/rack-1.0.0")).to exist
|
82
|
+
expect(bundle_path.join("gems/rack-1.0.0").stat.uid).to eq(0)
|
83
|
+
should_be_installed "rack 1.0"
|
84
|
+
end
|
85
|
+
|
86
|
+
it "installs extensions/ compiled by Rubygems 2.2", :rubygems => "2.2" do
|
87
|
+
install_gemfile <<-G
|
88
|
+
source "file://#{gem_repo1}"
|
89
|
+
gem "very_simple_binary"
|
90
|
+
G
|
91
|
+
|
92
|
+
expect(system_gem_path("gems/very_simple_binary-1.0")).to exist
|
93
|
+
binary_glob = system_gem_path("extensions/*/*/very_simple_binary-1.0")
|
94
|
+
expect(Dir.glob(binary_glob).first).to be
|
95
|
+
end
|
70
96
|
end
|
71
97
|
|
72
98
|
describe "and BUNDLE_PATH is not writable" do
|
data/spec/quality_spec.rb
CHANGED
data/spec/spec_helper.rb
CHANGED
@@ -45,7 +45,7 @@ RSpec.configure do |config|
|
|
45
45
|
config.include Spec::Sudo
|
46
46
|
config.include Spec::Permissions
|
47
47
|
|
48
|
-
if Spec::Sudo.
|
48
|
+
if ENV['BUNDLER_SUDO_TESTS'] && Spec::Sudo.present?
|
49
49
|
config.filter_run :sudo => true
|
50
50
|
else
|
51
51
|
config.filter_run_excluding :sudo => true
|
@@ -63,6 +63,10 @@ RSpec.configure do |config|
|
|
63
63
|
config.filter_run_excluding :ruby => "1.9"
|
64
64
|
end
|
65
65
|
|
66
|
+
if Gem::VERSION < "2.2"
|
67
|
+
config.filter_run_excluding :rubygems => "2.2"
|
68
|
+
end
|
69
|
+
|
66
70
|
config.filter_run :focused => true unless ENV['CI']
|
67
71
|
config.run_all_when_everything_filtered = true
|
68
72
|
config.alias_example_to :fit, :focused => true
|
@@ -1,4 +1,5 @@
|
|
1
1
|
require 'rubygems/user_interaction'
|
2
|
+
require 'support/path'
|
2
3
|
|
3
4
|
module Spec
|
4
5
|
module Rubygems
|
@@ -19,7 +20,6 @@ module Spec
|
|
19
20
|
# 3.0.0 breaks 1.9.2 specs
|
20
21
|
`gem install builder --version 2.1.2 --no-rdoc --no-ri`
|
21
22
|
`gem install rack --no-rdoc --no-ri`
|
22
|
-
`gem install pry --no-rdoc --no-ri`
|
23
23
|
end
|
24
24
|
|
25
25
|
ENV['HOME'] = Path.home.to_s
|
data/spec/support/sudo.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bundler
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- André Arko
|
@@ -11,34 +11,34 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2014-
|
14
|
+
date: 2014-04-02 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: ronn
|
18
18
|
requirement: !ruby/object:Gem::Requirement
|
19
19
|
requirements:
|
20
|
-
- - ~>
|
20
|
+
- - "~>"
|
21
21
|
- !ruby/object:Gem::Version
|
22
22
|
version: 0.7.3
|
23
23
|
type: :development
|
24
24
|
prerelease: false
|
25
25
|
version_requirements: !ruby/object:Gem::Requirement
|
26
26
|
requirements:
|
27
|
-
- - ~>
|
27
|
+
- - "~>"
|
28
28
|
- !ruby/object:Gem::Version
|
29
29
|
version: 0.7.3
|
30
30
|
- !ruby/object:Gem::Dependency
|
31
31
|
name: rspec
|
32
32
|
requirement: !ruby/object:Gem::Requirement
|
33
33
|
requirements:
|
34
|
-
- - ~>
|
34
|
+
- - "~>"
|
35
35
|
- !ruby/object:Gem::Version
|
36
36
|
version: 2.99.0.beta1
|
37
37
|
type: :development
|
38
38
|
prerelease: false
|
39
39
|
version_requirements: !ruby/object:Gem::Requirement
|
40
40
|
requirements:
|
41
|
-
- - ~>
|
41
|
+
- - "~>"
|
42
42
|
- !ruby/object:Gem::Version
|
43
43
|
version: 2.99.0.beta1
|
44
44
|
description: Bundler manages an application's dependencies through its entire life,
|
@@ -51,9 +51,9 @@ executables:
|
|
51
51
|
extensions: []
|
52
52
|
extra_rdoc_files: []
|
53
53
|
files:
|
54
|
-
- .gitignore
|
55
|
-
- .rspec
|
56
|
-
- .travis.yml
|
54
|
+
- ".gitignore"
|
55
|
+
- ".rspec"
|
56
|
+
- ".travis.yml"
|
57
57
|
- CHANGELOG.md
|
58
58
|
- CONTRIBUTING.md
|
59
59
|
- DEVELOPMENT.md
|
@@ -112,6 +112,22 @@ files:
|
|
112
112
|
- lib/bundler/installer.rb
|
113
113
|
- lib/bundler/lazy_specification.rb
|
114
114
|
- lib/bundler/lockfile_parser.rb
|
115
|
+
- lib/bundler/man/bundle
|
116
|
+
- lib/bundler/man/bundle-config
|
117
|
+
- lib/bundler/man/bundle-config.txt
|
118
|
+
- lib/bundler/man/bundle-exec
|
119
|
+
- lib/bundler/man/bundle-exec.txt
|
120
|
+
- lib/bundler/man/bundle-install
|
121
|
+
- lib/bundler/man/bundle-install.txt
|
122
|
+
- lib/bundler/man/bundle-package
|
123
|
+
- lib/bundler/man/bundle-package.txt
|
124
|
+
- lib/bundler/man/bundle-platform
|
125
|
+
- lib/bundler/man/bundle-platform.txt
|
126
|
+
- lib/bundler/man/bundle-update
|
127
|
+
- lib/bundler/man/bundle-update.txt
|
128
|
+
- lib/bundler/man/bundle.txt
|
129
|
+
- lib/bundler/man/gemfile.5
|
130
|
+
- lib/bundler/man/gemfile.5.txt
|
115
131
|
- lib/bundler/match_platform.rb
|
116
132
|
- lib/bundler/parallel_workers.rb
|
117
133
|
- lib/bundler/parallel_workers/thread_worker.rb
|
@@ -323,22 +339,6 @@ files:
|
|
323
339
|
- spec/update/gems_spec.rb
|
324
340
|
- spec/update/git_spec.rb
|
325
341
|
- spec/update/source_spec.rb
|
326
|
-
- lib/bundler/man/bundle
|
327
|
-
- lib/bundler/man/bundle-config
|
328
|
-
- lib/bundler/man/bundle-config.txt
|
329
|
-
- lib/bundler/man/bundle-exec
|
330
|
-
- lib/bundler/man/bundle-exec.txt
|
331
|
-
- lib/bundler/man/bundle-install
|
332
|
-
- lib/bundler/man/bundle-install.txt
|
333
|
-
- lib/bundler/man/bundle-package
|
334
|
-
- lib/bundler/man/bundle-package.txt
|
335
|
-
- lib/bundler/man/bundle-platform
|
336
|
-
- lib/bundler/man/bundle-platform.txt
|
337
|
-
- lib/bundler/man/bundle-update
|
338
|
-
- lib/bundler/man/bundle-update.txt
|
339
|
-
- lib/bundler/man/bundle.txt
|
340
|
-
- lib/bundler/man/gemfile.5
|
341
|
-
- lib/bundler/man/gemfile.5.txt
|
342
342
|
homepage: http://bundler.io
|
343
343
|
licenses:
|
344
344
|
- MIT
|
@@ -349,17 +349,17 @@ require_paths:
|
|
349
349
|
- lib
|
350
350
|
required_ruby_version: !ruby/object:Gem::Requirement
|
351
351
|
requirements:
|
352
|
-
- -
|
352
|
+
- - ">="
|
353
353
|
- !ruby/object:Gem::Version
|
354
354
|
version: 1.8.7
|
355
355
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
356
356
|
requirements:
|
357
|
-
- -
|
357
|
+
- - ">="
|
358
358
|
- !ruby/object:Gem::Version
|
359
359
|
version: 1.3.6
|
360
360
|
requirements: []
|
361
361
|
rubyforge_project:
|
362
|
-
rubygems_version: 2.
|
362
|
+
rubygems_version: 2.2.2
|
363
363
|
signing_key:
|
364
364
|
specification_version: 4
|
365
365
|
summary: The best way to manage your application's dependencies
|
@@ -470,4 +470,3 @@ test_files:
|
|
470
470
|
- spec/update/gems_spec.rb
|
471
471
|
- spec/update/git_spec.rb
|
472
472
|
- spec/update/source_spec.rb
|
473
|
-
has_rdoc:
|