[DRE-commits] r5339 - in trunk/librspec-ruby/debian: . bin patches source
Tobias Grimm
tiber-guest at alioth.debian.org
Sat May 15 18:19:56 UTC 2010
Author: tiber-guest
Date: 2010-05-15 18:19:56 +0000 (Sat, 15 May 2010)
New Revision: 5339
Added:
trunk/librspec-ruby/debian/bin/spec1.9.1
trunk/librspec-ruby/debian/librspec-ruby1.8.docs
trunk/librspec-ruby/debian/librspec-ruby1.8.examples
trunk/librspec-ruby/debian/librspec-ruby1.8.install
trunk/librspec-ruby/debian/librspec-ruby1.8.manpages
trunk/librspec-ruby/debian/librspec-ruby1.9.1.docs
trunk/librspec-ruby/debian/librspec-ruby1.9.1.examples
trunk/librspec-ruby/debian/librspec-ruby1.9.1.install
trunk/librspec-ruby/debian/librspec-ruby1.9.1.manpages
trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.patch
trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.patch
trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.patch
trunk/librspec-ruby/debian/patches/series
trunk/librspec-ruby/debian/source/
trunk/librspec-ruby/debian/source/format
trunk/librspec-ruby/debian/spec1.9.1.1.diff
Removed:
trunk/librspec-ruby/debian/bin/spec1.9
trunk/librspec-ruby/debian/docs
trunk/librspec-ruby/debian/examples
trunk/librspec-ruby/debian/install
trunk/librspec-ruby/debian/manpages
trunk/librspec-ruby/debian/patches/00list
trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch
trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch
trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch
Modified:
trunk/librspec-ruby/debian/changelog
trunk/librspec-ruby/debian/control
trunk/librspec-ruby/debian/rules
trunk/librspec-ruby/debian/watch
Log:
* New upstream release
* Falling back to gemwatch.heroku.com for debian/watch, because the
Rubyforge download site hasn't been updated for months
* Standards-Version: 3.8.4
* Added Ruby 1.9.1 package
* Enabled tests depending on FakeFS
* source/format 3.0 (quilt)
Deleted: trunk/librspec-ruby/debian/bin/spec1.9
===================================================================
--- trunk/librspec-ruby/debian/bin/spec1.9 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/bin/spec1.9 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby1.9
-require 'spec/autorun'
-exit ::Spec::Runner::CommandLine.run
Copied: trunk/librspec-ruby/debian/bin/spec1.9.1 (from rev 5253, trunk/librspec-ruby/debian/bin/spec1.9)
===================================================================
--- trunk/librspec-ruby/debian/bin/spec1.9.1 (rev 0)
+++ trunk/librspec-ruby/debian/bin/spec1.9.1 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby1.9.1
+require 'spec/autorun'
+exit ::Spec::Runner::CommandLine.run
Modified: trunk/librspec-ruby/debian/changelog
===================================================================
--- trunk/librspec-ruby/debian/changelog 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/changelog 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,3 +1,15 @@
+librspec-ruby (1.3.0-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * Falling back to gemwatch.heroku.com for debian/watch, because the
+ Rubyforge download site hasn't been updated for months
+ * Standards-Version: 3.8.4
+ * Added Ruby 1.9.1 package
+ * Enabled tests depending on FakeFS
+ * source/format 3.0 (quilt)
+
+ -- Tobias Grimm <etobi at debian.org> Sun, 09 May 2010 12:38:59 +0200
+
librspec-ruby (1.2.9-1) unstable; urgency=low
* New upstream release
Modified: trunk/librspec-ruby/debian/control
===================================================================
--- trunk/librspec-ruby/debian/control 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/control 2010-05-15 18:19:56 UTC (rev 5339)
@@ -3,8 +3,10 @@
Priority: optional
Maintainer: Tobias Grimm <etobi at debian.org>
Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 5), cdbs, dpatch, help2man, ruby, libdifflcs-ruby1.8, libheckle-ruby1.8, rake
-Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5), cdbs, help2man
+Build-Depends-Indep: ruby1.8, ruby1.9.1, libdifflcs-ruby1.8, libdifflcs-ruby1.9.1,
+ libheckle-ruby1.8, libfakefs-ruby1.8, libfakefs-ruby1.9.1
+Standards-Version: 3.8.4
Homepage: http://rspec.info
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/librspec-ruby/
Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/librspec-ruby/
@@ -19,6 +21,16 @@
* a Story Framework for describing behaviour at the application level
* a Spec Framework for describing behaviour at the object level
+Package: librspec-ruby1.9.1
+Architecture: all
+Depends: ${misc:Depends}, ruby1.9.1, libdifflcs-ruby1.9.1, rcov
+Description: Behaviour Driven Development framework for Ruby 1.9.1
+ RSpec is a Behaviour Driven Development framework for Ruby 1.9.1. It
+ provides two frameworks for writing and executing examples of how your
+ Ruby application should behave:
+ * a Story Framework for describing behaviour at the application level
+ * a Spec Framework for describing behaviour at the object level
+
Package: librspec-ruby
Architecture: all
Depends: ${misc:Depends}, librspec-ruby1.8
@@ -29,5 +41,5 @@
* a Story Framework for describing behaviour at the application level
* a Spec Framework for describing behaviour at the object level
.
- This package provide documentation and depends on the package
- containing the actual library for the default Ruby version.
+ This is a dependency package, which depends on a librspec package
+ built for the default Ruby version.
Deleted: trunk/librspec-ruby/debian/docs
===================================================================
--- trunk/librspec-ruby/debian/docs 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/docs 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,4 +0,0 @@
-README.rdoc
-Upgrade.rdoc
-TODO.txt
-Ruby1.9.rdoc
Deleted: trunk/librspec-ruby/debian/examples
===================================================================
--- trunk/librspec-ruby/debian/examples 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/examples 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1 +0,0 @@
-examples/*
Deleted: trunk/librspec-ruby/debian/install
===================================================================
--- trunk/librspec-ruby/debian/install 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/install 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,4 +0,0 @@
-debian/bin/spec usr/bin/
-lib/spec/ usr/lib/ruby/1.8/
-lib/autotest/ usr/share/librspec-ruby1.8/
-lib/spec.rb usr/lib/ruby/1.8/
Copied: trunk/librspec-ruby/debian/librspec-ruby1.8.docs (from rev 5253, trunk/librspec-ruby/debian/docs)
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.8.docs (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.8.docs 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,3 @@
+README.rdoc
+Upgrade.rdoc
+TODO.txt
Copied: trunk/librspec-ruby/debian/librspec-ruby1.8.examples (from rev 5253, trunk/librspec-ruby/debian/examples)
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.8.examples (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.8.examples 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1 @@
+examples/*
Copied: trunk/librspec-ruby/debian/librspec-ruby1.8.install (from rev 5253, trunk/librspec-ruby/debian/install)
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.8.install (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.8.install 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,4 @@
+debian/bin/spec usr/bin/
+lib/spec/ usr/lib/ruby/1.8/
+lib/autotest/ usr/share/librspec-ruby1.8/
+lib/spec.rb usr/lib/ruby/1.8/
Copied: trunk/librspec-ruby/debian/librspec-ruby1.8.manpages (from rev 5253, trunk/librspec-ruby/debian/manpages)
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.8.manpages (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.8.manpages 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1 @@
+spec.1
Added: trunk/librspec-ruby/debian/librspec-ruby1.9.1.docs
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.9.1.docs (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.9.1.docs 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,4 @@
+README.rdoc
+Upgrade.rdoc
+TODO.txt
+Ruby1.9.rdoc
Added: trunk/librspec-ruby/debian/librspec-ruby1.9.1.examples
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.9.1.examples (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.9.1.examples 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1 @@
+examples/*
Added: trunk/librspec-ruby/debian/librspec-ruby1.9.1.install
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.9.1.install (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.9.1.install 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,4 @@
+debian/bin/spec1.9.1 usr/bin/
+lib/spec/ usr/lib/ruby/1.9.1/
+lib/autotest/ usr/share/librspec-ruby1.9.1/
+lib/spec.rb usr/lib/ruby/1.9.1/
Added: trunk/librspec-ruby/debian/librspec-ruby1.9.1.manpages
===================================================================
--- trunk/librspec-ruby/debian/librspec-ruby1.9.1.manpages (rev 0)
+++ trunk/librspec-ruby/debian/librspec-ruby1.9.1.manpages 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1 @@
+spec1.9.1.1
Deleted: trunk/librspec-ruby/debian/manpages
===================================================================
--- trunk/librspec-ruby/debian/manpages 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/manpages 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1 +0,0 @@
-spec.1
Deleted: trunk/librspec-ruby/debian/patches/00list
===================================================================
--- trunk/librspec-ruby/debian/patches/00list 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/patches/00list 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,4 +0,0 @@
-10-force-spec-binary-path
-11_dont-require-rubygems
-#12_differ-test-fix
-13_skip-unsupported-tests
Deleted: trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.dpatch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10-force-spec-binary-path.dpatch by Sebastien Delafond <seb at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Force spec script path to /usr/bin
-
- at DPATCH@
-diff -urNad librspec-ruby-1.2.9~/lib/autotest/rspec.rb librspec-ruby-1.2.9/lib/autotest/rspec.rb
---- librspec-ruby-1.2.9~/lib/autotest/rspec.rb 2009-11-01 10:21:35.000000000 +0100
-+++ librspec-ruby-1.2.9/lib/autotest/rspec.rb 2009-11-01 10:21:48.000000000 +0100
-@@ -37,7 +37,7 @@
-
- def make_test_cmd(files_to_test)
- return '' if files_to_test.empty?
-- spec_program = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
-+ spec_program = File.expand_path('/usr/bin/spec')
- return "#{ruby} #{spec_program} --autospec #{files_to_test.keys.flatten.join(' ')} #{add_options_if_present}"
- end
-
-diff -urNad librspec-ruby-1.2.9~/lib/spec/rake/spectask.rb librspec-ruby-1.2.9/lib/spec/rake/spectask.rb
---- librspec-ruby-1.2.9~/lib/spec/rake/spectask.rb 2009-11-01 10:21:35.000000000 +0100
-+++ librspec-ruby-1.2.9/lib/spec/rake/spectask.rb 2009-11-01 10:22:26.000000000 +0100
-@@ -142,7 +142,7 @@
- end
-
- def define # :nodoc:
-- spec_script = File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","bin","spec"))
-+ spec_script = '/usr/bin/spec'
-
- lib_path = libs.join(File::PATH_SEPARATOR)
- actual_name = Hash === name ? name.keys.first : name
Added: trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.patch
===================================================================
--- trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.patch (rev 0)
+++ trunk/librspec-ruby/debian/patches/10-force-spec-binary-path.patch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,24 @@
+Author: Sebastien Delafond <seb at debian.org>
+Description: Force spec script path to /usr/bin
+--- librspec-ruby-1.3.0.orig/lib/autotest/rspec.rb
++++ librspec-ruby-1.3.0/lib/autotest/rspec.rb
+@@ -18,7 +18,7 @@
+
+ class Autotest::Rspec < Autotest
+
+- SPEC_PROGRAM = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
++ SPEC_PROGRAM = File.expand_path('/usr/bin/spec')
+
+ def initialize
+ super
+--- librspec-ruby-1.3.0.orig/lib/spec/rake/spectask.rb
++++ librspec-ruby-1.3.0/lib/spec/rake/spectask.rb
+@@ -142,7 +142,7 @@
+ end
+
+ def define # :nodoc:
+- spec_script = File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","bin","spec"))
++ spec_script = '/usr/bin/spec'
+
+ lib_path = libs.join(File::PATH_SEPARATOR)
+ actual_name = Hash === name ? name.keys.first : name
Deleted: trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.dpatch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 11_dont-require-rubygems.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Don't require rubygems, where a Debian package is available, providing
-## DP: a required library
-
- at DPATCH@
-diff -urNad librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/flexmock.rb librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/flexmock.rb
---- librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-09-07 01:08:31.000000000 +0200
-+++ librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/flexmock.rb 2009-11-01 10:22:53.000000000 +0100
-@@ -3,8 +3,12 @@
- # Created by Jim Weirich on 2007-04-10.
- # Copyright (c) 2007. All rights reserved.
-
--require 'rubygems' unless ENV['NO_RUBYGEMS']
--require 'flexmock/rspec'
-+begin
-+ require 'flexmock/rspec'
-+rescue LoadError
-+ require 'rubygems' unless ENV['NO_RUBYGEMS']
-+ require 'flexmock/rspec'
-+end
-
- module Spec
- module Adapters
-diff -urNad librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/mocha.rb librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/mocha.rb
---- librspec-ruby-1.2.9~/lib/spec/adapters/mock_frameworks/mocha.rb 2009-09-20 16:59:11.000000000 +0200
-+++ librspec-ruby-1.2.9/lib/spec/adapters/mock_frameworks/mocha.rb 2009-11-01 10:22:53.000000000 +0100
-@@ -1,6 +1,11 @@
--require 'rubygems' unless ENV['NO_RUBYGEMS']
--require 'mocha/standalone'
--require 'mocha/object'
-+begin
-+ require 'mocha/standalone'
-+ require 'mocha/object'
-+rescue LoadError
-+ require 'rubygems' unless ENV['NO_RUBYGEMS']
-+ require 'mocha/standalone'
-+ require 'mocha/object'
-+end
-
- module Spec
- module Adapters
-diff -urNad librspec-ruby-1.2.9~/lib/spec/runner/heckle_runner.rb librspec-ruby-1.2.9/lib/spec/runner/heckle_runner.rb
---- librspec-ruby-1.2.9~/lib/spec/runner/heckle_runner.rb 2009-09-07 01:08:31.000000000 +0200
-+++ librspec-ruby-1.2.9/lib/spec/runner/heckle_runner.rb 2009-11-01 10:22:53.000000000 +0100
-@@ -1,8 +1,7 @@
- if Spec::Ruby.version.to_f < 1.9
-- begin
-- require 'rubygems' unless ENV['NO_RUBYGEMS']
-+ #begin
- require 'heckle'
-- rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
-+ #rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
-
- module Spec
- module Runner
Added: trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.patch
===================================================================
--- trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.patch (rev 0)
+++ trunk/librspec-ruby/debian/patches/11_dont-require-rubygems.patch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,64 @@
+Author: Tobias Grimm <etobi at debian.org>
+Description: Don't require rubygems, where a Debian package is available, providing
+a required library
+--- librspec-ruby-1.3.0.orig/lib/spec/adapters/mock_frameworks/flexmock.rb
++++ librspec-ruby-1.3.0/lib/spec/adapters/mock_frameworks/flexmock.rb
+@@ -3,8 +3,12 @@
+ # Created by Jim Weirich on 2007-04-10.
+ # Copyright (c) 2007. All rights reserved.
+
+-require 'rubygems' unless ENV['NO_RUBYGEMS']
+-require 'flexmock/rspec'
++begin
++ require 'flexmock/rspec'
++rescue LoadError
++ require 'rubygems' unless ENV['NO_RUBYGEMS']
++ require 'flexmock/rspec'
++end
+
+ module Spec
+ module Adapters
+--- librspec-ruby-1.3.0.orig/lib/spec/adapters/mock_frameworks/mocha.rb
++++ librspec-ruby-1.3.0/lib/spec/adapters/mock_frameworks/mocha.rb
+@@ -1,6 +1,11 @@
+-require 'rubygems' unless ENV['NO_RUBYGEMS']
+-require 'mocha/standalone'
+-require 'mocha/object'
++begin
++ require 'mocha/standalone'
++ require 'mocha/object'
++rescue LoadError
++ require 'rubygems' unless ENV['NO_RUBYGEMS']
++ require 'mocha/standalone'
++ require 'mocha/object'
++end
+
+ module Spec
+ module Adapters
+--- librspec-ruby-1.3.0.orig/lib/spec/adapters/mock_frameworks/rr.rb
++++ librspec-ruby-1.3.0/lib/spec/adapters/mock_frameworks/rr.rb
+@@ -1,5 +1,9 @@
+-require 'rubygems' unless ENV['NO_RUBYGEMS']
+-require 'rr'
++begin
++ require 'rr'
++rescue LoadError
++ require 'rubygems' unless ENV['NO_RUBYGEMS']
++ require 'rr'
++end
+
+ patterns = ::Spec::Runner::QuietBacktraceTweaker::IGNORE_PATTERNS
+ patterns.push(RR::Errors::BACKTRACE_IDENTIFIER)
+--- librspec-ruby-1.3.0.orig/lib/spec/runner/heckle_runner.rb
++++ librspec-ruby-1.3.0/lib/spec/runner/heckle_runner.rb
+@@ -1,8 +1,7 @@
+ if Spec::Ruby.version.to_f < 1.9
+- begin
+- require 'rubygems' unless ENV['NO_RUBYGEMS']
++ #begin
+ require 'heckle'
+- rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
++ #rescue LoadError ; raise "You must gem install heckle to use --heckle" ; end
+
+ module Spec
+ module Runner
Deleted: trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch
===================================================================
--- trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.dpatch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,66 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_skip-unsupported-tests.dpatch by Tobias Grimm <etobi at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Disables some tests, which will not pass on Debian due to missing
-## DP: dependencies.
-
- at DPATCH@
-diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/formatter/html_formatter_spec.rb librspec-ruby-1.2.9/spec/spec/runner/formatter/html_formatter_spec.rb
---- librspec-ruby-1.2.9~/spec/spec/runner/formatter/html_formatter_spec.rb 2009-11-01 10:44:20.000000000 +0100
-+++ librspec-ruby-1.2.9/spec/spec/runner/formatter/html_formatter_spec.rb 2009-11-01 10:44:23.000000000 +0100
-@@ -49,6 +49,7 @@
- # end
-
- it "should produce HTML identical to the one we designed manually with --diff" do
-+ pending "The required syntax higlighting library is not available as a debian package yet."
- Dir.chdir(root) do
- args = [
- 'examples/failing/mocking_example.rb',
-diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/formatter/text_mate_formatter_spec.rb librspec-ruby-1.2.9/spec/spec/runner/formatter/text_mate_formatter_spec.rb
---- librspec-ruby-1.2.9~/spec/spec/runner/formatter/text_mate_formatter_spec.rb 2009-11-01 10:44:20.000000000 +0100
-+++ librspec-ruby-1.2.9/spec/spec/runner/formatter/text_mate_formatter_spec.rb 2009-11-01 10:44:23.000000000 +0100
-@@ -60,6 +60,7 @@
-
- describe "functional spec using --diff" do
- it "should produce HTML identical to the one we designed manually with --diff" do
-+ pending "The required syntax higlighting library is not available as a debian package yet."
- produces_html_identical_to_manually_designed_document("--diff") do |html|
- suffix = jruby? ? '-jruby' : ''
- expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
-diff -urNad librspec-ruby-1.2.9~/spec/spec/runner/option_parser_spec.rb librspec-ruby-1.2.9/spec/spec/runner/option_parser_spec.rb
---- librspec-ruby-1.2.9~/spec/spec/runner/option_parser_spec.rb 2009-11-01 10:44:20.000000000 +0100
-+++ librspec-ruby-1.2.9/spec/spec/runner/option_parser_spec.rb 2009-11-01 10:56:23.000000000 +0100
-@@ -1,7 +1,12 @@
- require 'spec_helper'
- require 'spec/runner/resources/custom_example_group_runner'
--require 'fakefs/safe'
--require 'fakefs/spec_helpers'
-+begin
-+ require 'fakefs/safe'
-+ require 'fakefs/spec_helpers'
-+ HAVE_FAKEFS = true
-+rescue LoadError
-+ HAVE_FAKEFS = false
-+end
-
- describe "OptionParser" do
- before(:each) do
-@@ -29,7 +34,7 @@
- options = parse([])
- options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter)
- end
-- end
-+ end if HAVE_FAKEFS
-
- it "should leave the submitted argv alone" do
- args = ["--pattern", "foo"]
-@@ -539,7 +544,7 @@
- options = parse(['-O','spec/alternate.opts'])
- options.colour.should be(true)
- end
-- end
-+ end if HAVE_FAKEFS
-
-
- end
Added: trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.patch
===================================================================
--- trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.patch (rev 0)
+++ trunk/librspec-ruby/debian/patches/13_skip-unsupported-tests.patch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,23 @@
+Author: Tobias Grimm <etobi at debian.org>
+Description: Disables some tests, which will not pass on Debian due to missing
+dependencies.
+--- librspec-ruby-1.3.0.orig/spec/spec/runner/formatter/html_formatter_spec.rb
++++ librspec-ruby-1.3.0/spec/spec/runner/formatter/html_formatter_spec.rb
+@@ -49,6 +49,7 @@
+ # end
+
+ it "should produce HTML identical to the one we designed manually with --diff" do
++ pending "The required syntax higlighting library is not available as a debian package yet."
+ Dir.chdir(root) do
+ args = [
+ 'examples/failing/mocking_example.rb',
+--- librspec-ruby-1.3.0.orig/spec/spec/runner/formatter/text_mate_formatter_spec.rb
++++ librspec-ruby-1.3.0/spec/spec/runner/formatter/text_mate_formatter_spec.rb
+@@ -60,6 +60,7 @@
+
+ describe "functional spec using --diff" do
+ it "should produce HTML identical to the one we designed manually with --diff" do
++ pending "The required syntax higlighting library is not available as a debian package yet."
+ produces_html_identical_to_manually_designed_document("--diff") do |html|
+ suffix = jruby? ? '-jruby' : ''
+ expected_file = File.dirname(__FILE__) + "/text_mate_formatted-#{::RUBY_VERSION}#{suffix}.html"
Added: trunk/librspec-ruby/debian/patches/series
===================================================================
--- trunk/librspec-ruby/debian/patches/series (rev 0)
+++ trunk/librspec-ruby/debian/patches/series 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,3 @@
+10-force-spec-binary-path.patch
+11_dont-require-rubygems.patch
+13_skip-unsupported-tests.patch
Modified: trunk/librspec-ruby/debian/rules
===================================================================
--- trunk/librspec-ruby/debian/rules 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/rules 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,7 +1,6 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
DEB_INSTALL_CHANGELOGS_ALL := History.rdoc
@@ -10,16 +9,18 @@
build-stamp:
INLINEDIR=. help2man --no-info --include=debian/spec.h2m bin/spec >spec.1
patch spec.1 <debian/spec.1.diff
- INLINEDIR=. bin/spec --options spec/spec.opts spec/spec
+ cp spec.1 spec1.9.1.1
+ patch spec1.9.1.1 <debian/spec1.9.1.1.diff
touch build-stamp
+install/librspec-ruby1.8::
+ INLINEDIR=. ruby1.8 bin/spec --options spec/spec.opts spec/spec
+
+install/librspec-ruby1.9.1::
+ mv spec/spec/interop/test debian/test.backup
+ INLINEDIR=. ruby1.9.1 bin/spec --options spec/spec.opts spec/spec
+
clean::
- rm -f spec.1 build-stamp
+ [ ! -d debian/test.backup ] || mv debian/test.backup spec/spec/interop/test
+ rm -f spec*.1 build-stamp
rm -rf .ruby_inline
-
-common-binary-post-install-indep::
- # Remove TextMate crap accidently included in the upstream version
- find debian/librspec* -name "._*" -exec rm {} \;
-
- # Fix default permissions - dh_fixperms will do the rest
- find debian/librspec* -type f -exec chmod 644 "{}" \;
Added: trunk/librspec-ruby/debian/source/format
===================================================================
--- trunk/librspec-ruby/debian/source/format (rev 0)
+++ trunk/librspec-ruby/debian/source/format 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1 @@
+3.0 (quilt)
Added: trunk/librspec-ruby/debian/spec1.9.1.1.diff
===================================================================
--- trunk/librspec-ruby/debian/spec1.9.1.1.diff (rev 0)
+++ trunk/librspec-ruby/debian/spec1.9.1.1.diff 2010-05-15 18:19:56 UTC (rev 5339)
@@ -0,0 +1,20 @@
+--- spec.1 2010-05-15 18:47:06.000000000 +0200
++++ spec1.9.1.1 2010-05-15 18:53:46.000000000 +0200
+@@ -1,12 +1,13 @@
+ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2.
+-.TH SPEC "1" "May 2010" "spec 1.3.0" "User Commands"
++.TH SPEC1.9.1 "1" "May 2010" "spec 1.3.0" "User Commands"
+ .SH NAME
+-spec \- execute RSpec specifications
++spec1.9.1 \- execute RSpec specifications
+ .SH SYNOPSIS
+-.B spec
++.B spec1.9.1
+ \fI(FILE(:LINE)?|DIRECTORY|GLOB)+ \fR[\fIoptions\fR]
+ .SH DESCRIPTION
+-`spec' executes the examples in the specified files and generates a report.
++`spec1.9.1' executes the examples with Ruby 1.9.1 in the specified files
++and generates a report.
+ .TP
+ \fB\-p\fR, \fB\-\-pattern\fR [PATTERN]
+ Limit files loaded to those matching this pattern. Defaults to '**/*_spec.rb'
Modified: trunk/librspec-ruby/debian/watch
===================================================================
--- trunk/librspec-ruby/debian/watch 2010-05-15 17:50:18 UTC (rev 5338)
+++ trunk/librspec-ruby/debian/watch 2010-05-15 18:19:56 UTC (rev 5339)
@@ -1,3 +1,6 @@
version=3
+
opts="uversionmangle=s/\.rc/~rc/" \
http://rubyforge.org/frs/?group_id=797 .*rspec-(\d.*)\.tgz
+
+http://gemwatch.heroku.com/rspec .*/rspec-(.*).tar.gz
More information about the Pkg-ruby-extras-commits
mailing list