History

Merge pull request #1042 from simon04/ansible-2.8

Jasper van Merle committed 7 years ago

Commit 85d591e2 parents 1b6cb0e f05a8fd2 files · +27 −51Browse files

Unified · Split

2 files
  1. assets/javascripts/templates/pages/about_tmpl.coffee +1 −1
  2. lib/docs/scrapers/ansible.rb +26 −50
assets/javascripts/templates/pages/about_tmpl.coffee+1−1
@@ -88,7 +88,7 @@ credits = [ · 87 unmodified lines
88 'https://creativecommons.org/licenses/by/4.0/'88 'https://creativecommons.org/licenses/by/4.0/'
89 ], [89 ], [
90 'Ansible',90 'Ansible',
91 '2012-2018 Michael DeHaan<br>&copy; 2018 Red Hat, Inc.',91 '2012-2018 Michael DeHaan<br>&copy; 2018–2019 Red Hat, Inc.',
92 'GPLv3',92 'GPLv3',
93 'https://raw.githubusercontent.com/ansible/ansible/devel/COPYING'93 'https://raw.githubusercontent.com/ansible/ansible/devel/COPYING'
94 ], [94 ], [
lib/docs/scrapers/ansible.rb+26−50
@@ -11,72 +11,47 @@ module Docs · 10 unmodified lines
11 11
12 options[:attribution] = <<-HTML12 options[:attribution] = <<-HTML
13 &copy; 2012&ndash;2018 Michael DeHaan<br>13 &copy; 2012&ndash;2018 Michael DeHaan<br>
14 &copy; 2018 Red Hat, Inc.<br>14 &copy; 2018&ndash;2019 Red Hat, Inc.<br>
15 Licensed under the GNU General Public License version 3.15 Licensed under the GNU General Public License version 3.
16 HTML16 HTML
17 17
18 version '2.7' do18 options[:skip] = %w(
19 self.release = '2.7.1'19 installation_guide/index.html
20 self.base_url = 'https://docs.ansible.com/ansible/2.7/'20 reference_appendices/glossary.html
21 reference_appendices/faq.html
22 reference_appendices/tower.html
23 user_guide/quickstart.html
24 modules/modules_by_category.html
25 modules/list_of_all_modules.html)
21 26
22 options[:skip] = %w(27 options[:skip_patterns] = [
23 installation_guide/index.html28 /\Acommunity.*/i,
24 reference_appendices/glossary.html29 /\Adev_guide.*/i,
25 reference_appendices/faq.html30 /\Aroadmap.*/i,
26 reference_appendices/tower.html31 ]
27 user_guide/quickstart.html
28 modules/modules_by_category.html
29 modules/list_of_all_modules.html)
30 32
31 options[:skip_patterns] = [33 version '2.8' do
32 /\Acommunity.*/i,34 self.release = '2.8.3'
33 /\Adev_guide.*/i,35 self.base_url = 'https://docs.ansible.com/ansible/2.7/'
34 /\Aroadmap.*/i,36 end
35 ]37
38 version '2.7' do
39 self.release = '2.7.12'
40 self.base_url = 'https://docs.ansible.com/ansible/2.7/'
36 end41 end
37 42
38 version '2.6' do43 version '2.6' do
39 self.release = '2.6.7'44 self.release = '2.6.18'
40 self.base_url = 'https://docs.ansible.com/ansible/2.6/'45 self.base_url = 'https://docs.ansible.com/ansible/2.6/'
41
42 options[:skip] = %w(
43 installation_guide/index.html
44 reference_appendices/glossary.html
45 reference_appendices/faq.html
46 reference_appendices/tower.html
47 user_guide/quickstart.html
48 modules/modules_by_category.html
49 modules/list_of_all_modules.html)
50
51 options[:skip_patterns] = [
52 /\Acommunity.*/i,
53 /\Adev_guide.*/i,
54 /\Aroadmap.*/i,
55 ]
56 end46 end
57 47
58 version '2.5' do48 version '2.5' do
59 self.release = '2.5.3'49 self.release = '2.5.15'
60 self.base_url = 'https://docs.ansible.com/ansible/2.5/'50 self.base_url = 'https://docs.ansible.com/ansible/2.5/'
61
62 options[:skip] = %w(
63 installation_guide/index.html
64 reference_appendices/glossary.html
65 reference_appendices/faq.html
66 reference_appendices/tower.html
67 user_guide/quickstart.html
68 modules/modules_by_category.html
69 modules/list_of_all_modules.html)
70
71 options[:skip_patterns] = [
72 /\Acommunity.*/i,
73 /\Adev_guide.*/i,
74 /\Aroadmap.*/i,
75 ]
76 end51 end
77 52
78 version '2.4' do53 version '2.4' do
79 self.release = '2.4.3'54 self.release = '2.4.6'
80 self.base_url = 'https://docs.ansible.com/ansible/2.4/'55 self.base_url = 'https://docs.ansible.com/ansible/2.4/'
81 56
82 options[:skip] = %w(57 options[:skip] = %w(
@@ -86,6 +61,7 @@ module Docs · 3 unmodified lines
86 tower.html61 tower.html
87 quickstart.html62 quickstart.html
88 list_of_all_modules.html)63 list_of_all_modules.html)
64 options[:skip_patterns] = []
89 end65 end
90 66
91 def get_latest_version(opts)67 def get_latest_version(opts)