EOL dates should be after last release date

kowal · Oct 2, 2023 · e768e11 · e768e11
1 parent 3e28d42
commit e768e11
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 44 deletions.
diff --git a/data/ruby_versions.json b/data/ruby_versions.json
@@ -285,7 +285,7 @@
       "version": "2.6",
       "version_info": "2.6.0 (Dec 2018) - 2.6.10 (Apr 2022)",
       "state": "All maintenance ended on April 12, 2022",
-      "eol": "2022-04-12",
+      "eol": "2022-04-13",
       "minors": [
         { "version": "2.6.10", "release_date": "2022-04-12", "end_date": "" },
         { "version": "2.6.9", "release_date": "2021-11-24", "end_date": "2022-04-12" },
@@ -340,7 +340,7 @@
       "version": "2.5",
       "version_info": "2.5.0 (Dec 2017) - 2.5.9 (Apr 2021)",
       "state": "All maintenance ended on April 5, 2021",
-      "eol": "2021-03-31",
+      "eol": "2021-04-06",
       "minors": [
         { "version": "2.5.9", "release_date": "2021-04-05", "end_date": "" },
         { "version": "2.5.8", "release_date": "2020-03-31", "end_date": "2021-04-05" },
@@ -422,7 +422,7 @@
       "version": "2.4",
       "version_info": "2.4.0 (Dec 2016) - 2.4.10 (Mar 2020)",
       "state": "All maintenance ended on March 31, 2020",
-      "eol": "2020-03-31",
+      "eol": "2020-04-01",
       "minors": [
         { "version": "2.4.10", "release_date": "2020-03-31", "end_date": "" },
         { "version": "2.4.9", "release_date": "2019-10-02", "end_date": "2020-03-31" },

diff --git a/docs/docs/javascripts/charts-timeline.js b/docs/docs/javascripts/charts-timeline.js
diff --git a/docs/docs/timeline.md b/docs/docs/timeline.md
@@ -24,4 +24,4 @@
 
 ----
 
-(Last updated on 2023-09-20 20:20:16 +0200)
+(Last updated on 2023-10-02 10:54:12 +0200)
diff --git a/docs/docs/versions-all.md b/docs/docs/versions-all.md
@@ -222,7 +222,7 @@
 ----
 
 
-## Ruby 2.6 <div class='icon-label eol' title='All maintenance ended on 2022-04-12'><div data-icon='ei-lock' data-size='s'></div></div>
+## Ruby 2.6 <div class='icon-label eol' title='All maintenance ended on 2022-04-13'><div data-icon='ei-lock' data-size='s'></div></div>
 
 
 ### Ruby [2.6.10](https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/) <div class='icon-label calendar' title='Released on 2022-04-12'><div data-icon='ei-calendar' data-size='s'></div></div>
@@ -307,7 +307,7 @@
 ----
 
 
-## Ruby 2.5 <div class='icon-label eol' title='All maintenance ended on 2021-03-31'><div data-icon='ei-lock' data-size='s'></div></div>
+## Ruby 2.5 <div class='icon-label eol' title='All maintenance ended on 2021-04-06'><div data-icon='ei-lock' data-size='s'></div></div>
 
 
 ### Ruby [2.5.9](https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-5-9-released/) <div class='icon-label calendar' title='Released on 2021-04-05'><div data-icon='ei-calendar' data-size='s'></div></div>
@@ -395,7 +395,7 @@
 ----
 
 
-## Ruby 2.4 <div class='icon-label eol' title='All maintenance ended on 2020-03-31'><div data-icon='ei-lock' data-size='s'></div></div>
+## Ruby 2.4 <div class='icon-label eol' title='All maintenance ended on 2020-04-01'><div data-icon='ei-lock' data-size='s'></div></div>
 
 
 ### Ruby [2.4.10](https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-4-10-released/) <div class='icon-label calendar' title='Released on 2020-03-31'><div data-icon='ei-calendar' data-size='s'></div></div>
@@ -579,4 +579,4 @@
 
 ----
 
-(Last updated on 2023-09-20 20:20:16 +0200)
+(Last updated on 2023-10-02 10:54:12 +0200)
diff --git a/docs/docs/versions-latest.md b/docs/docs/versions-latest.md
@@ -193,7 +193,7 @@ end</code>
 
 
 
-## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/">2.6.10</a> <div class='icon-label eol' title='All maintenance ended on 2022-04-12'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2022-04-12'><div data-icon='ei-calendar' data-size='s'></div></div>
+## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2022/04/12/ruby-2-6-10-released/">2.6.10</a> <div class='icon-label eol' title='All maintenance ended on 2022-04-13'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2022-04-12'><div data-icon='ei-calendar' data-size='s'></div></div>
 
   - <span class='badge badge-pill badge-success'>Added</span>
   endless ranges <code>(1..)</code>
@@ -216,7 +216,7 @@ end</code>
 
 
 
-## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-5-9-released/">2.5.9</a> <div class='icon-label eol' title='All maintenance ended on 2021-03-31'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2021-04-05'><div data-icon='ei-calendar' data-size='s'></div></div>
+## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2021/04/05/ruby-2-5-9-released/">2.5.9</a> <div class='icon-label eol' title='All maintenance ended on 2021-04-06'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2021-04-05'><div data-icon='ei-calendar' data-size='s'></div></div>
 
   - <span class='badge badge-pill badge-success'>Added</span>
   <code>yield_self</code>
@@ -267,7 +267,7 @@ This will be reversed again in Ruby 3.0.0</code>
 
 
 
-## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-4-10-released/">2.4.10</a> <div class='icon-label eol' title='All maintenance ended on 2020-03-31'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2020-03-31'><div data-icon='ei-calendar' data-size='s'></div></div>
+## Ruby <a target='_blank' href="https://www.ruby-lang.org/en/news/2020/03/31/ruby-2-4-10-released/">2.4.10</a> <div class='icon-label eol' title='All maintenance ended on 2020-04-01'><div data-icon='ei-lock' data-size='s'></div></div> <div class='icon-label calendar' title='Released on 2020-03-31'><div data-icon='ei-calendar' data-size='s'></div></div>
 
   - <span class='badge badge-pill badge-success'>Added</span>
   <code>Enumerable#sum</code>
@@ -346,4 +346,4 @@ This will be reversed again in Ruby 3.0.0</code>
 
 ----
 
-(Last updated on 2023-09-20 20:20:16 +0200)
+(Last updated on 2023-10-02 10:54:12 +0200)
diff --git a/lib/templates/docs/charts/timeline.js.erb b/lib/templates/docs/charts/timeline.js.erb
@@ -8,19 +8,6 @@ window.onload = function () {
     google.charts.setOnLoadCallback(drawChart);
   }
 
-  function removeSidebars() {
-    const sidebarsPrimary = document.querySelectorAll('.md-sidebar.md-sidebar--primary');
-    const sidebarsSecondary = document.querySelectorAll('.md-sidebar.md-sidebar--secondary');
-
-    sidebarsPrimary.forEach(box => {
-      box.remove();
-    });
-
-    sidebarsSecondary.forEach(box => {
-      box.remove();
-    });
-  }
-
   function getChartRows() {
     return mapDateParams(<%= ruby_versions.map do |rb|
       [*rb['minors']].map do |minor|
@@ -33,7 +20,7 @@ window.onload = function () {
             rb['changes'].map { |ch| ch['summary'] }.join('<br>')
           end),
           minor['release_date'],
-          minor['end_date'] != '' ? minor['end_date'] : Date.today.to_s
+          minor['end_date'] != '' ? minor['end_date'] : (rb['eol'] || Date.todat.to_s)
         ]
       end
     end.flatten(1).to_json %>)
@@ -49,7 +36,7 @@ window.onload = function () {
         new Date(el[4])
       ];
     });
-  }
+  };
 
   function drawChart() {
     var container = document.getElementById('timeline');
@@ -83,4 +70,17 @@ window.onload = function () {
         chart.draw(dataTable, options);
     } 
   };
-}
+
+  function removeSidebars() {
+    const sidebarsPrimary = document.querySelectorAll('.md-sidebar.md-sidebar--primary');
+    const sidebarsSecondary = document.querySelectorAll('.md-sidebar.md-sidebar--secondary');
+
+    sidebarsPrimary.forEach(box => {
+      box.remove();
+    });
+
+    sidebarsSecondary.forEach(box => {
+      box.remove();
+    });
+  };
+}