1
0
Эх сурвалжийг харах

Merge pull request #1042 from simon04/ansible-2.8

ansible: add version 2.8
Jasper van Merle 6 жил өмнө
parent
commit
85d591e4a7

+ 1 - 1
assets/javascripts/templates/pages/about_tmpl.coffee

@@ -88,7 +88,7 @@ credits = [
     'https://creativecommons.org/licenses/by/4.0/'
   ], [
     'Ansible',
-    '2012-2018 Michael DeHaan<br>&copy; 2018 Red Hat, Inc.',
+    '2012-2018 Michael DeHaan<br>&copy; 2018–2019 Red Hat, Inc.',
     'GPLv3',
     'https://raw.githubusercontent.com/ansible/ansible/devel/COPYING'
   ], [

+ 26 - 50
lib/docs/scrapers/ansible.rb

@@ -11,72 +11,47 @@ module Docs
 
     options[:attribution] = <<-HTML
       &copy; 2012&ndash;2018 Michael DeHaan<br>
-      &copy; 2018 Red Hat, Inc.<br>
+      &copy; 2018&ndash;2019 Red Hat, Inc.<br>
       Licensed under the GNU General Public License version 3.
     HTML
 
-    version '2.7' do
-      self.release = '2.7.1'
-      self.base_url = 'https://docs.ansible.com/ansible/2.7/'
+    options[:skip] = %w(
+      installation_guide/index.html
+      reference_appendices/glossary.html
+      reference_appendices/faq.html
+      reference_appendices/tower.html
+      user_guide/quickstart.html
+      modules/modules_by_category.html
+      modules/list_of_all_modules.html)
 
-      options[:skip] = %w(
-        installation_guide/index.html
-        reference_appendices/glossary.html
-        reference_appendices/faq.html
-        reference_appendices/tower.html
-        user_guide/quickstart.html
-        modules/modules_by_category.html
-        modules/list_of_all_modules.html)
+    options[:skip_patterns] = [
+      /\Acommunity.*/i,
+      /\Adev_guide.*/i,
+      /\Aroadmap.*/i,
+    ]
 
-      options[:skip_patterns] = [
-        /\Acommunity.*/i,
-        /\Adev_guide.*/i,
-        /\Aroadmap.*/i,
-      ]
+    version '2.8' do
+      self.release = '2.8.3'
+      self.base_url = 'https://docs.ansible.com/ansible/2.7/'
+    end
+
+    version '2.7' do
+      self.release = '2.7.12'
+      self.base_url = 'https://docs.ansible.com/ansible/2.7/'
     end
 
     version '2.6' do
-      self.release = '2.6.7'
+      self.release = '2.6.18'
       self.base_url = 'https://docs.ansible.com/ansible/2.6/'
-
-      options[:skip] = %w(
-        installation_guide/index.html
-        reference_appendices/glossary.html
-        reference_appendices/faq.html
-        reference_appendices/tower.html
-        user_guide/quickstart.html
-        modules/modules_by_category.html
-        modules/list_of_all_modules.html)
-
-      options[:skip_patterns] = [
-        /\Acommunity.*/i,
-        /\Adev_guide.*/i,
-        /\Aroadmap.*/i,
-      ]
     end
 
     version '2.5' do
-      self.release = '2.5.3'
+      self.release = '2.5.15'
       self.base_url = 'https://docs.ansible.com/ansible/2.5/'
-
-      options[:skip] = %w(
-        installation_guide/index.html
-        reference_appendices/glossary.html
-        reference_appendices/faq.html
-        reference_appendices/tower.html
-        user_guide/quickstart.html
-        modules/modules_by_category.html
-        modules/list_of_all_modules.html)
-
-      options[:skip_patterns] = [
-        /\Acommunity.*/i,
-        /\Adev_guide.*/i,
-        /\Aroadmap.*/i,
-      ]
     end
 
     version '2.4' do
-      self.release = '2.4.3'
+      self.release = '2.4.6'
       self.base_url = 'https://docs.ansible.com/ansible/2.4/'
 
       options[:skip] = %w(
@@ -86,6 +61,7 @@ module Docs
         tower.html
         quickstart.html
         list_of_all_modules.html)
+      options[:skip_patterns] = []
     end
 
     def get_latest_version(opts)