[DRE-commits] [ruby-rack-flash3] 01/01: Fix usage of Rack::Test using extend not include.
Ben Armstrong
synrg at alioth.debian.org
Thu Aug 15 16:39:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
synrg pushed a commit to branch master
in repository ruby-rack-flash3.
commit 124d6bfa80402438e3d944e72996cd7a79b098fd
Author: Ben Armstrong <Ben Armstrong synrg at sanctuary.nslug.ns.ca>
Date: Thu Aug 15 13:39:37 2013 -0300
Fix usage of Rack::Test using extend not include.
---
debian/control | 3 +-
.../extend_not_include_rack_test_methods.patch | 30 ++++++++++++++++++++
debian/patches/series | 1 +
debian/ruby-tests.rake | 4 +--
4 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 458645d..86581ed 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: ruby
Priority: optional
Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
Uploaders: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.1~)
-#, rake, ruby-rack-test, ruby-bacon, ruby-sinatra
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.4.1~), rake, ruby-rack-test, ruby-bacon, ruby-sinatra
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-rack-flash3.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ruby-extras/ruby-rack-flash3.git;a=summary
diff --git a/debian/patches/extend_not_include_rack_test_methods.patch b/debian/patches/extend_not_include_rack_test_methods.patch
new file mode 100644
index 0000000..04db4c3
--- /dev/null
+++ b/debian/patches/extend_not_include_rack_test_methods.patch
@@ -0,0 +1,30 @@
+Description: We need to 'extend', not 'include' Rack::Flash::Methods
+ Bacon is used incorrectly. We need to use instead instead of include
+ as described in https://github.com/chneukirchen/bacon/issues/4
+ .
+ ruby-rack-flash3 (1.0.3-1) UNRELEASED; urgency=low
+ .
+ * Initial release (Closes: #719308)
+Author: Ben Armstrong <synrg at sanctuary.nslug.ns.ca>
+Bug-Debian: http://bugs.debian.org/719308
+Forwarded: no
+Last-Update: 2013-08-15
+
+--- ruby-rack-flash3-1.0.3.orig/test/test_flash.rb
++++ ruby-rack-flash3-1.0.3/test/test_flash.rb
+@@ -1,7 +1,7 @@
+ require File.dirname(__FILE__) + '/helper'
+
+ describe 'Rack::Flash' do
+- include Rack::Test::Methods
++ extend Rack::Test::Methods
+
+ def app(&block)
+ return Sinatra.new &block
+@@ -154,4 +154,4 @@ describe 'Rack::Flash' do
+ end
+
+ # Testing sessions is a royal pain in the ass.
+-end
+\ No newline at end of file
++end
diff --git a/debian/patches/series b/debian/patches/series
index 8012359..ff45fdc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
fix_requires.patch
+extend_not_include_rack_test_methods.patch
diff --git a/debian/ruby-tests.rake b/debian/ruby-tests.rake
index 79acbec..f384e31 100644
--- a/debian/ruby-tests.rake
+++ b/debian/ruby-tests.rake
@@ -7,6 +7,4 @@ Rake::TestTask.new(:test) do |test|
test.verbose = true
end
-#FIXME: not working yet
-#task :default => :test
-task :default
+task :default => :test
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rack-flash3.git
More information about the Pkg-ruby-extras-commits
mailing list