bundler 1.10.2 → 1.10.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- YjNkYWY4MzNjOGQxZjE5ODZmZjk4ODcyNDAxNGZkMDMzZTI3ODEzYg==
5
- data.tar.gz: !binary |-
6
- OTA4YjBmMTFhZjM0ZDhmMjY0NGY1M2I5Mjc0MTY3MzIxNTZiYjc2ZA==
2
+ SHA1:
3
+ metadata.gz: d16968eae1c5a56edc60ec57ec834ffdfb9af52e
4
+ data.tar.gz: 2d179b57f5b43cd083a0660b85b84a2eccd322b0
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- NDhkZmM0MTA0NDZlMjg4YTViY2Q4MTUxOTIxOTJhMWJmYmVmYjNiMmJmNDNl
10
- OTEyNzk2YzUwM2ViN2JhNTU5N2FhZDBmYmM1ZjQxMDI1N2YxODdiODA4N2Uy
11
- NmI5MDczN2FkMjM5ZjBlMzgxZDVhOWE2M2E1Y2YwMTNhZTU5YWQ=
12
- data.tar.gz: !binary |-
13
- ZjcwNTM2MWQwNzIwMGEzYmM2MTI5MWU0MmI1ZjVkZjAwN2VjYzYwMGJiNDU4
14
- MjdkYTUyMWY4MGIzOTYxYTk2OGM0ZTBlZTcyOWJiYzQ4YzU1YTEzNzM2NTRm
15
- MDE2ZGExMDY0MWY1ZWYxYmMxNWM3MGI2NTYxNzkxOTgzNDliMTY=
6
+ metadata.gz: 8c648e2a488da6ad4a30adf96d0f07834c20a5a4e971e3182c220fff3ae780236a43a5a0ef382e73680a56725e20fda88a964eb5772e788e578481246395cbf0
7
+ data.tar.gz: 5ece721abfc3d426cf737e57d480a32b6ecd4a6fe052eb6f8142078d2612b578c4ba8908a5fab3065d1954086f9544f8a882c45bbd85b2ab33ec9b18e6a78839
@@ -1,3 +1,12 @@
1
+ ## 1.10.3 (2015-06-03)
2
+
3
+ Bugfixes:
4
+
5
+ - allow missing gemspec files when validating path and git gems (#3686, #3698, @segiddins)
6
+ - fix regression in `rake install` (#3701, #3705, @segiddins)
7
+ - fix regression when calling `gem` with `bundle exec` or `-rbundler/setup` (#3699, @segiddins)
8
+ - fix `bundler/inline` requiring a newly-installed gem (#3693, @indirect, @segiddins)
9
+
1
10
  ## 1.10.2 (2015-05-29)
2
11
 
3
12
  Bugfixes:
@@ -40,6 +40,7 @@ module Bundler
40
40
  autoload :Settings, 'bundler/settings'
41
41
  autoload :SharedHelpers, 'bundler/shared_helpers'
42
42
  autoload :SpecSet, 'bundler/spec_set'
43
+ autoload :StubSpecification, 'bundler/stub_specification'
43
44
  autoload :Source, 'bundler/source'
44
45
  autoload :SourceList, 'bundler/source_list'
45
46
  autoload :Specification, 'bundler/shared_helpers'
@@ -96,7 +97,7 @@ module Bundler
96
97
  end
97
98
 
98
99
  def ui=(ui)
99
- Bundler.rubygems.ui = UI::RGProxy.new(ui)
100
+ Bundler.rubygems.ui = ui ? UI::RGProxy.new(ui) : nil
100
101
  @ui = ui
101
102
  end
102
103
 
@@ -15,27 +15,33 @@ module Bundler
15
15
  end
16
16
 
17
17
  def run
18
+ ui = Bundler.ui
18
19
  raise ArgumentError if cmd.nil?
19
20
 
20
21
  # First, try to exec directly to something in PATH
21
22
  SharedHelpers.set_bundle_environment
22
23
  bin_path = Bundler.which(@cmd)
23
24
  if bin_path
25
+ Bundler.ui = nil
24
26
  Kernel.exec(bin_path, *args)
25
27
  end
26
28
 
27
29
  # If that didn't work, set up the whole bundle
28
30
  Bundler.definition.validate_ruby!
29
31
  Bundler.load.setup_environment
32
+ Bundler.ui = nil
30
33
  Kernel.exec(@cmd, *args)
31
34
  rescue Errno::EACCES
35
+ Bundler.ui = ui
32
36
  Bundler.ui.error "bundler: not executable: #{cmd}"
33
37
  exit 126
34
38
  rescue Errno::ENOENT
39
+ Bundler.ui = ui
35
40
  Bundler.ui.error "bundler: command not found: #{cmd}"
36
41
  Bundler.ui.warn "Install missing gem executables with `bundle install`"
37
42
  exit 127
38
43
  rescue ArgumentError
44
+ Bundler.ui = ui
39
45
  Bundler.ui.error "bundler: exec needs a command to run"
40
46
  exit 128
41
47
  end
@@ -422,8 +422,8 @@ module Bundler
422
422
  #
423
423
  # @return [String] the message of the exception.
424
424
  #
425
- def message
426
- @message ||= begin
425
+ def to_s
426
+ @to_s ||= begin
427
427
  trace_line, description = parse_line_number_from_description
428
428
 
429
429
  m = "\n[!] "
@@ -29,6 +29,16 @@ module Bundler
29
29
  end
30
30
  end
31
31
 
32
+ # needed for inline
33
+ def load_paths
34
+ # remote specs aren't installed, and can't have load_paths
35
+ if _local_specification
36
+ _local_specification.load_paths
37
+ else
38
+ super
39
+ end
40
+ end
41
+
32
42
  # needed for binstubs
33
43
  def executables
34
44
  if @remote_specification
@@ -61,14 +71,19 @@ module Bundler
61
71
  end
62
72
 
63
73
  def _local_specification
64
- eval(File.read(local_specification_path)) if @loaded_from && File.exist?(local_specification_path)
74
+ if @loaded_from && File.exist?(local_specification_path)
75
+ eval(File.read(local_specification_path)).tap do |spec|
76
+ spec.loaded_from = @loaded_from
77
+ end
78
+ end
65
79
  end
66
80
 
67
81
  def __swap__(spec)
68
82
  @remote_specification = spec
69
83
  end
70
84
 
71
- private
85
+ private
86
+
72
87
  def local_specification_path
73
88
  "#{base_dir}/specifications/#{full_name}.gemspec"
74
89
  end
@@ -51,7 +51,6 @@ def gemfile(install = false, &gemfile)
51
51
  end
52
52
 
53
53
  runtime = Bundler::Runtime.new(nil, definition)
54
- runtime.setup_environment
55
54
  runtime.setup.require
56
55
 
57
56
  bundler_module = class << Bundler; self; end
@@ -54,24 +54,4 @@ module Bundler
54
54
  end
55
55
  end
56
56
  end
57
-
58
- class StubSpecification < RemoteSpecification
59
- def self.from_stub(stub)
60
- spec = new(stub.name, stub.version, stub.platform, nil)
61
- spec.stub = stub
62
- spec
63
- end
64
-
65
- attr_accessor :stub
66
-
67
- def to_yaml
68
- _remote_specification.to_yaml
69
- end
70
-
71
- private
72
-
73
- def _remote_specification
74
- stub.to_spec
75
- end
76
- end
77
57
  end
@@ -49,6 +49,8 @@ module Bundler
49
49
 
50
50
  def validate(spec)
51
51
  Bundler.ui.silence { spec.validate(false) }
52
+ rescue Errno::ENOENT
53
+ nil
52
54
  end
53
55
 
54
56
  def path(obj)
@@ -462,10 +464,9 @@ module Bundler
462
464
  end
463
465
 
464
466
  def validate(spec)
465
- # Missing summary is downgraded to a warning in later versions,
466
- # so we set it to an empty string to prevent an exception here.
467
- spec.summary ||= ""
468
- Bundler.ui.silence { spec.validate }
467
+ # These versions of RubyGems always validate in "packaging" mode,
468
+ # which is too strict for the kinds of checks we care about. As a
469
+ # result, validation is disabled on versions of RubyGems below 1.7.
469
470
  end
470
471
  end
471
472
 
@@ -488,6 +489,8 @@ module Bundler
488
489
  # so we set it to an empty string to prevent an exception here.
489
490
  spec.summary ||= ""
490
491
  Bundler.ui.silence { spec.validate(false) }
492
+ rescue Errno::ENOENT
493
+ nil
491
494
  end
492
495
  end
493
496
 
@@ -21,4 +21,6 @@ if Bundler::SharedHelpers.in_bundle?
21
21
  # Add bundler to the load path after disabling system gems
22
22
  bundler_lib = File.expand_path("../..", __FILE__)
23
23
  $LOAD_PATH.unshift(bundler_lib) unless $LOAD_PATH.include?(bundler_lib)
24
+
25
+ Bundler.ui = nil
24
26
  end
@@ -0,0 +1,23 @@
1
+ require 'bundler/remote_specification'
2
+
3
+ module Bundler
4
+ class StubSpecification < RemoteSpecification
5
+ def self.from_stub(stub)
6
+ spec = new(stub.name, stub.version, stub.platform, nil)
7
+ spec.stub = stub
8
+ spec
9
+ end
10
+
11
+ attr_accessor :stub
12
+
13
+ def to_yaml
14
+ _remote_specification.to_yaml
15
+ end
16
+
17
+ private
18
+
19
+ def _remote_specification
20
+ stub.to_spec
21
+ end
22
+ end
23
+ end
@@ -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.10.2" unless defined?(::Bundler::VERSION)
5
+ VERSION = "1.10.3" unless defined?(::Bundler::VERSION)
6
6
  end
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.10.2
4
+ version: 1.10.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - André Arko
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-05-30 00:00:00.000000000 Z
14
+ date: 2015-06-04 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: mustache
@@ -31,56 +31,56 @@ dependencies:
31
31
  name: rake
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  requirements:
34
- - - ~>
34
+ - - "~>"
35
35
  - !ruby/object:Gem::Version
36
36
  version: '10.0'
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: '10.0'
44
44
  - !ruby/object:Gem::Dependency
45
45
  name: rdiscount
46
46
  requirement: !ruby/object:Gem::Requirement
47
47
  requirements:
48
- - - ~>
48
+ - - "~>"
49
49
  - !ruby/object:Gem::Version
50
50
  version: '1.6'
51
51
  type: :development
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
- - - ~>
55
+ - - "~>"
56
56
  - !ruby/object:Gem::Version
57
57
  version: '1.6'
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: ronn
60
60
  requirement: !ruby/object:Gem::Requirement
61
61
  requirements:
62
- - - ~>
62
+ - - "~>"
63
63
  - !ruby/object:Gem::Version
64
64
  version: 0.7.3
65
65
  type: :development
66
66
  prerelease: false
67
67
  version_requirements: !ruby/object:Gem::Requirement
68
68
  requirements:
69
- - - ~>
69
+ - - "~>"
70
70
  - !ruby/object:Gem::Version
71
71
  version: 0.7.3
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: rspec
74
74
  requirement: !ruby/object:Gem::Requirement
75
75
  requirements:
76
- - - ~>
76
+ - - "~>"
77
77
  - !ruby/object:Gem::Version
78
78
  version: '3.0'
79
79
  type: :development
80
80
  prerelease: false
81
81
  version_requirements: !ruby/object:Gem::Requirement
82
82
  requirements:
83
- - - ~>
83
+ - - "~>"
84
84
  - !ruby/object:Gem::Version
85
85
  version: '3.0'
86
86
  description: Bundler manages an application's dependencies through its entire life,
@@ -93,9 +93,9 @@ executables:
93
93
  extensions: []
94
94
  extra_rdoc_files: []
95
95
  files:
96
- - .gitignore
97
- - .rspec
98
- - .travis.yml
96
+ - ".gitignore"
97
+ - ".rspec"
98
+ - ".travis.yml"
99
99
  - CHANGELOG.md
100
100
  - CODE_OF_CONDUCT.md
101
101
  - CONTRIBUTING.md
@@ -208,6 +208,7 @@ files:
208
208
  - lib/bundler/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
209
209
  - lib/bundler/ssl_certs/GeoTrustGlobalCA.pem
210
210
  - lib/bundler/ssl_certs/certificate_manager.rb
211
+ - lib/bundler/stub_specification.rb
211
212
  - lib/bundler/templates/Executable
212
213
  - lib/bundler/templates/Executable.standalone
213
214
  - lib/bundler/templates/Gemfile
@@ -305,12 +306,12 @@ require_paths:
305
306
  - lib
306
307
  required_ruby_version: !ruby/object:Gem::Requirement
307
308
  requirements:
308
- - - ! '>='
309
+ - - ">="
309
310
  - !ruby/object:Gem::Version
310
311
  version: 1.8.7
311
312
  required_rubygems_version: !ruby/object:Gem::Requirement
312
313
  requirements:
313
- - - ! '>='
314
+ - - ">="
314
315
  - !ruby/object:Gem::Version
315
316
  version: 1.3.6
316
317
  requirements: []
@@ -320,3 +321,4 @@ signing_key:
320
321
  specification_version: 4
321
322
  summary: The best way to manage your application's dependencies
322
323
  test_files: []
324
+ has_rdoc: