Skip to content

Commit 6cc0913

Browse files
author
Lucas Nussbaum
committed
[dev/wiki] Improve footer (bug 9289)
1 parent 9182a0c commit 6cc0913

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

generators/wiki/lib/generators/cpu_parameters.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def generate_content
5353
#Table construction
5454
table_options = 'class="wikitable sortable"'
5555
@generated_content = MW.generate_table(table_options, table_columns, table_data)
56-
@generated_content += MW.italic(MW.small("Generated from the Grid5000 APIs on " + Time.now.strftime("%Y-%m-%d")))
56+
@generated_content += MW.italic(MW.small(generated_date_string))
5757
@generated_content += MW::LINE_FEED
5858
end
5959
end

generators/wiki/lib/generators/disk_reservation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def generate_content
4242
# Table construction
4343
table_options = 'class="wikitable sortable"'
4444
@generated_content = MW.generate_table(table_options, table_columns, table_data)
45-
@generated_content += MW.italic(MW.small("Generated from the Grid5000 APIs on " + Time.now.strftime("%Y-%m-%d")))
45+
@generated_content += MW.italic(MW.small(generated_date_string))
4646
@generated_content += MW::LINE_FEED
4747
end
4848

generators/wiki/lib/generators/hardware.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def generate_content
1717
@generated_content += "\n= Clusters =\n"
1818
@generated_content += SiteHardwareGenerator.generate_all_clusters
1919
@generated_content += generate_totals
20-
@generated_content += MW.italic(MW.small("Generated from the Grid5000 APIs on " + Time.now.strftime("%Y-%m-%d")))
20+
@generated_content += MW.italic(MW.small(generated_date_string))
2121
@generated_content += MW::LINE_FEED
2222
end
2323

generators/wiki/lib/generators/oar_properties.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ def generate_content
219219
@generated_content += MW::LIST_ITEM + " Possible values: " + MW::code(@@properties[property]["possible_values"]) + MW::LINE_FEED
220220
}
221221
}
222+
@generated_content += MW.italic(MW.small(generated_date_string))
223+
@generated_content += MW::LINE_FEED
222224
end
223225
end
224226

generators/wiki/lib/generators/site_hardware.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def generate_content
1616
@generated_content += "'''#{generate_oneline_summary}'''\n"
1717
@generated_content += self.class.generate_summary(@site, false)
1818
@generated_content += self.class.generate_description(@site)
19-
@generated_content += MW.italic(MW.small('Generated from the Grid5000 APIs on ' + Time.now.strftime('%Y-%m-%d')))
19+
@generated_content += MW.italic(MW.small(generated_date_string))
2020
@generated_content += MW::LINE_FEED
2121
end
2222

generators/wiki/lib/wiki_generator.rb

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,16 @@ def generate_content
4242
raise "To be implemented in actual generators"
4343
end
4444

45+
def remove_page_creation_date(content)
46+
return content.gsub(/''<small>Last generated from the Grid5000 API on .+<\/small>''/, '')
47+
end
48+
49+
def generated_date_string
50+
commit = `git show --oneline -s`.split(' ').first
51+
date = Time.now.strftime("%Y-%m-%d")
52+
return "Last generated from the Grid5000 Reference API on #{date} ([https://github.com/grid5000/reference-repository/commit/#{commit} commit #{commit}])"
53+
end
54+
4555
#Actually edit the mediawiki page with the new generated content
4656
def update_page
4757
@mw_client.edit({"title" => @page_name, "text" => @generated_content })
@@ -64,10 +74,6 @@ def diff_page()
6474
return false
6575
end
6676

67-
def remove_page_creation_date(content)
68-
return content.gsub(/''<small>Generated from the Grid5000 APIs on .+<\/small>''/, '')
69-
end
70-
7177
def update_files
7278
@files.each { |file|
7379
@mw_client.update_file(file['filename'], file['path'], file['content_type'], file['comment'], true)
@@ -112,7 +118,7 @@ def self.parse_options
112118

113119
options = {
114120
:generators => [],
115-
:sites => G5K::SITES,
121+
:sites => ['global'] + G5K::SITES,
116122
:diff => false,
117123
:print => false,
118124
:update => false,

0 commit comments

Comments
 (0)