[DRE-commits] [ruby-rspec] 01/01: Fix rspec/autorun not honoring expose_dsl_globally default

[zeha at debian.org]

This is an automated email from the git hooks/post-receive script.

zeha pushed a commit to branch master
in repository ruby-rspec.

commit 95529638aedff87c6119f13dce0d1ff73895bf85
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Thu Apr 9 13:05:07 2015 +0200

    Fix rspec/autorun not honoring expose_dsl_globally default
---
 debian/changelog                                |  8 +++++++-
 debian/patches/autorun-load-configuration.patch | 22 ++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 897a7ad..275c9d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
 ruby-rspec (3.2.0c2e0m1s2-2.1) UNRELEASED; urgency=medium
 
-  * Team upload.
+  Team upload.
+
+  [ Antonio Terceiro ]
   * debian/patches/fix-rake-task.patch: fix path to rspec binary in rake
     task. Closes: #782161
 
+  [ Christian Hofstaedtler ]
+  * debian/patches/autorun-load-configuration.patch: fix rspec/autorun
+    not honoring expose_dsl_globally default.
+
  -- Antonio Terceiro <terceiro at debian.org>  Thu, 09 Apr 2015 12:59:12 +0200
 
 ruby-rspec (3.2.0c2e0m1s2-2) experimental; urgency=medium
diff --git a/debian/patches/autorun-load-configuration.patch b/debian/patches/autorun-load-configuration.patch
new file mode 100644
index 0000000..0cb2224
--- /dev/null
+++ b/debian/patches/autorun-load-configuration.patch
@@ -0,0 +1,22 @@
+Description: load configuration for rspec/autorun
+Author: Christian Hofstaedtler <zeha at debian.org>
+Origin: vendor
+Bug: https://github.com/rspec/rspec-core/issues/1931
+---
+
+rspec/autorun itself apparently never touches the configuration, thus
+the default of expose_dsl_globally isn't applied. This makes RSpec 3
+backwards incompatible with 2.x.
+
+diff --git a/rspec-core/lib/rspec/core/runner.rb b/rspec-core/lib/rspec/core/runner.rb
+index af5612b..1b9b2ae 100644
+--- a/rspec-core/lib/rspec/core/runner.rb
++++ b/rspec-core/lib/rspec/core/runner.rb
+@@ -10,6 +10,7 @@ module RSpec
+       #       the `ruby` command, and even then, the normal way to invoke
+       #       this is by requiring `rspec/autorun`.
+       def self.autorun
++        RSpec.configuration
+         if autorun_disabled?
+           RSpec.deprecate("Requiring `rspec/autorun` when running RSpec via the `rspec` command")
+           return
diff --git a/debian/patches/series b/debian/patches/series
index d271614..49b406e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ fix_encoding.patch
 #no-aruba.patch
 disable_no_warning_spec_rspec-support.patch
 fix-rake-task.patch
+autorun-load-configuration.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rspec.git