Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package bundler
In bundler 1.2.0 a new keyword was added to the Gemfile DSL,
named 'ruby' which allows users to specify a ruby version.
Upstream has a patch in 1.1.5 that basically ignores this keyword
but allows installation (otherwise, bundler would just abort).
Applying this patch is the only change from the version
currently in testing. 1.1.4-6 should now be in the t-p-u queue.
Thanks for considering this.
unblock bundler/1.1.4-6
debdiff bundler_1.1.4-5.dsc bundler_1.1.4-6.dsc follows:
diff -Nru bundler-1.1.4/debian/changelog bundler-1.1.4/debian/changelog
--- bundler-1.1.4/debian/changelog 2012-08-16 17:55:14.000000000 +0200
+++ bundler-1.1.4/debian/changelog 2012-11-12 01:02:15.000000000 +0100
@@ -1,3 +1,11 @@
+bundler (1.1.4-6) testing-proposed-updates; urgency=low
+
+ * Apply patch from upstream 1.1.5 to be compatible with gems
+ that expect a new keyword introduced in bundler 1.2.
+ Thanks to Martin Schuerrer for pointing this out.
+
+ -- Christian Hofstaedtler <christ...@hofstaedtler.name> Mon, 12 Nov 2012
01:00:08 +0100
+
bundler (1.1.4-5) unstable; urgency=low
* Team upload
diff -Nru bundler-1.1.4/debian/patches/1.1.5-special-case-ruby-directive.patch
bundler-1.1.4/debian/patches/1.1.5-special-case-ruby-directive.patch
--- bundler-1.1.4/debian/patches/1.1.5-special-case-ruby-directive.patch
1970-01-01 01:00:00.000000000 +0100
+++ bundler-1.1.4/debian/patches/1.1.5-special-case-ruby-directive.patch
2012-11-12 00:57:56.000000000 +0100
@@ -0,0 +1,58 @@
+commit 4f9f810fa52abf3923442d6dad070607daeb3d64
+Author: Terence Lee <hon...@gmail.com>
+Date: Tue Jul 17 15:20:20 2012 -0500
+
+ special case `ruby` directive
+
+ This is light of the upcoming 1.2.0 release which adds this feature.
+ This way people still using 1.1.x can run 1.2.0 Gemfiles that employ
+ this feature and get a notification about upgrading.
+
+diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
+index 286b6d4..dd2148c 100644
+--- a/lib/bundler/dsl.rb
++++ b/lib/bundler/dsl.rb
+@@ -163,6 +163,12 @@ module Bundler
+ @env = old
+ end
+
++ def ruby(*args)
++ msg = "Ignoring `ruby` directive. This is a feature added to Bundler
1.2.0 \n" \
++ "and higher. Please upgrade if you would like to use it. \n\n"
++ Bundler.ui.warn msg
++ end
++
+ # Deprecated methods
+
+ def self.deprecate(name, replacement = nil)
+diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
+index 4f50c3c..29b4b32 100644
+--- a/spec/bundler/dsl_spec.rb
++++ b/spec/bundler/dsl_spec.rb
+@@ -26,5 +26,26 @@ describe Bundler::Dsl do
+ lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
+ should raise_error(Bundler::GemfileError)
+ end
++
++ it "should special case the ruby directive" do
++ gemfile <<-G
++ ruby "1.9.3"
++ G
++ lambda { Bundler::Dsl.evaluate(bundled_app("Gemfile"), nil, true) }.
++ should_not raise_error(Bundler::GemfileError)
++ end
++
++ it "should special case the ruby directive and throws a warning" do
++ install_gemfile <<-G
++ source "file://#{gem_repo1}"
++
++ ruby "1.9.3"
++
++ gem "foo"
++ G
++
++ out.should include("Ignoring `ruby` directive")
++ bundled_app("Gemfile.lock").should exist
++ end
+ end
+ end
diff -Nru bundler-1.1.4/debian/patches/series
bundler-1.1.4/debian/patches/series
--- bundler-1.1.4/debian/patches/series 2012-08-16 17:55:14.000000000 +0200
+++ bundler-1.1.4/debian/patches/series 2012-11-12 00:58:11.000000000 +0100
@@ -1 +1,2 @@
fix-manpage-warning.patch
+1.1.5-special-case-ruby-directive.patch
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
