" + item.text + "
"
}
- }).select2("enable", false);
+ });
- $.ajax({
- url: api_url,
- dataType: "json",
- success: function (data) {
- var initial_value = getUrlVars()[name];
- if (initial_value) {
- initial_value = (initial_value).toLocaleLowerCase();
- } else if (data["default"]) {
- initial_value = data["default"];
+ if (name == 'date') {
+ var initial_value = getUrlVars()[name];
+ if (initial_value) {
+ initial_value = (initial_value).toLocaleLowerCase();
+ } else {
+ initial_value = 'all';
+ }
+ $(selectorId).val(initial_value).select2($.extend({
+ data: [{"text": "All", "id": "all"}, {"text": "7 days", "id": "7"}, {
+ "text": "30 days",
+ "id": "30"
+ }, {"text": "60 days", "id": "60"}, {"text": "90 days", "id": "90"}, {
+ "text": "180 days",
+ "id": "180"
+ }]
+ }, select2_extra_options)).on("select2-selecting", function (e) {
+ var options = {};
+ options[name] = e.val;
+ if (change_handler) {
+ change_handler(options);
}
- $(selectorId).
- val(initial_value).
- select2($.extend({
- data: data["data"]
- }, select2_extra_options)).
- on("select2-selecting",function (e) { /* don't use 'change' event, because it changes value and only after refreshes the page */
+ reload(options);
+ }).on("select2-removed", function (e) {
+ console.log('select2-removed');
+ var options = {};
+ options[name] = '';
+ reload(options);
+ }).select2("enable", true);
+ } else {
+ $.ajax({
+ url: api_url,
+ dataType: "json",
+ success: function (data) {
+ var initial_value = getUrlVars()[name];
+ if (initial_value) {
+ initial_value = (initial_value).toLocaleLowerCase();
+ } else if (window.location.pathname.split('/')[1] == 'cncf') {
+
+ switch (name) {
+ case "release":
+ initial_value = "all";
+ break;
+ case "metric":
+ initial_value = "commits";
+ break;
+ case "project_type":
+ initial_value = "cncf-group";
+ break;
+ default:
+ initial_value = data["default"];
+ break;
+ }
+ } else if (window.location.pathname.split('/')[1] == 'unaffiliated') {
+ switch (name) {
+ case "release":
+ initial_value = "all";
+ break;
+ case "metric":
+ initial_value = "commits";
+ break;
+ case "project_type":
+ initial_value = "unaffiliated";
+ break;
+ default:
+ initial_value = data["default"];
+ break;
+ }
+ } else if (data["default"]) {
+ initial_value = data["default"];
+ }
+
+
+ var selectData = data["data"];
+
+ if (name == 'project_type') {
+ selectData = processProjects(data["data"]);
+ }
+
+ if (name == 'release') {
+ var filter = "openstack";
+ }
+
+
+ $(selectorId).val(initial_value).select2($.extend({
+ data: selectData
+ }, select2_extra_options)).on("select2-selecting", function (e) {
var options = {};
options[name] = e.val;
if (change_handler) {
change_handler(options);
}
reload(options);
- }).
- on("select2-removed",function (e) {
+ }).on("select2-removed", function (e) {
+ console.log('select2-removed');
var options = {};
options[name] = '';
reload(options);
- }).
- select2("enable", true);
- }
- });
+ }).select2("enable", true);
+ }
+ });
+ }
}
function initSelectors(base_url) {
@@ -419,11 +628,40 @@ function initSelectors(base_url) {
});
initSingleSelector("module", makeURI(base_url + "/api/1.0/modules", {tags: "module,program,group"}), {
formatResultCssClass: function (item) {
- return (item.tag)? ("select_module_" + item.tag): "";
+ return (item.tag) ? ("select_module_" + item.tag) : "";
},
allowClear: true
});
initSingleSelector("company", makeURI(base_url + "/api/1.0/companies"), {allowClear: true});
initSingleSelector("user_id", makeURI(base_url + "/api/1.0/users"), {allowClear: true});
initSingleSelector("metric", makeURI(base_url + "/api/1.0/metrics"));
+ initSingleSelector("date", "", {allowClear: false});
+}
+
+function processProjects(data) {
+
+ var result = {};
+ var parent = "";
+ for (i = 0; i < data.length; i++) {
+ if (!data[i].child) {
+ //create new array
+ parent = data[i].id;
+ result[parent] = [data[i]]
+ } else {
+ result[parent].push(data[i]);
+ }
+ }
+
+ var url = window.location.pathname.split('/')[1];
+
+ var projects = result["all"];
+
+ if (url == "cncf") {
+ projects = result["cncf-group"];
+ }
+ if (url == "unaffiliated") {
+ projects = result["unaffiliated"];
+ }
+
+ return projects;
}
diff --git a/stackalytics/dashboard/templates/_macros/activity_log.html b/stackalytics/dashboard/templates/_macros/activity_log.html
index 44e11eb0f..06314045a 100644
--- a/stackalytics/dashboard/templates/_macros/activity_log.html
+++ b/stackalytics/dashboard/templates/_macros/activity_log.html
@@ -2,6 +2,8 @@
show_record_type=True, show_user_gravatar=True, gravatar_size=32, show_all=True,
show_twitter=False) -%}
+{% set page_url = request.base_url %}
+
{% if show_twitter %}
- Activity Log
- -
-
- More...
+ 
+
+
+
{%- endmacro %}
diff --git a/stackalytics/dashboard/templates/_macros/contribution_summary.html b/stackalytics/dashboard/templates/_macros/contribution_summary.html
index 5872dba42..e3d6bf5fd 100644
--- a/stackalytics/dashboard/templates/_macros/contribution_summary.html
+++ b/stackalytics/dashboard/templates/_macros/contribution_summary.html
@@ -52,7 +52,9 @@
{% endraw %}
- Activity Log {% if company %} | {{ company_original }}{% endif %}
+ +Contribution Summary
- + +
+
{%- endmacro %}
diff --git a/stackalytics/dashboard/templates/_macros/module_details.html b/stackalytics/dashboard/templates/_macros/module_details.html
index 15c61e6ac..b72619b42 100644
--- a/stackalytics/dashboard/templates/_macros/module_details.html
+++ b/stackalytics/dashboard/templates/_macros/module_details.html
@@ -11,7 +11,7 @@
var module = data["module"];
for (var i=0; i < module.modules.length; i++) {
if(!obj.hasOwnProperty(module.modules[i].module_name)){
- module.modules[i].uri = makeURI('/', {module: module.modules[i].module_name});
+ module.modules[i].uri = makeURI(document.location.pathname, {module: module.modules[i].module_name});
unique_array.push(module.modules[i]);
}
obj[module.modules[i].module_name] = module.modules[i];
diff --git a/stackalytics/dashboard/templates/_macros/user_profile.html b/stackalytics/dashboard/templates/_macros/user_profile.html
index 4fe37531d..4f1ab066e 100644
--- a/stackalytics/dashboard/templates/_macros/user_profile.html
+++ b/stackalytics/dashboard/templates/_macros/user_profile.html
@@ -25,7 +25,7 @@
Contribution Summary
+${user_name}
-Company: {%html company_link %}
+ Stackalytics {% if page_title %}| {{ page_title }} {% endif %}
{% if not page_title %}
-
+
{% else %}
{% endif %}
@@ -17,41 +18,61 @@
{% if page_title %}
-
-
-
-
-
-
+
+
+
+
+
+
{% endif %}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
-
+
-
-
-
+
+
+
@@ -61,6 +82,19 @@
+
+
+
+
+
+
+
{% if active_tab == 'driverlog' %}
{% else %}
@@ -73,10 +107,8 @@
-
-
+
+
- {% endif %}
-
-
- {% endif %}
-
- {% if show_module_breakdown %}
-
+
{% endif %}
{% if show_contribution_on_right %}
- {{ contribution_summary.show_contribution_summary(show_all=False) }}
- {{ show_report_links(module, company, user_id) }}
+ {{ contribution_summary.show_contribution_summary(show_all=False) }}
+ {{ show_report_links(module, company, user_id) }}
{% endif %}
{% if show_module_activity %}
- {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
+ {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
{% endif %}
+{% endblock %}
+
+{% block center_frame %}
+
+{% endblock %}
+
+{% block right_frame %}
+
+
+
+
+
{% endblock %}
diff --git a/stackalytics/dashboard/templates/reports/affiliation_changes.html b/stackalytics/dashboard/templates/reports/affiliation_changes.html
index 0ff23c047..66ee14f36 100644
--- a/stackalytics/dashboard/templates/reports/affiliation_changes.html
+++ b/stackalytics/dashboard/templates/reports/affiliation_changes.html
@@ -3,7 +3,7 @@
{% set page_title = 'Company Affiliation Changes' %}
{% block scripts %}
-
+
{% endblock %}
{% block content %}
-Company: {%html company_link.title %}
[how to change]
diff --git a/stackalytics/dashboard/templates/base.html b/stackalytics/dashboard/templates/base.html
index e3ba390d4..818173a37 100644
--- a/stackalytics/dashboard/templates/base.html
+++ b/stackalytics/dashboard/templates/base.html
@@ -2,12 +2,13 @@
-
+
-
- {% block body %}{% endblock %}
-
-
+
+ {% block body %}{% endblock %}
+
\ No newline at end of file
diff --git a/stackalytics/dashboard/templates/cncf.html b/stackalytics/dashboard/templates/cncf.html
new file mode 100644
index 000000000..2e11f304b
--- /dev/null
+++ b/stackalytics/dashboard/templates/cncf.html
@@ -0,0 +1,226 @@
+{% extends "cncf_layout.html" %}
+{% import '_macros/activity_log.html' as activity_log %}
+{% import '_macros/contribution_summary.html' as contribution_summary %}
+{% import '_macros/user_profile.html' as user_profile %}
+{% import '_macros/module_details.html' as module_details %}
+
+{% set show_company_breakdown = (not company) and (not user_id) %}
+{% set show_engineer_breakdown = (not user_id) %}
+{% set show_bp_breakdown = (metric in ['bpd', 'bpc']) %}
+{% set show_module_breakdown = (not module) %}
+{% set show_languages_breakdown = (metric in ['translations']) %}
+{% set show_user_activity = (user_id) %}
+{% set show_module_activity = (module) and (not user_id) %}
+{% set show_activity = (show_user_activity) or (show_module_activity) %}
+{% set show_contribution_on_left = (not user_id) and (module) %}
+{% set show_contribution_on_right = (user_id) or (company and not module) %}
+{% set show_user_profile = (user_id) %}
+{% set show_module_details = (module) %}
+{% set show_review_ratio = (metric in ['marks']) %}
+
+{% block scripts %}
+
+
+{% endblock %}
+
+{% block left_frame %}
+
+ {% if show_module_details %}
+ {{ module_details.show_module_details(module=module) }}
+ {% endif %}
+
+ {% if show_user_profile %}
+ {{ user_profile.show_user_profile(user_id=user_id) }}
+ {% endif %}
+
+ {% if show_company_breakdown %}
+
+
+
+
+
+ {% endif %}
+
+ {% if show_module_breakdown %}
+
+
+
+
+ Commits by Company {% if user_id %} | {{ user_inst.user_name }}{% endif %}
+
+
+
+
+
+
+
+
+
+
+
+ | # | +Company | +Commits | +
|---|
+
+
+ {% endif %}
+
+ {% if show_engineer_breakdown %}
+
+
+
+
+ Commits by Project {% if company %} | {{ company_original }}{% endif %} {% if user_id %} | {{ user_inst.user_name }}{% endif %}
+
+
+
+
+
+
+
+
+
+
+
+ | # | +Project | +Commits | +
|---|
+
+
+
+
+
+
+ {% endif %}
+
+ {% if show_contribution_on_left %}
+ {{ contribution_summary.show_contribution_summary(show_all=False) }}
+ {% endif %}
+
+ {% if show_contribution_on_right %}
+ {{ contribution_summary.show_contribution_summary(show_all=False) }}
+ {% endif %}
+
+ {% if show_user_activity %}
+ {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
+ {% endif %}
+
+ {% if show_module_activity %}
+ {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
+ {% endif %}
+
+ {% if show_contribution_on_left %}
+
+ {% endif %}
+
+ {% if show_contribution_on_right %}
+
+ {% endif %}
+
+ {% if show_bp_breakdown %}
+ Commits by Contributor {% if company %} | {{ company_original }}{% endif %} {% if user_id %} | {{ user_inst.user_name }}{% endif %}
+ +| # | +Contributor | +Commits | +
|---|
+
+
+
+
+
+ {% endif %}
+
+ {% if show_languages_breakdown %}
+ Blueprint popularity
+ +
+ This metric shows how many times a blueprint was mentioned in emails and commit messages.
+
+
+
+
+ | # | +Blueprint | +Status | +Date | +Mentions | +
|---|
+
+
+
+
+
+ {% endif %}
+
+
+{% endblock %}
+
+{% block center_frame %}
+
+{% endblock %}
+
+{% block right_frame %}
+
+
+
+
+
+{% endblock %}
diff --git a/stackalytics/dashboard/templates/cncf_layout.html b/stackalytics/dashboard/templates/cncf_layout.html
new file mode 100644
index 000000000..cb2d227c7
--- /dev/null
+++ b/stackalytics/dashboard/templates/cncf_layout.html
@@ -0,0 +1,172 @@
+{% extends "base.html" %}
+
+{% block head %}
+
+
+
+{% block scripts %}{% endblock %}
+
+{% endblock %}
+
+{% block body %}
+
+Languages
+ + + +| # | +Language | +Translations | +
|---|
+ {% if not runtime_storage_update_time %}
+
+ {% set update_time_title = '' %}
+ {% else %}
+ {% if runtime_storage_update_time is too_old %}
+
+ {% endif %}
+ {% set update_time_title = 'Last updated on ' + runtime_storage_update_time_str %}
+ {% endif %}
+
+{% endblock %}
diff --git a/stackalytics/dashboard/templates/layout.html b/stackalytics/dashboard/templates/layout.html
index a9fdd60d5..93feb0521 100644
--- a/stackalytics/dashboard/templates/layout.html
+++ b/stackalytics/dashboard/templates/layout.html
@@ -5,6 +5,9 @@
- {% else %}
-
+
+
+
+
+
+
+
+
+
+ {% block left_frame %}{% endblock %}
+
+
+
+
+
+
+
+ {% block right_frame %}{% endblock %}
+
+
+
+
+
+
+ {% block center_frame %}{% endblock %}
+
+
+
+
+
+
+
+
+ Languages
+Languages
- + -| # | Language | Translations |
|---|
-
-
-
-
-
- {% endif %}
-
- {% if show_module_details %}
- {{ module_details.show_module_details(module=module) }}
- {% endif %}
-
- {% if show_bp_breakdown %}
- Contribution by modules
- - - -| # | -Module | -{{ metric_label }} | -
|---|
-
-
-
-
+
+
+
+ Blueprint popularity
- -
- This metric shows how many times a blueprint was mentioned in emails and commit messages.
-
-
-
-
- | # | -Blueprint | -Status | -Date | -Mentions | -
|---|
Company Affiliation Changes
+ +
+
+
+
+
{% endblock %}
diff --git a/stackalytics/dashboard/templates/reports/base_report.html b/stackalytics/dashboard/templates/reports/base_report.html
index 0518f2761..f9370e777 100644
--- a/stackalytics/dashboard/templates/reports/base_report.html
+++ b/stackalytics/dashboard/templates/reports/base_report.html
@@ -7,9 +7,9 @@
{% block body %}
Company Affiliation Changes
Start of the period: End of the period:
-
-
-
-
-
+ | From | -To | -Count | -Users | -
|---|
| From | +To | +Count | +Users | +
|---|
-
+
 }})
- | community heartbeat
+ | community heartbeat
{% block content %}
diff --git a/stackalytics/dashboard/templates/reports/driverlog.html b/stackalytics/dashboard/templates/reports/driverlog.html
index b81ed51ea..a2c136d7a 100644
--- a/stackalytics/dashboard/templates/reports/driverlog.html
+++ b/stackalytics/dashboard/templates/reports/driverlog.html
@@ -20,40 +20,52 @@
- | community heartbeat
+ | community heartbeat
-
-
-
-
-
+
+
+
+
+
+
{% endblock %}
diff --git a/stackalytics/dashboard/templates/reports/members.html b/stackalytics/dashboard/templates/reports/members.html
index 88dd8bf69..634a792f7 100644
--- a/stackalytics/dashboard/templates/reports/members.html
+++ b/stackalytics/dashboard/templates/reports/members.html
@@ -4,7 +4,7 @@
{% set page_title = 'OpenStack Foundation members' %}
{% block head %}
-
+
-
+ table.dataTable tr.even td.sorting_1 {
+ background-color: #E0E8E8;
+ }
+
-
+ $(document).on('change', '#company_selector', function (evt) {
+ reload();
+ });
+
{% endblock %}
{% block body %}
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -145,5 +157,6 @@
-
{% endblock %}
diff --git a/stackalytics/dashboard/templates/unaffiliated.html b/stackalytics/dashboard/templates/unaffiliated.html
new file mode 100644
index 000000000..5c4182e39
--- /dev/null
+++ b/stackalytics/dashboard/templates/unaffiliated.html
@@ -0,0 +1,218 @@
+{% extends "unaffiliated_layout.html" %}
+{% import '_macros/activity_log.html' as activity_log %}
+{% import '_macros/contribution_summary.html' as contribution_summary %}
+{% import '_macros/user_profile.html' as user_profile %}
+{% import '_macros/module_details.html' as module_details %}
+
+{% set show_company_breakdown = (not company) and (not user_id) %}
+{% set show_engineer_breakdown = (not user_id) %}
+{% set show_bp_breakdown = (metric in ['bpd', 'bpc']) %}
+{% set show_module_breakdown = (not module) %}
+{% set show_languages_breakdown = (metric in ['translations']) %}
+{% set show_user_activity = (user_id) %}
+{% set show_module_activity = (module) and (not user_id) %}
+{% set show_activity = (show_user_activity) or (show_module_activity) %}
+{% set show_contribution_on_left = (not user_id) and (module) %}
+{% set show_contribution_on_right = (user_id) or (company and not module) %}
+{% set show_user_profile = (user_id) %}
+{% set show_module_details = (module) %}
+{% set show_review_ratio = (metric in ['marks']) %}
+
+{% block scripts %}
+
+
+{% endblock %}
+
+{% block left_frame %}
+
+ {% if show_module_details %}
+ {{ module_details.show_module_details(module=module) }}
+ {% endif %}
+
+ {% if show_company_breakdown %}
+
+
-
+
- About
-
+
-
+
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
-
+
+ OpenStack foundation member companies
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- OpenStack foundation member companies- - |
-
- Members by company-
-
+
-
-
-
+
+
+
- Members by company+ |
-
- Individual Members- -
+
+
+
+
- Individual Members |
-
-
+
+
+ New Companies-
-
- |
-
+
+
+
+ {% endif %}
+
+ {% if show_module_breakdown %}
+
+
+
+
+ Commits by Company
+
+
+
+
+
+
+
+
+
+
+
+
+ | # | +Company | +Commits | +
|---|
+
+
+ {% endif %}
+
+ {% if show_engineer_breakdown %}
+
+
+
+
+ Commits by Module
+
+
+
+
+
+
+
+
+
+
+
+
+ | # | +Module | +Commits | +
|---|
+
+
+
+
+
+
+ {% endif %}
+
+ {% if show_user_profile %}
+ {{ user_profile.show_user_profile(user_id=user_id) }}
+ {% endif %}
+ {% if show_user_activity %}
+ {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
+ {% endif %}
+
+ {% if show_contribution_on_left %}
+ {{ contribution_summary.show_contribution_summary(show_all=False) }}
+ {% endif %}
+
+ {% if show_bp_breakdown %}
+ Commits by Contributor
+ +| # | +Contributor | +Commits | +
|---|
+
+
+
+
+
+ {% endif %}
+
+ {% if show_languages_breakdown %}
+ Blueprint popularity
+ +
+ This metric shows how many times a blueprint was mentioned in emails and commit messages.
+
+
+
+
+ | # | +Blueprint | +Status | +Date | +Mentions | +
|---|
+
+
+
+
+
+ {% endif %}
+
+ {% if show_contribution_on_right %}
+ {{ contribution_summary.show_contribution_summary(show_all=False) }}
+ {% endif %}
+
+ {% if show_module_activity %}
+ {{ activity_log.show_activity_log(gravatar_size=32, show_all=False) }}
+ {% endif %}
+
+{% endblock %}
+
+{% block center_frame %}
+
+{% endblock %}
+
+{% block right_frame %}
+
+
+
+
+
+{% endblock %}
diff --git a/stackalytics/dashboard/templates/unaffiliated_layout.html b/stackalytics/dashboard/templates/unaffiliated_layout.html
new file mode 100644
index 000000000..4c374328d
--- /dev/null
+++ b/stackalytics/dashboard/templates/unaffiliated_layout.html
@@ -0,0 +1,173 @@
+{% extends "base.html" %}
+
+{% block head %}
+
+
+
+{% block scripts %}{% endblock %}
+
+{% endblock %}
+
+{% block body %}
+
+Languages
+ + + +| # | +Language | +Translations | +
|---|
+ {% if not runtime_storage_update_time %}
+
+ {% set update_time_title = '' %}
+ {% else %}
+ {% if runtime_storage_update_time is too_old %}
+
+ {% endif %}
+ {% set update_time_title = 'Last updated on ' + runtime_storage_update_time_str %}
+ {% endif %}
+
+{% endblock %}
diff --git a/stackalytics/dashboard/web.py b/stackalytics/dashboard/web.py
index a72ae6ba1..31431f168 100644
--- a/stackalytics/dashboard/web.py
+++ b/stackalytics/dashboard/web.py
@@ -55,6 +55,18 @@ def overview():
pass
+@app.route('/cncf')
+@decorators.templated()
+def cncf():
+ pass
+
+
+@app.route('/unaffiliated')
+@decorators.templated()
+def unaffiliated():
+ pass
+
+
@app.route('/widget')
def widget():
return flask.render_template('widget.html')
@@ -504,7 +516,8 @@ def get_user(user_id):
@decorators.jsonify(root=('data', 'default'))
def get_releases_json(**kwargs):
releases = [{'id': release['release_name'],
- 'text': release['release_name'].capitalize()}
+ 'text': release['release_name'].capitalize(),
+ 'project': release.get('project')}
for release in vault.get_vault()['releases'].values()]
releases.append({'id': 'all', 'text': 'All'})
releases.reverse()
diff --git a/stackalytics/processor/config.py b/stackalytics/processor/config.py
index eb796ac16..f731ad77a 100644
--- a/stackalytics/processor/config.py
+++ b/stackalytics/processor/config.py
@@ -25,8 +25,8 @@ CONNECTION_OPTS = [
PROCESSOR_OPTS = [
cfg.StrOpt('default-data-uri',
- default='https://git.openstack.org/cgit/'
- 'openstack/stackalytics/plain/etc/default_data.json',
+ default='https://raw.githubusercontent.com/stackalytics/'
+ 'default_data/master/default_data.json',
help='URI for default data. A local file can be used with the '
'prefix "file://". For example, '
'default_data_uri = file:///path/to/default_data.json'),
diff --git a/stackalytics/processor/schema.py b/stackalytics/processor/schema.py
index 51f1f0f7c..70f07600d 100644
--- a/stackalytics/processor/schema.py
+++ b/stackalytics/processor/schema.py
@@ -76,6 +76,9 @@ default_data = {
"release_name": {
"type": "string"
},
+ "project": {
+ "type": "string"
+ },
"end_date": {
"$ref": "#/definitions/date_format"
},
diff --git a/stackalytics/processor/vcs.py b/stackalytics/processor/vcs.py
index bb98daf95..4832959f5 100644
--- a/stackalytics/processor/vcs.py
+++ b/stackalytics/processor/vcs.py
@@ -181,6 +181,7 @@ class Git(Vcs):
LOG.debug('Parsing git log for repo uri %s', self.repo['uri'])
os.chdir(self.folder)
+
if not self._checkout(branch):
return
@@ -281,6 +282,9 @@ class Git(Vcs):
def get_last_id(self, branch):
LOG.debug('Get head commit for repo uri: %s', self.repo['uri'])
+ if not os.path.exists(self.folder):
+ return None
+
os.chdir(self.folder)
if not self._checkout(branch):
return None
diff --git a/stackalytics/tests/api/test_releases.py b/stackalytics/tests/api/test_releases.py
index 72374411f..b1de4a0f4 100644
--- a/stackalytics/tests/api/test_releases.py
+++ b/stackalytics/tests/api/test_releases.py
@@ -21,9 +21,12 @@ class TestAPIReleases(test_api.TestAPI):
def test_releases(self):
with test_api.make_runtime_storage(
{'releases': [
- {'release_name': 'prehistory', 'end_date': 1365033600},
- {'release_name': 'havana', 'end_date': 1381968000},
- {'release_name': 'icehouse', 'end_date': 1397692800}],
+ {'release_name': 'prehistory', 'end_date': 1365033600,
+ 'project': 'nova'},
+ {'release_name': 'havana', 'end_date': 1381968000,
+ 'project': 'glance'},
+ {'release_name': 'icehouse', 'end_date': 1397692800,
+ 'project': 'nova-cli'}],
'project_types': [
{'id': 'all', 'title': 'All',
'modules': ['nova', 'glance', 'nova-cli']},
@@ -32,6 +35,9 @@ class TestAPIReleases(test_api.TestAPI):
test_api.make_records(record_type=['commit'])):
response = self.app.get('/api/1.0/releases')
releases = test_api.load_json(response)['data']
+ print(str(releases))
self.assertEqual(3, len(releases))
self.assertIn({'id': 'all', 'text': 'All'}, releases)
- self.assertIn({'id': 'icehouse', 'text': 'Icehouse'}, releases)
+ self.assertIn(
+ {'project': 'nova-cli', 'id': 'icehouse',
+ 'text': 'Icehouse'}, releases)
diff --git a/stackalytics/tests/unit/test_config_files.py b/stackalytics/tests/unit/test_config_files.py
index d1331f17c..f2470dd4b 100644
--- a/stackalytics/tests/unit/test_config_files.py
+++ b/stackalytics/tests/unit/test_config_files.py
@@ -125,7 +125,8 @@ class TestConfigFiles(testtools.TestCase):
def _verify_users_in_alphabetical_order(self, file_name):
users = self._read_file(file_name)['users']
self._verify_ordering(
- users, key=lambda x: (x.get('launchpad_id') or x.get('github_id')),
+ users,
+ key=lambda x: (x.get('launchpad_id') or x.get('github_id') or ''),
msg='List of users should be ordered by launchpad id or ldap id '
'or github id')
diff --git a/stackalytics/tests/unit/test_helpers.py b/stackalytics/tests/unit/test_helpers.py
index 6ac6daa10..02e2fc8d0 100644
--- a/stackalytics/tests/unit/test_helpers.py
+++ b/stackalytics/tests/unit/test_helpers.py
@@ -68,7 +68,7 @@ class TestHelpers(testtools.TestCase):
observed = helpers.extend_user(user)
self.assertEqual(expected, observed)
- mock_make_link.assert_called_once_with('TheCompany', '/', mock.ANY)
+ mock_make_link.assert_called_once_with('TheCompany', '', mock.ANY)
@mock.patch('time.time')
@mock.patch('stackalytics.dashboard.helpers.make_link')
@@ -92,4 +92,4 @@ class TestHelpers(testtools.TestCase):
helpers.extend_user(user)
- mock_make_link.assert_called_once_with('Current', '/', mock.ANY)
+ mock_make_link.assert_called_once_with('Current', '', mock.ANY)
+
+
+
+
+
+
+
+
+
+ {% block left_frame %}{% endblock %}
+
+
+
+
+
+
+
+ {% block right_frame %}{% endblock %}
+
+
+
+
+
+
+
+ {% block center_frame %}{% endblock %}
+
+
+
+
+
+
+
+
+