bundler 1.1.pre → 1.1.pre.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.
- data/CHANGELOG.md +16 -3
- data/LICENSE +2 -0
- data/Rakefile +6 -4
- data/lib/bundler.rb +9 -2
- data/lib/bundler/cli.rb +1 -0
- data/lib/bundler/rubygems_ext.rb +6 -0
- data/lib/bundler/source.rb +1 -0
- data/lib/bundler/ui.rb +4 -1
- data/lib/bundler/version.rb +1 -1
- data/spec/install/gems/simple_case_spec.rb +9 -0
- data/spec/support/helpers.rb +1 -1
- data/spec/support/rubygems_ext.rb +2 -0
- metadata +4 -3
data/CHANGELOG.md
CHANGED
@@ -1,4 +1,10 @@
|
|
1
|
-
## 1.1.pre (
|
1
|
+
## 1.1.pre.1 (February 2, 2011)
|
2
|
+
|
3
|
+
Bugfixes:
|
4
|
+
|
5
|
+
- Compatibility with changes made by Rubygems 1.5
|
6
|
+
|
7
|
+
## 1.1.pre (January 21, 2011)
|
2
8
|
|
3
9
|
Features:
|
4
10
|
|
@@ -16,7 +22,14 @@ Removed:
|
|
16
22
|
- Removed bundle install --production
|
17
23
|
- Removed bundle install --disable-shared-gems
|
18
24
|
|
19
|
-
## 1.0.
|
25
|
+
## 1.0.10 (February 1, 2011)
|
26
|
+
|
27
|
+
Bugfixes:
|
28
|
+
|
29
|
+
- Fix a regression loading YAML gemspecs from :git and :path gems
|
30
|
+
- Requires, namespaces, etc. to work with changes in Rubygems 1.5
|
31
|
+
|
32
|
+
## 1.0.9 (January 19, 2011)
|
20
33
|
|
21
34
|
Bugfixes:
|
22
35
|
|
@@ -24,7 +37,7 @@ Bugfixes:
|
|
24
37
|
path. In Rails apps with a default application.rb, this removed
|
25
38
|
all gems in groups other than :default and Rails.env
|
26
39
|
|
27
|
-
## 1.0.8 (January 18,
|
40
|
+
## 1.0.8 (January 18, 2011)
|
28
41
|
|
29
42
|
Features:
|
30
43
|
|
data/LICENSE
CHANGED
@@ -1,6 +1,8 @@
|
|
1
1
|
Portions copyright (c) 2010 Andre Arko
|
2
2
|
Portions copyright (c) 2009 Engine Yard
|
3
3
|
|
4
|
+
MIT License
|
5
|
+
|
4
6
|
Permission is hereby granted, free of charge, to any person obtaining
|
5
7
|
a copy of this software and associated documentation files (the
|
6
8
|
"Software"), to deal in the Software without restriction, including
|
data/Rakefile
CHANGED
@@ -60,7 +60,7 @@ begin
|
|
60
60
|
namespace :rubygems do
|
61
61
|
# Rubygems 1.3.5, 1.3.6, and HEAD specs
|
62
62
|
rubyopt = ENV["RUBYOPT"]
|
63
|
-
%w(master v1.3.
|
63
|
+
%w(master v1.3.6 v1.3.7 v1.4.0 v1.4.1 v1.5.0).each do |rg|
|
64
64
|
desc "Run specs with Rubygems #{rg}"
|
65
65
|
RSpec::Core::RakeTask.new(rg) do |t|
|
66
66
|
t.rspec_opts = %w(-fs --color)
|
@@ -68,10 +68,12 @@ begin
|
|
68
68
|
end
|
69
69
|
|
70
70
|
task "clone_rubygems_#{rg}" do
|
71
|
-
unless File.directory?("tmp/
|
72
|
-
system("git clone git://github.com/rubygems/rubygems.git tmp/
|
71
|
+
unless File.directory?("tmp/rubygems")
|
72
|
+
system("git clone git://github.com/rubygems/rubygems.git tmp/rubygems")
|
73
73
|
end
|
74
|
-
|
74
|
+
system("cd tmp/rubygems && git checkout #{rg}")
|
75
|
+
system("git pull") if rg == "master"
|
76
|
+
ENV["RUBYOPT"] = "-I#{File.expand_path("tmp/rubygems/lib")} #{rubyopt}"
|
75
77
|
end
|
76
78
|
|
77
79
|
task rg => "clone_rubygems_#{rg}"
|
data/lib/bundler.rb
CHANGED
@@ -1,6 +1,12 @@
|
|
1
1
|
require 'rbconfig'
|
2
2
|
require 'fileutils'
|
3
3
|
require 'pathname'
|
4
|
+
|
5
|
+
begin
|
6
|
+
require 'psych'
|
7
|
+
rescue LoadError
|
8
|
+
end
|
9
|
+
|
4
10
|
require 'yaml'
|
5
11
|
require 'bundler/rubygems_ext'
|
6
12
|
require 'bundler/version'
|
@@ -226,12 +232,13 @@ module Bundler
|
|
226
232
|
path = Pathname.new(file)
|
227
233
|
# Eval the gemspec from its parent directory
|
228
234
|
Dir.chdir(path.dirname.to_s) do
|
235
|
+
contents = File.read(path.basename.to_s)
|
229
236
|
begin
|
230
|
-
Gem::Specification.from_yaml(
|
237
|
+
Gem::Specification.from_yaml(contents)
|
231
238
|
# Raises ArgumentError if the file is not valid YAML
|
232
239
|
rescue ArgumentError, SyntaxError, Gem::EndOfYAMLException, Gem::Exception
|
233
240
|
begin
|
234
|
-
eval(
|
241
|
+
eval(contents, TOPLEVEL_BINDING, path.expand_path.to_s)
|
235
242
|
rescue LoadError => e
|
236
243
|
original_line = e.backtrace.find { |line| line.include?(path.to_s) }
|
237
244
|
msg = "There was a LoadError while evaluating #{path.basename}:\n #{e.message}"
|
data/lib/bundler/cli.rb
CHANGED
data/lib/bundler/rubygems_ext.rb
CHANGED
@@ -105,6 +105,12 @@ module Gem
|
|
105
105
|
|
106
106
|
alias eql? ==
|
107
107
|
|
108
|
+
def encode_with(coder)
|
109
|
+
to_yaml_properties.each do |ivar|
|
110
|
+
coder[ivar.to_s.sub(/^@/, '')] = instance_variable_get(ivar)
|
111
|
+
end
|
112
|
+
end
|
113
|
+
|
108
114
|
def to_yaml_properties
|
109
115
|
instance_variables.reject { |p| ["@source", "@groups"].include?(p.to_s) }
|
110
116
|
end
|
data/lib/bundler/source.rb
CHANGED
data/lib/bundler/ui.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
require 'rubygems/user_interaction'
|
2
|
+
|
1
3
|
module Bundler
|
2
4
|
class UI
|
3
5
|
def warn(message)
|
@@ -53,9 +55,10 @@ module Bundler
|
|
53
55
|
end
|
54
56
|
end
|
55
57
|
|
56
|
-
class RGProxy < Gem::SilentUI
|
58
|
+
class RGProxy < ::Gem::SilentUI
|
57
59
|
def initialize(ui)
|
58
60
|
@ui = ui
|
61
|
+
super()
|
59
62
|
end
|
60
63
|
|
61
64
|
def say(message)
|
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.1.pre" unless defined?(::Bundler::VERSION)
|
5
|
+
VERSION = "1.1.pre.1" unless defined?(::Bundler::VERSION)
|
6
6
|
end
|
@@ -531,6 +531,15 @@ describe "bundle install with gem sources" do
|
|
531
531
|
bundle :install
|
532
532
|
err.should be_empty
|
533
533
|
end
|
534
|
+
|
535
|
+
it "still installs correctly when using path" do
|
536
|
+
build_lib 'yaml_spec', :gemspec => :yaml
|
537
|
+
|
538
|
+
install_gemfile <<-G
|
539
|
+
gem 'yaml_spec', :path => "#{lib_path('yaml_spec-1.0')}"
|
540
|
+
G
|
541
|
+
err.should == ""
|
542
|
+
end
|
534
543
|
end
|
535
544
|
|
536
545
|
describe "bundler dependencies" do
|
data/spec/support/helpers.rb
CHANGED
@@ -3,7 +3,7 @@ module Spec
|
|
3
3
|
def reset!
|
4
4
|
@in_p, @out_p, @err_p = nil, nil, nil
|
5
5
|
Dir["#{tmp}/{gems/*,*}"].each do |dir|
|
6
|
-
next if %(base remote1 gems
|
6
|
+
next if %(base remote1 gems rubygems).include?(File.basename(dir))
|
7
7
|
unless ENV['BUNDLER_SUDO_TESTS']
|
8
8
|
FileUtils.rm_rf(dir)
|
9
9
|
else
|
metadata
CHANGED
@@ -1,13 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bundler
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
4
|
+
hash: 1923831875
|
5
5
|
prerelease: true
|
6
6
|
segments:
|
7
7
|
- 1
|
8
8
|
- 1
|
9
9
|
- pre
|
10
|
-
|
10
|
+
- 1
|
11
|
+
version: 1.1.pre.1
|
11
12
|
platform: ruby
|
12
13
|
authors:
|
13
14
|
- Carl Lerche
|
@@ -18,7 +19,7 @@ autorequire:
|
|
18
19
|
bindir: bin
|
19
20
|
cert_chain: []
|
20
21
|
|
21
|
-
date: 2011-
|
22
|
+
date: 2011-02-02 00:00:00 -08:00
|
22
23
|
default_executable: bundle
|
23
24
|
dependencies:
|
24
25
|
- !ruby/object:Gem::Dependency
|