[DRE-commits] [ruby-toml] 01/05: Fix for Parslet 1.7 (Closes: #818155)

[Cédric Boutillier]

This is an automated email from the git hooks/post-receive script.

boutil pushed a commit to branch master
in repository ruby-toml.

commit e340238d72183e1a2e964b09823f7da7e51bd579
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Jun 6 08:03:07 2016 +0200

    Fix for Parslet 1.7 (Closes: #818155)
---
 debian/patches/0003_parslet17.patch | 54 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  2 ++
 2 files changed, 56 insertions(+)

diff --git a/debian/patches/0003_parslet17.patch b/debian/patches/0003_parslet17.patch
new file mode 100644
index 0000000..dc90c34
--- /dev/null
+++ b/debian/patches/0003_parslet17.patch
@@ -0,0 +1,54 @@
+Description: reorder rules in transformation
+ Parslet 1.7.1 changed the order of insertion of new rules so that new rules
+ have higher priority than older rules.
+Bug: https://github.com/jm/toml/issues/43
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818155
+Forwarded: https://github.com/jm/toml/pull/44
+Author: Cédric Boutillier <boutil at debian.org>
+Last-Update: 2016-06-06
+
+--- a/lib/toml/transformer.rb
++++ b/lib/toml/transformer.rb
+@@ -92,23 +92,23 @@
+     # Make key hashes (inside key_groups) just be strings
+     rule(:key => simple(:k)) { k }
+ 
+-    # Then objectify the key_groups
+-    rule(:table => simple(:kg)) {
+-      Table.new([kg.to_s])
+-    }
+-
+     # Captures array-like key-groups
+     rule(:table => subtree(:kg)) {
+       Table.new(kg.map &:to_s)
+     }
+     
+-    # Single name table-arrays
+-    rule(:table_array => simple(:name)) {
+-      TableArray.new([name.to_s])
++    # Then objectify the key_groups
++    rule(:table => simple(:kg)) {
++      Table.new([kg.to_s])
+     }
++
+     # Multi-part (a.b.c) table-arrays
+     rule(:table_array => subtree(:names)) {
+       TableArray.new(names.map &:to_s)
+     }
++    # Single name table-arrays
++    rule(:table_array => simple(:name)) {
++      TableArray.new([name.to_s])
++    }
+   end
+ end
+--- a/toml.gemspec
++++ b/toml.gemspec
+@@ -26,7 +26,7 @@
+   s.rdoc_options = ["--charset=UTF-8"]
+   s.extra_rdoc_files = %w[README.md LICENSE CHANGELOG.md]
+ 
+-  s.add_dependency "parslet", "~> 1.5.0"
++  s.add_dependency "parslet", "~> 1.7.0"
+ 
+   s.add_development_dependency "rake"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dd7af58..d16ddc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-Drop-RubyGems-And-Bundler-Dependencies.patch
 0002-Replace-gemspec-git-execution.patch
+#parslet17.patch
+0003_parslet17.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-toml.git