Patch #31556

Update Rouge to 3.12.0

Added by Marius BALTEANU 6 months ago. Updated about 1 month ago.

Status:ClosedStart date:
Priority:NormalDue date:
Assignee:Go MAEDA% Done:

0%

Category:Gems support
Target version:4.1.0

0001-Update-rouge-to-3.4.0.patch Magnifier (602 Bytes) Marius BALTEANU, 2019-06-12 08:20

0001-Update-rouge-to-3.4.1.patch Magnifier (602 Bytes) Marius BALTEANU, 2019-06-13 09:07

31556-update-test.patch Magnifier (1004 Bytes) Go MAEDA, 2019-06-13 09:19

0001-Bump-rouge-to-3.7.0.patch Magnifier (599 Bytes) Marius BALTEANU, 2019-08-04 21:45

Associated revisions

Revision 18258
Added by Go MAEDA 6 months ago

Update Rouge to 3.4.1 (#31556).

Patch by Marius BALTEANU and Go MAEDA.

Revision 18319
Added by Go MAEDA 6 months ago

Update Rouge to 3.5.1 (#31556).

Revision 18352
Added by Go MAEDA 4 months ago

Update Rouge to 3.7.0 (#31556).

Patch by Marius BALTEANU.

Revision 18369
Added by Go MAEDA 4 months ago

Update Rouge to 3.8.0 (#31556).

Patch by Go MAEDA.

Revision 18382
Added by Go MAEDA 4 months ago

Update Rouge to 3.9.0 (#31556).

Revision 18424
Added by Go MAEDA 3 months ago

Update Rouge to 3.10.0 (#31556).

Revision 18482
Added by Go MAEDA 3 months ago

Update Rouge to 3.11.0 (#31556).

Revision 18710
Added by Go MAEDA about 1 month ago

Update Rouge to 3.12.0 (#31556).

History

#2 Updated by Marius BALTEANU 6 months ago

#3 Updated by Go MAEDA 6 months ago

This is due to the change https://github.com/rouge-ruby/rouge/pull/1165/. Rouge changed the CSS class for quotation marks in 3.4.0, so we can simply update the test.

By the way, how about delivering this in 4.1.0 instead of 4.2.0?

#4 Updated by Marius BALTEANU 6 months ago

Go MAEDA wrote:

This is due to the change https://github.com/rouge-ruby/rouge/pull/1165/. Rouge changed the CSS class for quotation marks in 3.4.0, so we can simply update the test.

By the way, how about delivering this in 4.1.0 instead of 4.2.0?

Now that 3.4.1 is out with a hot fix, I think it is safe.

#5 Updated by Go MAEDA 6 months ago

  • Target version changed from 4.2.0 to 4.1.0

Setting the target version to 4.1.0.

#6 Updated by Go MAEDA 6 months ago

  • Status changed from New to Closed
  • Assignee set to Go MAEDA

Committed the patch. Thanks.

#7 Updated by Go MAEDA 6 months ago

  • Subject changed from Update Rouge to 3.4.1 to Update Rouge to 3.5.1
  • Status changed from Closed to Reopened

Rouge 3.5.1 has been released on July 25th.

It passed all the tests. I think we can update Rouge to 3.5.1.

diff --git a/Gemfile b/Gemfile
index ecd3bd150..4b7350e40 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "bundler", ">= 1.5.0" 

 gem "rails", "5.2.3" 
-gem "rouge", "~> 3.4.1" 
+gem "rouge", "~> 3.5.1" 
 gem "request_store", "1.0.5" 
 gem "mini_mime", "~> 1.0.1" 
 gem "actionpack-xml_parser" 

#8 Updated by Go MAEDA 6 months ago

  • Status changed from Reopened to Closed

Updated Rouge to 3.5.1 in r18319.

#9 Updated by Marius BALTEANU 4 months ago

  • File 0001-Bump-rouge-to-3.7.0.patchMagnifier added
  • Subject changed from Update Rouge to 3.5.1 to Update Rouge to 3.7.0
  • Status changed from Closed to Reopened

#10 Updated by Go MAEDA 4 months ago

  • Status changed from Reopened to Closed

Marius BALTEANU wrote:

Rouge 3.6.0 and 3.7.0 Changelog: https://github.com/rouge-ruby/rouge/blob/master/README.md

Tests pass: https://gitlab.com/redmine-org/redmine/pipelines/74619202

Committed the patch. Thanks.

#11 Updated by Go MAEDA 4 months ago

  • Subject changed from Update Rouge to 3.7.0 to Update Rouge to 3.8.0
  • Status changed from Closed to Reopened

Rouge 3.8.0 has been released on 2019-08-07.
https://github.com/rouge-ruby/rouge/blob/master/CHANGELOG.md#version-380-2019-08-07

diff --git a/Gemfile b/Gemfile
index 4dc35ee83..e7ba3f4ae 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem "bundler", ">= 1.5.0" 

 gem "rails", "5.2.3" 
-gem "rouge", "~> 3.7.0" 
+gem "rouge", "~> 3.8.0" 
 gem "request_store", "1.0.5" 
 gem "mini_mime", "~> 1.0.1" 
 gem "actionpack-xml_parser" 
diff --git a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
index 16387966c..7df35ca64 100644
--- a/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
+++ b/test/unit/lib/redmine/syntax_highlighting/rouge_test.rb
@@ -24,7 +24,7 @@ class Redmine::SyntaxHighlighting::RougeTest < ActiveSupport::TestCase
     to_test = {
       'application.js' => true,
       'Gemfile' => true,
-      'AUTOEXEC.BAT' => false,  # Rouge does not support BAT files
+      'HELLO.CBL' => false,   # Rouge does not support COBOL
       'HELLO.C' => true
     }
     to_test.each do |filename, expected|

#12 Updated by Go MAEDA 4 months ago

  • Status changed from Reopened to Closed

Updated Rouge to 3.8.0 in r18369.

#13 Updated by Go MAEDA 4 months ago

  • Subject changed from Update Rouge to 3.8.0 to Update Rouge to 3.9.0

Updated Rouge to 3.9.0 in r18382.

#14 Updated by Go MAEDA 3 months ago

Updated Rouge to 3.10.0 in r18424.

#15 Updated by Go MAEDA 3 months ago

  • Subject changed from Update Rouge to 3.9.0 to Update Rouge to 3.10.0

#16 Updated by Go MAEDA 3 months ago

  • Subject changed from Update Rouge to 3.10.0 to Update Rouge to 3.11.0

Updated Rouge to 3.11.0 in r18482.

#17 Updated by Go MAEDA about 1 month ago

  • Subject changed from Update Rouge to 3.11.0 to Update Rouge to 3.12.0

Updated Rouge to 3.12.0 in r18710.

Also available in: Atom PDF