* [gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/map/files/, dev-ruby/map/
@ 2013-10-14 17:40 Peter Wilmott
0 siblings, 0 replies; 2+ messages in thread
From: Peter Wilmott @ 2013-10-14 17:40 UTC (permalink / raw
To: gentoo-commits
commit: d9d054e09471a3163bc5bdd1d606c892c0fbc84c
Author: Peter Wilmott <p <AT> p8952 <DOT> info>
AuthorDate: Mon Oct 14 17:37:52 2013 +0000
Commit: Peter Wilmott <p <AT> p8952 <DOT> info>
CommitDate: Mon Oct 14 17:37:52 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=d9d054e0
dev-ruby/map: remove ree18 targets, fix tests on ruby18, add ruby20 targets, version bump
Package-Manager: portage-2.2.1
---
dev-ruby/map/ChangeLog | 13 ++++
.../map/files/map-6.5.1-ruby18-failing-tests.patch | 75 ++++++++++++++++++++++
dev-ruby/map/files/ruby18-failing-tests.patch | 15 +++++
dev-ruby/map/map-5.5.0.ebuild | 32 +++++++++
dev-ruby/map/map-6.5.1.ebuild | 37 +++++++++++
dev-ruby/map/metadata.xml | 5 ++
6 files changed, 177 insertions(+)
diff --git a/dev-ruby/map/ChangeLog b/dev-ruby/map/ChangeLog
new file mode 100644
index 0000000..64e0d1b
--- /dev/null
+++ b/dev-ruby/map/ChangeLog
@@ -0,0 +1,13 @@
+# ChangeLog for dev-ruby/map
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*map-5.5.0 (14 Oct 2013)
+*map-6.5.1 (14 Oct 2013)
+
+ 14 Oct 2013; Peter Wilmott <p@p8952.info>
+ +files/map-6.5.1-ruby18-failing-tests.patch,
+ +files/ruby18-failing-tests.patch, +map-5.5.0.ebuild, +map-6.5.1.ebuild,
+ +metadata.xml:
+ dev-ruby/map: remove ree18 targets, fix tests on ruby18, add ruby20 targets,
+ version bump
diff --git a/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch b/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
new file mode 100644
index 0000000..d33a5fa
--- /dev/null
+++ b/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
@@ -0,0 +1,75 @@
+--- test/map_test.rb.old 2013-10-14 17:23:08.612541725 +0100
++++ test/map_test.rb 2013-10-14 17:24:20.001644242 +0100
+@@ -405,47 +405,6 @@
+ assert{ m[:key][0].is_a?(Map) }
+ end
+
+- testing 'that #add overlays the leaves of one hash onto another without nuking branches' do
+- m = Map.new
+-
+- assert do
+- m.add(
+- :comments => [
+- { :body => 'a' },
+- { :body => 'b' },
+- ],
+-
+- [:comments, 0] => {'title' => 'teh title', 'description' => 'description'},
+- [:comments, 1] => {'description' => 'description'},
+- )
+- end
+-
+- assert do
+- m =~
+- {"comments"=>
+- [{"body"=>"a", "title"=>"teh title", "description"=>"description"},
+- {"body"=>"b", "description"=>"description"}]}
+- end
+-
+- m = Map.new
+-
+- assert do
+- m.add(
+- [:a, :b, :c] => 42,
+-
+- [:a, :b] => {:d => 42.0}
+- )
+- end
+-
+- assert do
+- m =~
+- {"a"=>{"b"=>{"c"=>42, "d"=>42.0}}}
+- end
+-
+- assert{ Map.new.tap{|i| i.add} =~ {} }
+- assert{ Map.new.tap{|i| i.add({})} =~ {} }
+- end
+-
+ testing 'that Map.combine is teh sweet' do
+ {
+ [{:a => {:b => 42}}, {:a => {:c => 42.0}}] =>
+@@ -734,24 +693,6 @@
+ assert{ map.list.class != Array }
+ end
+
+- testing 'rack compatible params' do
+- m = Map.for(:a => [{}, {:b => 42}], :x => [ nil, [ nil, {:y => 42}] ], :A => {:B => {:C => 42}})
+-
+- assert{ m.param_for(:a, 1, :b) == 'map[a][][b]=42' }
+- assert{ m.name_for(:a, 1, :b) == 'map[a][][b]' }
+-
+- assert{ m.param_for(:x, 1, 1, :y) == 'map[x][][][y]=42' }
+- assert{ m.name_for(:x, 1, 1, :y) == 'map[x][][][y]' }
+-
+- assert{ m.param_for(:A, :B, :C) == 'map[A][B][C]=42' }
+- assert{ m.name_for(:A, :B, :C) == 'map[A][B][C]' }
+-
+- assert{ m.name_for(:A, :B, :C, :prefix => :foo) == 'foo[A][B][C]' }
+-
+- m = Map.for({"a"=>{"b"=>42}, "x"=>{"y"=>42}, "foo"=>:bar, "array"=>[{"k"=>:v}]})
+- assert{ m.to_params == "map[a][b]=42&map[x][y]=42&map[foo]=bar&map[array][][k]=v" }
+- end
+-
+ testing 'delete_if' do
+ m = Map.for(:k => :v)
+ assert{ m.delete_if{|k| k.to_s == 'k'} }
diff --git a/dev-ruby/map/files/ruby18-failing-tests.patch b/dev-ruby/map/files/ruby18-failing-tests.patch
new file mode 100644
index 0000000..c0a608f
--- /dev/null
+++ b/dev-ruby/map/files/ruby18-failing-tests.patch
@@ -0,0 +1,15 @@
+--- test/map_test.rb.old 2013-10-14 15:37:25.639883829 +0000
++++ test/map_test.rb 2013-10-14 15:37:33.747781899 +0000
+@@ -651,12 +651,6 @@
+ assert{ all_args == [[1, 2], [3, 4]] }
+ end
+
+- testing 'keeps every entry for which block is true and returns self' do
+- m = Map.new( { :a => 1 , :b => 2 , :c => 3 , :d => 4 } )
+- assert{ m.keep_if { |k,v| v % 2 == 0 }.object_id == m.object_id }
+- assert{ m == Map.new( { :b => 2 , :d => 4 } ) }
+- end
+-
+ testing 'it raises a RuntimeError if called on a frozen instance' do
+ m = Map.new( { :a => 1 } ).freeze
+
diff --git a/dev-ruby/map/map-5.5.0.ebuild b/dev-ruby/map/map-5.5.0.ebuild
new file mode 100644
index 0000000..2c361d2
--- /dev/null
+++ b/dev-ruby/map/map-5.5.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/map-5.5.0.ebuild,v 1.2 2012/04/29 16:50:39 tomka Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README TODO"
+
+RUBY_FAKEGEM_GEMSPEC="map.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies."
+HOMEPAGE="http://github.com/ahoward/map"
+
+LICENSE="|| ( Ruby BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby18)
+ epatch "${FILESDIR}/ruby18-failing-tests.patch"
+ ;;
+ *)
+ ;;
+ esac
+}
diff --git a/dev-ruby/map/map-6.5.1.ebuild b/dev-ruby/map/map-6.5.1.ebuild
new file mode 100644
index 0000000..327d6d6
--- /dev/null
+++ b/dev-ruby/map/map-6.5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/map-5.5.0.ebuild,v 1.2 2012/04/29 16:50:39 tomka Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="README TODO"
+
+RUBY_FAKEGEM_GEMSPEC="map.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies."
+HOMEPAGE="http://github.com/ahoward/map"
+
+LICENSE="|| ( Ruby BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE=""
+
+each_ruby_prepare() {
+ case ${RUBY} in
+ *ruby18)
+ epatch "${FILESDIR}/ruby18-failing-tests.patch"
+ epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
+ ;;
+ *jruby)
+ #epatch "${FILESDIR}/ruby18-failing-tests.patch"
+ epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
+ ;;
+ *)
+ ;;
+ esac
+}
diff --git a/dev-ruby/map/metadata.xml b/dev-ruby/map/metadata.xml
new file mode 100644
index 0000000..8521361
--- /dev/null
+++ b/dev-ruby/map/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>ruby</herd>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/map/files/, dev-ruby/map/
@ 2013-10-22 18:03 Hans de Graaff
0 siblings, 0 replies; 2+ messages in thread
From: Hans de Graaff @ 2013-10-22 18:03 UTC (permalink / raw
To: gentoo-commits
commit: a4d1ea5feb6336ca3f9de6586728217c03f48b3d
Author: Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Tue Oct 22 17:55:32 2013 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 17:55:32 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/ruby-overlay.git;a=commit;h=a4d1ea5f
Moved to gentoo tree.
---
dev-ruby/map/ChangeLog | 16 -----
.../map/files/map-6.5.1-ruby18-failing-tests.patch | 75 ----------------------
dev-ruby/map/files/ruby18-failing-tests.patch | 15 -----
dev-ruby/map/map-5.5.0.ebuild | 32 ---------
dev-ruby/map/map-6.5.1.ebuild | 37 -----------
dev-ruby/map/metadata.xml | 5 --
6 files changed, 180 deletions(-)
diff --git a/dev-ruby/map/ChangeLog b/dev-ruby/map/ChangeLog
deleted file mode 100644
index c878fcc..0000000
--- a/dev-ruby/map/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-# ChangeLog for dev-ruby/map
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
- 15 Oct 2013; Peter Wilmott <p@p8952.info> map-6.5.1.ebuild:
- dev-ruby/map: remove TODO doc
-
-*map-5.5.0 (14 Oct 2013)
-*map-6.5.1 (14 Oct 2013)
-
- 14 Oct 2013; Peter Wilmott <p@p8952.info>
- +files/map-6.5.1-ruby18-failing-tests.patch,
- +files/ruby18-failing-tests.patch, +map-5.5.0.ebuild, +map-6.5.1.ebuild,
- +metadata.xml:
- dev-ruby/map: remove ree18 targets, fix tests on ruby18, add ruby20 targets,
- version bump
diff --git a/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch b/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
deleted file mode 100644
index d33a5fa..0000000
--- a/dev-ruby/map/files/map-6.5.1-ruby18-failing-tests.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- test/map_test.rb.old 2013-10-14 17:23:08.612541725 +0100
-+++ test/map_test.rb 2013-10-14 17:24:20.001644242 +0100
-@@ -405,47 +405,6 @@
- assert{ m[:key][0].is_a?(Map) }
- end
-
-- testing 'that #add overlays the leaves of one hash onto another without nuking branches' do
-- m = Map.new
--
-- assert do
-- m.add(
-- :comments => [
-- { :body => 'a' },
-- { :body => 'b' },
-- ],
--
-- [:comments, 0] => {'title' => 'teh title', 'description' => 'description'},
-- [:comments, 1] => {'description' => 'description'},
-- )
-- end
--
-- assert do
-- m =~
-- {"comments"=>
-- [{"body"=>"a", "title"=>"teh title", "description"=>"description"},
-- {"body"=>"b", "description"=>"description"}]}
-- end
--
-- m = Map.new
--
-- assert do
-- m.add(
-- [:a, :b, :c] => 42,
--
-- [:a, :b] => {:d => 42.0}
-- )
-- end
--
-- assert do
-- m =~
-- {"a"=>{"b"=>{"c"=>42, "d"=>42.0}}}
-- end
--
-- assert{ Map.new.tap{|i| i.add} =~ {} }
-- assert{ Map.new.tap{|i| i.add({})} =~ {} }
-- end
--
- testing 'that Map.combine is teh sweet' do
- {
- [{:a => {:b => 42}}, {:a => {:c => 42.0}}] =>
-@@ -734,24 +693,6 @@
- assert{ map.list.class != Array }
- end
-
-- testing 'rack compatible params' do
-- m = Map.for(:a => [{}, {:b => 42}], :x => [ nil, [ nil, {:y => 42}] ], :A => {:B => {:C => 42}})
--
-- assert{ m.param_for(:a, 1, :b) == 'map[a][][b]=42' }
-- assert{ m.name_for(:a, 1, :b) == 'map[a][][b]' }
--
-- assert{ m.param_for(:x, 1, 1, :y) == 'map[x][][][y]=42' }
-- assert{ m.name_for(:x, 1, 1, :y) == 'map[x][][][y]' }
--
-- assert{ m.param_for(:A, :B, :C) == 'map[A][B][C]=42' }
-- assert{ m.name_for(:A, :B, :C) == 'map[A][B][C]' }
--
-- assert{ m.name_for(:A, :B, :C, :prefix => :foo) == 'foo[A][B][C]' }
--
-- m = Map.for({"a"=>{"b"=>42}, "x"=>{"y"=>42}, "foo"=>:bar, "array"=>[{"k"=>:v}]})
-- assert{ m.to_params == "map[a][b]=42&map[x][y]=42&map[foo]=bar&map[array][][k]=v" }
-- end
--
- testing 'delete_if' do
- m = Map.for(:k => :v)
- assert{ m.delete_if{|k| k.to_s == 'k'} }
diff --git a/dev-ruby/map/files/ruby18-failing-tests.patch b/dev-ruby/map/files/ruby18-failing-tests.patch
deleted file mode 100644
index c0a608f..0000000
--- a/dev-ruby/map/files/ruby18-failing-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- test/map_test.rb.old 2013-10-14 15:37:25.639883829 +0000
-+++ test/map_test.rb 2013-10-14 15:37:33.747781899 +0000
-@@ -651,12 +651,6 @@
- assert{ all_args == [[1, 2], [3, 4]] }
- end
-
-- testing 'keeps every entry for which block is true and returns self' do
-- m = Map.new( { :a => 1 , :b => 2 , :c => 3 , :d => 4 } )
-- assert{ m.keep_if { |k,v| v % 2 == 0 }.object_id == m.object_id }
-- assert{ m == Map.new( { :b => 2 , :d => 4 } ) }
-- end
--
- testing 'it raises a RuntimeError if called on a frozen instance' do
- m = Map.new( { :a => 1 } ).freeze
-
diff --git a/dev-ruby/map/map-5.5.0.ebuild b/dev-ruby/map/map-5.5.0.ebuild
deleted file mode 100644
index 2c361d2..0000000
--- a/dev-ruby/map/map-5.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/map-5.5.0.ebuild,v 1.2 2012/04/29 16:50:39 tomka Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README TODO"
-
-RUBY_FAKEGEM_GEMSPEC="map.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies."
-HOMEPAGE="http://github.com/ahoward/map"
-
-LICENSE="|| ( Ruby BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby18)
- epatch "${FILESDIR}/ruby18-failing-tests.patch"
- ;;
- *)
- ;;
- esac
-}
diff --git a/dev-ruby/map/map-6.5.1.ebuild b/dev-ruby/map/map-6.5.1.ebuild
deleted file mode 100644
index 1ffee35..0000000
--- a/dev-ruby/map/map-6.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/map/map-5.5.0.ebuild,v 1.2 2012/04/29 16:50:39 tomka Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ruby19 ruby20 jruby"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README"
-
-RUBY_FAKEGEM_GEMSPEC="map.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A string/symbol indifferent ordered hash that works in all rubies."
-HOMEPAGE="http://github.com/ahoward/map"
-
-LICENSE="|| ( Ruby BSD-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-each_ruby_prepare() {
- case ${RUBY} in
- *ruby18)
- epatch "${FILESDIR}/ruby18-failing-tests.patch"
- epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
- ;;
- *jruby)
- #epatch "${FILESDIR}/ruby18-failing-tests.patch"
- epatch "${FILESDIR}/${P}-ruby18-failing-tests.patch"
- ;;
- *)
- ;;
- esac
-}
diff --git a/dev-ruby/map/metadata.xml b/dev-ruby/map/metadata.xml
deleted file mode 100644
index 8521361..0000000
--- a/dev-ruby/map/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>ruby</herd>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-22 18:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-14 17:40 [gentoo-commits] proj/ruby-overlay:master commit in: dev-ruby/map/files/, dev-ruby/map/ Peter Wilmott
-- strict thread matches above, loose matches on Subject: below --
2013-10-22 18:03 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox