[DRE-commits] [ruby-roxml] 02/12: Refresh patches, drop rspec3.patch require-system-roxml.patch remove_rubygems_from_tests.patch
Cédric Boutillier
boutil at moszumanska.debian.org
Mon Dec 4 22:02:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
boutil pushed a commit to branch master
in repository ruby-roxml.
commit be64907a4678ffa939fa60bd7b5469485e58b6de
Author: Cédric Boutillier <boutil at debian.org>
Date: Mon Dec 4 21:29:21 2017 +0100
Refresh patches, drop rspec3.patch require-system-roxml.patch remove_rubygems_from_tests.patch
---
...deactivate_activesupport_gem_version_test.patch | 19 +-
debian/patches/remove_rubygems_from_tests.patch | 27 ---
debian/patches/require-rspec.patch | 25 ++-
debian/patches/require-system-roxml.patch | 50 -----
debian/patches/rspec3.patch | 212 ---------------------
debian/patches/series | 3 -
debian/patches/use_moved_VERSION.patch | 18 +-
7 files changed, 37 insertions(+), 317 deletions(-)
diff --git a/debian/patches/deactivate_activesupport_gem_version_test.patch b/debian/patches/deactivate_activesupport_gem_version_test.patch
index c31150c..cc75fcf 100644
--- a/debian/patches/deactivate_activesupport_gem_version_test.patch
+++ b/debian/patches/deactivate_activesupport_gem_version_test.patch
@@ -1,13 +1,14 @@
-Description: deactivate Gem test version for active_support
- Debian Jessie has already ruby-activesupport version >= 3.
- Since it is not loaded via rubygems, ruby-activesupport are not available, the
- test fails, and core extensions are not loaded, which causes errors when the
- library is loaded.
-Author: Cédric Boutillier <boutil at debian.org>
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=713137
-Last-Update: 2013-06-23
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 4 Dec 2017 21:13:07 +0100
+Subject: deactivate_activesupport_gem_version_test
+---
+ lib/roxml.rb | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/roxml.rb b/lib/roxml.rb
+index ecbab55..0216949 100644
--- a/lib/roxml.rb
+++ b/lib/roxml.rb
@@ -1,14 +1,14 @@
diff --git a/debian/patches/remove_rubygems_from_tests.patch b/debian/patches/remove_rubygems_from_tests.patch
deleted file mode 100644
index f0bf312..0000000
--- a/debian/patches/remove_rubygems_from_tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: do not require explicitly rubygems in tests
-Author: Cédric Boutillier <boutil at debian.org>
-Forwarded: no
-Last-Update: 2013-04-18
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -1,5 +1,4 @@
- require 'ostruct'
--require 'rubygems'
- require 'pathname'
- require 'ostruct'
- require 'roxml'
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -1,4 +1,3 @@
--require 'rubygems'
- require 'active_support/test_case'
- require_relative './mocks/mocks'
- require_relative './mocks/dictionaries'
-@@ -31,4 +30,4 @@
- end
- end
- xml
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/require-rspec.patch b/debian/patches/require-rspec.patch
index 387f0a3..407667b 100644
--- a/debian/patches/require-rspec.patch
+++ b/debian/patches/require-rspec.patch
@@ -1,15 +1,22 @@
-Description: add missing requirement to rspec library
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Forwarded: no
-Last-Update: 2013-04-18
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 4 Dec 2017 21:13:07 +0100
+Subject: require-rspec
+---
+ spec/spec_helper.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+index f2dc594..57ec485 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -3,6 +3,7 @@
- require 'pathname'
- require 'ostruct'
- require 'roxml'
-+require 'rspec'
+@@ -6,7 +6,7 @@ require 'rspec/matchers' # req by equivalent-xml custom matcher `be_equivalent_t
+ require 'equivalent-xml'
require_relative './../test/support/fixtures'
+-require_relative './../lib/roxml'
++require 'roxml'
require_relative './shared_specs'
+
+ def xml_for(name)
diff --git a/debian/patches/require-system-roxml.patch b/debian/patches/require-system-roxml.patch
deleted file mode 100644
index 2e2a571..0000000
--- a/debian/patches/require-system-roxml.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: use system path for roxml library
- The version that should be used is the one in the debian/ directory,
- not the one in the lib/ dir of the source package
-Author: Praveen Arimbrathodiyil <praveen at debian.org>
-Forwarded: no
-Last-Update: 2013-04-18
-
---- a/spec/spec_helper.rb
-+++ b/spec/spec_helper.rb
-@@ -2,9 +2,9 @@
- require 'rubygems'
- require 'pathname'
- require 'ostruct'
-+require 'roxml'
-
- require_relative './../test/support/fixtures'
--require_relative './../lib/roxml'
- require_relative './shared_specs'
-
- def xml_for(name)
---- a/test/mocks/dictionaries.rb
-+++ b/test/mocks/dictionaries.rb
-@@ -1,4 +1,4 @@
--require_relative "./../../lib/roxml"
-+require "roxml"
-
- class DictionaryOfAttrs
- include ROXML
-@@ -54,4 +54,4 @@
- xml_name :dictionary
- xml_reader :definitions, :as => {:key => '@name',
- :value => 'content'}, :from => :definition
--end
-\ No newline at end of file
-+end
---- a/test/mocks/mocks.rb
-+++ b/test/mocks/mocks.rb
-@@ -1,4 +1,4 @@
--require_relative "./../../lib/roxml"
-+require "roxml"
-
- class Muffins
- include ROXML
-@@ -276,4 +276,4 @@
- xml_reader :age, :from => :attr, :else => 21
- xml_reader :name, :else => 'Anonymous'
- xml_reader :mother,:as => PersonWithMotherOrMissing, :else => Person.blank
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/rspec3.patch b/debian/patches/rspec3.patch
deleted file mode 100644
index df6c113..0000000
--- a/debian/patches/rspec3.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-Description: Basic RSpec3 support
-Author: Cédric Boutillier <boutil at debian.org>
-Bug-Debian: http://bugs.debian.org/795048
-Bug: https://github.com/Empact/roxml/issues/50
-Last-Update: 2015-08-12
-
-
---- a/spec/roxml_spec.rb
-+++ b/spec/roxml_spec.rb
-@@ -194,11 +194,11 @@
-
- describe "indirect reference via an object" do
- it "does not inherit the frozen status from its parent" do
-- @frozen.writable.frozen?.should be_false
-- @frozen.readonly.frozen?.should be_true
-+ @frozen.writable.frozen?.should be false
-+ @frozen.readonly.frozen?.should be true
-
-- @unfrozen.writable.frozen?.should be_false
-- @unfrozen.readonly.frozen?.should be_true
-+ @unfrozen.writable.frozen?.should be false
-+ @unfrozen.readonly.frozen?.should be true
- end
- end
- end
-@@ -212,8 +212,8 @@
- it_should_behave_like "freezable xml reference"
-
- it "should apply :frozen to the constituent elements" do
-- @frozen.all?(&:frozen?).should be_true
-- @unfrozen.any?(&:frozen?).should be_false
-+ @frozen.all?(&:frozen?).should be true
-+ @unfrozen.any?(&:frozen?).should be false
- end
-
- context "no elements are present in root, no :in is specified" do
-@@ -267,13 +267,13 @@
- it_should_behave_like "freezable xml reference"
-
- it "should have frozen keys, as with all hashes" do
-- @frozen.keys.all?(&:frozen?).should be_true
-- @unfrozen.keys.all?(&:frozen?).should be_true
-+ @frozen.keys.all?(&:frozen?).should be true
-+ @unfrozen.keys.all?(&:frozen?).should be true
- end
-
- it "should apply :frozen to the constituent values" do
-- @frozen.values.all?(&:frozen?).should be_true
-- @unfrozen.values.any?(&:frozen?).should be_false
-+ @frozen.values.all?(&:frozen?).should be true
-+ @unfrozen.values.any?(&:frozen?).should be false
- end
- end
- end
---- a/spec/shared_specs.rb
-+++ b/spec/shared_specs.rb
-@@ -2,13 +2,13 @@
- shared_examples_for "freezable xml reference" do
- describe "with :frozen option" do
- it "should be frozen" do
-- @frozen.frozen?.should be_true
-+ @frozen.frozen?.should be true
- end
- end
-
- describe "without :frozen option" do
- it "should not be frozen" do
-- @unfrozen.frozen?.should be_false
-+ @unfrozen.frozen?.should be false
- end
- end
- end
---- a/spec/definition_spec.rb
-+++ b/spec/definition_spec.rb
-@@ -4,13 +4,13 @@
- describe ROXML::Definition do
- describe "#name_explicit?" do
- it "should indicate whether from option is present" do
-- ROXML::Definition.new(:element, :from => 'somewhere').name_explicit?.should be_true
-- ROXML::Definition.new(:element).name_explicit?.should be_false
-+ ROXML::Definition.new(:element, :from => 'somewhere').name_explicit?.should be true
-+ ROXML::Definition.new(:element).name_explicit?.should be false
- end
-
- it "should not consider name proxies as explicit" do
-- ROXML::Definition.new(:element, :from => :attr).name_explicit?.should be_false
-- ROXML::Definition.new(:element, :from => :content).name_explicit?.should be_false
-+ ROXML::Definition.new(:element, :from => :attr).name_explicit?.should be false
-+ ROXML::Definition.new(:element, :from => :content).name_explicit?.should be false
- end
- end
-
-@@ -87,7 +87,7 @@
- describe "=> []" do
- it "should means array of texts" do
- opts = ROXML::Definition.new(:authors, :as => [])
-- opts.array?.should be_true
-+ opts.array?.should be true
- opts.sought_type.should == :text
- end
- end
-@@ -131,7 +131,7 @@
- describe "=> {}" do
- shared_examples_for "hash options declaration" do
- it "should represent a hash" do
-- @opts.hash?.should be_true
-+ @opts.hash?.should be true
- end
-
- it "should have hash definition" do
-@@ -140,7 +140,7 @@
- end
-
- it "should not represent an array" do
-- @opts.array?.should be_false
-+ @opts.array?.should be false
- end
- end
-
-@@ -193,7 +193,7 @@
- end
-
- it "should be detected as array reference" do
-- @opts.array?.should be_true
-+ @opts.array?.should be true
- end
-
- it "should be normal otherwise" do
-@@ -325,16 +325,16 @@
-
- describe ":bool" do
- it "should boolify individual values" do
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("1").should be_true
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("True").should be_true
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("Yes").should be_true
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("1").should be true
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("True").should be true
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("Yes").should be true
- end
-
- context "when an array is passed in" do
- it "should boolify arrays of values" do
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("0").should be_false
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("false").should be_false
-- ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("nO").should be_false
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("0").should be false
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("false").should be false
-+ ROXML::Definition.new(:floatvalue, :as => :bool).blocks.first.call("nO").should be false
- end
- end
-
-@@ -425,7 +425,7 @@
-
- describe ":content" do
- it "should be recognized" do
-- ROXML::Definition.new(:author).content?.should be_false
-+ ROXML::Definition.new(:author).content?.should be false
- ROXML::Definition.new(:author, :from => :content).content?.should == true
- end
-
-@@ -454,12 +454,12 @@
- shared_examples_for "boolean option" do
- it "should be recognized" do
- ROXML::Definition.new(:author, :from => :content, @option => true).respond_to?(:"#{@option}?")
-- ROXML::Definition.new(:author, :from => :content, @option => true).send(:"#{@option}?").should be_true
-- ROXML::Definition.new(:author, :from => :content, @option => false).send(:"#{@option}?").should be_false
-+ ROXML::Definition.new(:author, :from => :content, @option => true).send(:"#{@option}?").should be true
-+ ROXML::Definition.new(:author, :from => :content, @option => false).send(:"#{@option}?").should be false
- end
-
- it "should default to false" do
-- ROXML::Definition.new(:author, :from => :content).send(:"#{@option}?").should be_false
-+ ROXML::Definition.new(:author, :from => :content).send(:"#{@option}?").should be false
- end
- end
-
---- a/spec/examples/active_record_spec.rb
-+++ b/spec/examples/active_record_spec.rb
-@@ -25,7 +25,7 @@
-
- describe "xml sub-objects" do
- it "should extract xml sub-objects" do
-- @route.should have(6).waypoints
-+ expect(@route.waypoints.size).to eq 6
- @route.waypoints.each {|waypoint| waypoint.should be_an_instance_of(Waypoint)}
- end
- it "should be usable as a ActiveRecord object" do
-@@ -34,4 +34,4 @@
- Waypoint.count.should == 6
- end
- end
--end
-\ No newline at end of file
-+end
---- a/spec/xml/attributes_spec.rb
-+++ b/spec/xml/attributes_spec.rb
-@@ -56,7 +56,7 @@
- end
-
- it "should collect all instances" do
-- pending "Test bug?"
-+ skip "Test bug?"
- @ref.value_in(@xml).should == ["first", "second", "third"]
- end
-
-@@ -68,4 +68,4 @@
- end
- end
- end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/series b/debian/patches/series
index d6b3e5b..03e1c13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
deactivate_activesupport_gem_version_test.patch
-require-system-roxml.patch
require-rspec.patch
use_moved_VERSION.patch
-remove_rubygems_from_tests.patch
-rspec3.patch
diff --git a/debian/patches/use_moved_VERSION.patch b/debian/patches/use_moved_VERSION.patch
index 2aa676a..5559432 100644
--- a/debian/patches/use_moved_VERSION.patch
+++ b/debian/patches/use_moved_VERSION.patch
@@ -1,13 +1,17 @@
-Description: use moved version of VERSION file
- VERSION file is moved from the root of the source package to lib/roxml
- The relative path of VERSION should be adapted in roxml.rb file
-Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2013-04-18
-Forwarded: no
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Mon, 4 Dec 2017 21:13:07 +0100
+Subject: use_moved_VERSION
+---
+ lib/roxml.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/roxml.rb b/lib/roxml.rb
+index 0216949..3482628 100644
--- a/lib/roxml.rb
+++ b/lib/roxml.rb
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,7 @@ require 'roxml/definition'
require 'roxml/xml'
module ROXML # :nodoc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-roxml.git
More information about the Pkg-ruby-extras-commits
mailing list