[DRE-commits] [SCM] ruby-upr.git branch, master, updated. debian/0.2.0-1-3-g84f9c31

[Jérémy Bobbio]

The following commit has been merged in the master branch:
commit 90bc7c4e135d203ff3af4e100e6762c80ab7c1a7
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun Jun 23 11:04:47 2013 +0000

    Fix FTBFS by switching to the 0.7 API of Moneta
    
    Closes: #713157

diff --git a/debian/control b/debian/control
index 08fcb8c..fc0c14f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
 Uploaders: Jérémy Bobbio <lunar at debian.org>
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-moneta
+Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.3.0~), ruby-moneta (>= 0.7)
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-upr.git
 Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-upr.git;a=summary
@@ -13,7 +13,7 @@ XS-Ruby-Versions: all
 Package: ruby-upr
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rack, ruby-moneta
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-rack, ruby-moneta (>= 0.7)
 Suggests: rainbows
 Description: Upload Progress for Rack
  upr is Rack middleware that allows browser-side upload progress
diff --git a/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch b/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch
new file mode 100644
index 0000000..3ab8445
--- /dev/null
+++ b/debian/patches/0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch
@@ -0,0 +1,70 @@
+From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+Date: Sat, 22 Jun 2013 15:22:54 +0000
+Subject: Update Upr::Monitor to use Moneta 0.7 API
+
+We need to deactivate the serialization in Moneta so that the assumption
+(currently used in the tests) that the status object will be the same across
+the calls to the monitor still hold.
+---
+ lib/upr/monitor.rb |    9 ++++-----
+ metadata.yml       |    4 ++--
+ upr.gemspec        |    2 +-
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+diff --git a/lib/upr/monitor.rb b/lib/upr/monitor.rb
+index 2b4732c..ec285c9 100644
+--- a/lib/upr/monitor.rb
++++ b/lib/upr/monitor.rb
+@@ -5,10 +5,10 @@ module Upr
+   # This uses any {Moneta}[http://github.com/wycats/moneta]
+   # store to monitor upload progress.
+   #
+-  # Usage (in config.ru with Moneta::Memory store):
++  # Usage (in config.ru with Moneta Memory store):
+   #   require 'upr'
+-  #   require 'moneta/memory'
+-  #   use Upr, :backend => Upr::Monitor.new(Moneta::Memory.new)
++  #   require 'moneta'
++  #   use Upr, :backend => Upr::Monitor.new(Moneta.new(:Memory, :serializer => nil))
+   #   run YourApplication.new
+   class Monitor < Struct.new(:moneta)
+     # nuke anything not read/updated in 60 seconds
+@@ -17,8 +17,7 @@ module Upr
+     def initialize(moneta_store = nil)
+       super
+       if moneta_store.nil?
+-        require 'moneta/memory' # moneta does not autoload :<
+-        self.moneta = Moneta::Memory.new
++        self.moneta = Moneta.new(:Memory, :serializer => nil)
+       end
+     end
+ 
+diff --git a/metadata.yml b/metadata.yml
+index 011045f..87739bf 100644
+--- a/metadata.yml
++++ b/metadata.yml
+@@ -18,9 +18,9 @@ dependencies:
+   version_requirement: 
+   version_requirements: !ruby/object:Gem::Requirement 
+     requirements: 
+-    - - ">="
++    - - "~>"
+       - !ruby/object:Gem::Version 
+-        version: "0"
++        version: "0.7"
+     version: 
+ - !ruby/object:Gem::Dependency 
+   name: rack
+diff --git a/upr.gemspec b/upr.gemspec
+index f99c088..f6bed03 100644
+--- a/upr.gemspec
++++ b/upr.gemspec
+@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
+   s.require_paths = %w(lib)
+   s.rubyforge_project = %q{rainbows}
+ 
+-  s.add_dependency(%q<moneta>)
++  s.add_dependency(%q<moneta>, '~>0.7')
+   s.add_dependency(%q<rack>)
+ 
+   # Folks on intranets sharing humongous files can use Unicorn, too
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ed00446
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Update-Upr-Monitor-to-use-Moneta-0.7-API.patch

-- 
ruby-upr.git