bundler 1.6.0.rc2 → 1.6.0
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 +5 -0
- data/DEVELOPMENT.md +1 -1
- data/lib/bundler/definition.rb +3 -3
- data/lib/bundler/dependency.rb +2 -2
- data/lib/bundler/dsl.rb +1 -1
- data/lib/bundler/graph.rb +1 -1
- data/lib/bundler/index.rb +1 -1
- data/lib/bundler/parallel_workers/worker.rb +1 -1
- data/lib/bundler/retry.rb +1 -1
- data/lib/bundler/setup.rb +1 -1
- data/lib/bundler/source/git.rb +1 -1
- data/lib/bundler/source/rubygems.rb +1 -1
- data/lib/bundler/templates/newgem/spec/newgem_spec.rb.tt +2 -2
- data/lib/bundler/vendor/net/http/persistent.rb +3 -3
- data/lib/bundler/vendor/thor/group.rb +1 -1
- data/lib/bundler/version.rb +1 -1
- data/man/bundle-install.ronn +13 -0
- data/man/bundle-update.ronn +4 -1
- data/spec/runtime/setup_spec.rb +1 -1
- data/spec/support/helpers.rb +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ff360652b4deb58a89cfc16e6383932e279d9aae
|
4
|
+
data.tar.gz: 6f721d1e97e6780235d43332b28618e38abeb67c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: afdf8658adc3a1427e8b821b00a3869b612e11da156b84b2169bc5c33359540e6a87aca691726441feeea2b5e3d0017fadeb101449e1ef3d9a52f7769fa477cf
|
7
|
+
data.tar.gz: 0be2b85905365036e321f6843fd7e9f8ae2d7a4af9f5d1d31ee924510832da85e1c71fca9f25445c97f1450d979c70e6701d8e4b97946f18363d44677369b54a
|
data/CHANGELOG.md
CHANGED
@@ -27,6 +27,11 @@ Features:
|
|
27
27
|
- `bundle outdated --strict` now only reports allowed updates (@davidblondeau)
|
28
28
|
- `bundle show --verbose` Add gem summary to the output (@lardcanoe)
|
29
29
|
- `bundle gem GEM --ext` now generates a skeleton for a C extension (@superdealloc)
|
30
|
+
- Avoid using threequals operator where possible (@as-cii)
|
31
|
+
|
32
|
+
Documentation:
|
33
|
+
|
34
|
+
- Add missing switches for bundle-install(1) and bundle-update(1) (@as-cii)
|
30
35
|
|
31
36
|
## 1.5.3 (2014-02-06)
|
32
37
|
|
data/DEVELOPMENT.md
CHANGED
@@ -2,7 +2,7 @@ Great to have you here! Here are a few ways you can help out with [Bundler](http
|
|
2
2
|
|
3
3
|
# Where should I start?
|
4
4
|
|
5
|
-
You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/v1.5/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](
|
5
|
+
You can start learning about Bundler by reading [the documentation](http://bundler.io). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://bundler.io/v1.5/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](http://webchat.freenode.net/?channels=%23bundler), which is #bundler on Freenode.
|
6
6
|
|
7
7
|
## Your first commits
|
8
8
|
|
data/lib/bundler/definition.rb
CHANGED
@@ -438,7 +438,7 @@ module Bundler
|
|
438
438
|
end
|
439
439
|
|
440
440
|
locals.any? do |source, changed|
|
441
|
-
changed || specs_changed?(source) { |o| source.class
|
441
|
+
changed || specs_changed?(source) { |o| source.class == o.class && source.uri == o.uri }
|
442
442
|
end
|
443
443
|
end
|
444
444
|
|
@@ -455,10 +455,10 @@ module Bundler
|
|
455
455
|
changes = false
|
456
456
|
|
457
457
|
# Get the Rubygems source from the Gemfile.lock
|
458
|
-
locked_gem = @locked_sources.find { |s| Source::Rubygems
|
458
|
+
locked_gem = @locked_sources.find { |s| s.kind_of?(Source::Rubygems) }
|
459
459
|
|
460
460
|
# Get the Rubygems source from the Gemfile
|
461
|
-
actual_gem = @sources.find { |s| Source::Rubygems
|
461
|
+
actual_gem = @sources.find { |s| s.kind_of?(Source::Rubygems) }
|
462
462
|
|
463
463
|
# If there is a Rubygems source in both
|
464
464
|
if locked_gem && actual_gem
|
data/lib/bundler/dependency.rb
CHANGED
@@ -67,9 +67,9 @@ module Bundler
|
|
67
67
|
|
68
68
|
def current_env?
|
69
69
|
return true unless @env
|
70
|
-
if
|
70
|
+
if @env.is_a?(Hash)
|
71
71
|
@env.all? do |key, val|
|
72
|
-
ENV[key.to_s] && (String
|
72
|
+
ENV[key.to_s] && (val.is_a?(String) ? ENV[key.to_s] == val : ENV[key.to_s] =~ val)
|
73
73
|
end
|
74
74
|
else
|
75
75
|
ENV[@env.to_s]
|
data/lib/bundler/dsl.rb
CHANGED
@@ -74,7 +74,7 @@ module Bundler
|
|
74
74
|
raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name.to_s}"' instead.}
|
75
75
|
end
|
76
76
|
|
77
|
-
options =
|
77
|
+
options = args.last.is_a?(Hash) ? args.pop.dup : {}
|
78
78
|
version = args
|
79
79
|
|
80
80
|
normalize_options(name, version, options)
|
data/lib/bundler/graph.rb
CHANGED
@@ -91,7 +91,7 @@ module Bundler
|
|
91
91
|
Gem::Dependency.class_eval do
|
92
92
|
def matching_specs platform_only = false
|
93
93
|
matches = Bundler.load.specs.select { |spec|
|
94
|
-
self.name
|
94
|
+
self.name == spec.name and
|
95
95
|
requirement.satisfied_by? spec.version
|
96
96
|
}
|
97
97
|
|
data/lib/bundler/index.rb
CHANGED
data/lib/bundler/retry.rb
CHANGED
@@ -42,7 +42,7 @@ module Bundler
|
|
42
42
|
|
43
43
|
def fail(e)
|
44
44
|
@failed = true
|
45
|
-
raise e if last_attempt? || @exceptions.any?{|k| k
|
45
|
+
raise e if last_attempt? || @exceptions.any?{ |k| e.is_a?(k) }
|
46
46
|
return true unless name
|
47
47
|
Bundler.ui.warn "Retrying#{" #{name}" if name} due to error (#{current_run.next}/#{total_runs}): #{e.class} #{e.message}"
|
48
48
|
end
|
data/lib/bundler/setup.rb
CHANGED
@@ -8,7 +8,7 @@ if Bundler::SharedHelpers.in_bundle?
|
|
8
8
|
rescue Bundler::BundlerError => e
|
9
9
|
puts "\e[31m#{e.message}\e[0m"
|
10
10
|
puts e.backtrace.join("\n") if ENV["DEBUG"]
|
11
|
-
if Bundler::GemNotFound
|
11
|
+
if e.is_a?(Bundler::GemNotFound)
|
12
12
|
puts "\e[33mRun `bundle install` to install missing gems.\e[0m"
|
13
13
|
end
|
14
14
|
exit e.status_code
|
data/lib/bundler/source/git.rb
CHANGED
@@ -1,11 +1,11 @@
|
|
1
1
|
require 'spec_helper'
|
2
2
|
|
3
3
|
describe <%= config[:constant_name] %> do
|
4
|
-
it '
|
4
|
+
it 'has a version number' do
|
5
5
|
expect(<%= config[:constant_name] %>::VERSION).not_to be nil
|
6
6
|
end
|
7
7
|
|
8
|
-
it '
|
8
|
+
it 'does something useful' do
|
9
9
|
expect(false).to eq(true)
|
10
10
|
end
|
11
11
|
end
|
@@ -241,7 +241,7 @@ class Net::HTTP::Persistent
|
|
241
241
|
# NOTE: This may not work on ruby > 1.9.
|
242
242
|
|
243
243
|
def self.detect_idle_timeout uri, max = 10
|
244
|
-
uri = URI uri unless URI::Generic
|
244
|
+
uri = URI uri unless uri.is_a?(URI::Generic)
|
245
245
|
uri += '/'
|
246
246
|
|
247
247
|
req = Net::HTTP::Head.new uri.request_uri
|
@@ -257,7 +257,7 @@ class Net::HTTP::Persistent
|
|
257
257
|
|
258
258
|
$stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
|
259
259
|
|
260
|
-
unless Net::HTTPOK
|
260
|
+
unless response.is_a?(Net::HTTPOK) then
|
261
261
|
raise Error, "bad response code #{response.code} detecting idle timeout"
|
262
262
|
end
|
263
263
|
|
@@ -1065,7 +1065,7 @@ class Net::HTTP::Persistent
|
|
1065
1065
|
# Returns the request.
|
1066
1066
|
|
1067
1067
|
def request_setup req_or_uri # :nodoc:
|
1068
|
-
req = if URI
|
1068
|
+
req = if req_or_uri.is_a?(URI) then
|
1069
1069
|
Net::HTTP::Get.new req_or_uri.request_uri
|
1070
1070
|
else
|
1071
1071
|
req_or_uri
|
@@ -125,7 +125,7 @@ class Thor::Group # rubocop:disable ClassLength
|
|
125
125
|
return unless options[#{name.inspect}]
|
126
126
|
|
127
127
|
value = options[#{name.inspect}]
|
128
|
-
value = #{name.inspect} if TrueClass
|
128
|
+
value = #{name.inspect} if value.is_a?(TrueClass)
|
129
129
|
klass, command = self.class.prepare_for_invocation(#{name.inspect}, value)
|
130
130
|
|
131
131
|
if klass
|
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.0
|
5
|
+
VERSION = "1.6.0" unless defined?(::Bundler::VERSION)
|
6
6
|
end
|
data/man/bundle-install.ronn
CHANGED
@@ -14,6 +14,10 @@ bundle-install(1) -- Install the dependencies specified in your Gemfile
|
|
14
14
|
[--retry=TRIES]
|
15
15
|
[--no-cache]
|
16
16
|
[--quiet]
|
17
|
+
[--clean]
|
18
|
+
[--full-index]
|
19
|
+
[--no-prune]
|
20
|
+
[--shebang]
|
17
21
|
|
18
22
|
## DESCRIPTION
|
19
23
|
|
@@ -105,6 +109,15 @@ update process below under [CONSERVATIVE UPDATING][].
|
|
105
109
|
Do not print progress information to stdout. Instead, communicate the
|
106
110
|
success of the install operation via exit status code.
|
107
111
|
|
112
|
+
* `--clean`:
|
113
|
+
Run bundle clean automatically after install.
|
114
|
+
|
115
|
+
* `--full-index`:
|
116
|
+
Use the rubygems modern index instead of the API endpoint.
|
117
|
+
|
118
|
+
* `--no-prune`:
|
119
|
+
Don't remove stale gems from the cache.
|
120
|
+
|
108
121
|
## DEPLOYMENT MODE
|
109
122
|
|
110
123
|
Bundler's defaults are optimized for development. To switch to
|
data/man/bundle-update.ronn
CHANGED
@@ -3,7 +3,7 @@ bundle-update(1) -- Update your gems to the latest available versions
|
|
3
3
|
|
4
4
|
## SYNOPSIS
|
5
5
|
|
6
|
-
`bundle update` <*gems> [--source=NAME]
|
6
|
+
`bundle update` <*gems> [--source=NAME] [--local]
|
7
7
|
|
8
8
|
## DESCRIPTION
|
9
9
|
|
@@ -22,6 +22,9 @@ gem.
|
|
22
22
|
instance, with a `:git` source of `http://github.com/rails/rails.git`,
|
23
23
|
you would call `bundle update --source rails`
|
24
24
|
|
25
|
+
* `--local`:
|
26
|
+
Do not attempt to fetch gems remotely and use the gem cache instead.
|
27
|
+
|
25
28
|
## UPDATING ALL GEMS
|
26
29
|
|
27
30
|
If you run `bundle update` with no parameters, bundler will ignore
|
data/spec/runtime/setup_spec.rb
CHANGED
data/spec/support/helpers.rb
CHANGED
@@ -164,7 +164,7 @@ module Spec
|
|
164
164
|
|
165
165
|
def gemfile(*args)
|
166
166
|
path = bundled_app("Gemfile")
|
167
|
-
path = args.shift if
|
167
|
+
path = args.shift if args.first.is_a?(Pathname)
|
168
168
|
str = args.shift || ""
|
169
169
|
path.dirname.mkpath
|
170
170
|
File.open(path.to_s, 'w') do |f|
|
@@ -174,7 +174,7 @@ module Spec
|
|
174
174
|
|
175
175
|
def lockfile(*args)
|
176
176
|
path = bundled_app("Gemfile.lock")
|
177
|
-
path = args.shift if
|
177
|
+
path = args.shift if args.first.is_a?(Pathname)
|
178
178
|
str = args.shift || ""
|
179
179
|
File.open(path.to_s, 'w') do |f|
|
180
180
|
f.puts strip_whitespace(str)
|
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.0
|
4
|
+
version: 1.6.0
|
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: 2014-03-
|
14
|
+
date: 2014-03-28 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: ronn
|