bundler 1.0.20 → 1.0.21

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 CHANGED
@@ -1,3 +1,13 @@
1
+ ## 1.0.21 (September 30, 2011)
2
+
3
+ - No changes from RC
4
+
5
+ ## 1.0.21.rc (September 29, 2011)
6
+
7
+ Bugfixes:
8
+
9
+ - Load Psych unless Syck is defined, because 1.9.2 defines YAML
10
+
1
11
  ## 1.0.20 (September 27, 2011)
2
12
 
3
13
  Features:
@@ -6,7 +16,7 @@ Features:
6
16
 
7
17
  Bugfixes:
8
18
 
9
- - Ensure yaml is required even if psych is found
19
+ - Ensure YAML is required even if Psych is found
10
20
  - Handle directory names that contain invalid regex characters
11
21
 
12
22
  ## 1.0.20.rc (September 18, 2011)
@@ -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.0.20" unless defined?(::Bundler::VERSION)
5
+ VERSION = "1.0.21" unless defined?(::Bundler::VERSION)
6
6
  end
data/lib/bundler.rb CHANGED
@@ -4,12 +4,11 @@ require 'pathname'
4
4
 
5
5
  begin
6
6
  # Pull in Psych if we can, but not if Syck is already loaded
7
- require 'psych' unless defined?(::YAML)
7
+ require 'psych' unless defined?(Syck)
8
8
  rescue LoadError
9
- ensure
10
- require 'yaml'
11
9
  end
12
10
 
11
+ require 'yaml'
13
12
  require 'bundler/rubygems_ext'
14
13
  require 'bundler/rubygems_integration'
15
14
  require 'bundler/version'
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bundler
3
3
  version: !ruby/object:Gem::Version
4
- hash: 63
4
+ hash: 61
5
5
  prerelease: false
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
- - 20
10
- version: 1.0.20
9
+ - 21
10
+ version: 1.0.21
11
11
  platform: ruby
12
12
  authors:
13
13
  - "Andr\xC3\xA9 Arko"
@@ -18,7 +18,7 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2011-09-28 00:00:00 -07:00
21
+ date: 2011-09-30 00:00:00 -07:00
22
22
  default_executable:
23
23
  dependencies:
24
24
  - !ruby/object:Gem::Dependency