Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rose Bush utility migration to cylc: incoming #2614

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b953600
Transfer of unedited Rose Bush files; commit for diff purposes
sadielbartholomew Mar 16, 2018
666eff1
Add all HTML requirements under lib/cylc/cylc-bush/
sadielbartholomew Mar 16, 2018
bbc719c
Rose-specific dependency decoupling part 1: modules
sadielbartholomew Mar 16, 2018
bf7e962
Fix bin file for valid 'bush' command; remove circular dependencies
sadielbartholomew Mar 16, 2018
5099e2b
Segregate runtime and Bush access DAOs; adapt HTML file paths
sadielbartholomew Mar 16, 2018
56e5b59
Fix and attune basic profile e.g. title, logo, per-page settings
sadielbartholomew Mar 16, 2018
c40a36a
Working utility tweaks; make 'nameless' pending name decision
sadielbartholomew Mar 16, 2018
ef4dbb6
Error fixes from test use; file name, header & favicon alteration
sadielbartholomew Mar 21, 2018
e833006
Relevant DB querying into CylcSuiteDAO; thread issue outstanding
sadielbartholomew Mar 23, 2018
8a9869a
Re-add DB instance initialisation etc methods to avoid multi-threading
sadielbartholomew Mar 26, 2018
cbf20e5
Raw transfer of Rose Bush tests; commit for diff purposes
sadielbartholomew Mar 28, 2018
d72c8a6
Continued progress (failing test battery): adapting tests
sadielbartholomew Mar 28, 2018
b7168f4
Made a less fuzzy PNG favicon.
hjoliver Apr 5, 2018
f1e92cc
square favicon
hjoliver Apr 6, 2018
bd7f73e
Fix arg parsing of non-default ports; further test adaptation
sadielbartholomew Apr 9, 2018
d6a3a8a
Clean up tests, now correct bar failing 'curl' for JSON tests
sadielbartholomew Apr 11, 2018
67f6645
Fix all genuine amendable Python issues picked up by Codacy
sadielbartholomew Jun 8, 2018
c00ceef
Grand naming ceremony
sadielbartholomew Jun 21, 2018
0d25621
Assorted degbugging, including of the utility tests themselves
sadielbartholomew Jun 22, 2018
03bc445
Port security PR and fix text error inherited from Bush
sadielbartholomew Jul 2, 2018
da93c03
Resolve merge conflicts
sadielbartholomew Jul 2, 2018
355f92a
Tidy-up & final pre-review debug
sadielbartholomew Jul 2, 2018
8927d15
Make '--help' output accurate & consistent with rest of CLI
sadielbartholomew Jul 17, 2018
4ecd2f3
Update copyright notice in line with PR #2730
sadielbartholomew Jul 19, 2018
0ed875a
Fix inherited CSS invalid comment syntax instance
sadielbartholomew Jul 31, 2018
725f7bc
Respond to latest feedback; fix minor Rose file recognition bug
sadielbartholomew Aug 9, 2018
bc82577
Fix suite task state related errors
sadielbartholomew Sep 14, 2018
8754708
Respond to latest set of feedback comments
sadielbartholomew Oct 16, 2018
ee0a184
Basic view for rosie info in suites list table & under rose files
sadielbartholomew Oct 18, 2018
5432140
Respond to trivial latest final feedback, add acknowledgements
sadielbartholomew Oct 24, 2018
9b5fd8f
fix broadcast events page
oliver-sanders Oct 29, 2018
081dbc8
Merge pull request #6 from oliver-sanders/rose-bush-migration-incoming
sadielbartholomew Oct 29, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions ACKNOWLEDGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,23 @@ Licences for non-cylc work included in this distribution can be found in the
External software released under the LGPL license.
Modifications based on version 0.6. See
[xdot](https://github.com/jrfonseca/xdot.py)
* `lib/cylc/cylc-review/static/css/bootstrap-???`,
`lib/cylc/cylc-review/static/images/glyphicons-halflings-???` &
`lib/cylc/cylc-review/static/js/bootstrap.min.js`:
Unmodified external software library copyright 2013 Twitter Inc released
under the Apache 2.0 license. See [Bootstrap](http://getbootstrap.com/).
* `lib/cylc/cylc-review/static/css/cylc-review.css`:
Contains modified code from Twitter Bootstrap v2.3.1 released under the
Apache 2.0 licence. See
[Bootstrap v.2.3.1](http://getbootstrap.com/2.3.1/).
* `lib/cylc/cylc-review/static/css/jquery.dataTables.???`,
`lib/cylc/cylc-review/static/images/sort_???` &
`lib/cylc/cylc-review/static/js/jquery.dataTables.???`:
Unmodified external software library released under GPLv2 and BSD. See
[DataTables](http://www.datatables.net/).
* `lib/cylc/cylc-review/static/js/livestamp.min.js`:
Unmodified external software library released under the MIT license. See
[Livestamp.js](http://mattbradley.github.io/livestampjs/).
* `lib/cylc/cylc-review/static/js/moment.min.js`:
Unmodified external software library released under the MIT license. See
[Moment.js](http://momentjs.com/).
2 changes: 2 additions & 0 deletions bin/cylc-help
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,7 @@ information_commands['get-suite-contact'] = [
'get-suite-contact', 'get-contact', 'print-contact']
information_commands['get-suite-version'] = [
'get-suite-version', 'get-cylc-version']
information_commands['review'] = ['review']

information_commands['documentation'] = ['documentation', 'browse']
information_commands['monitor'] = ['monitor']
Expand Down Expand Up @@ -394,6 +395,7 @@ comsum['get-suite-contact'] = (
comsum['get-suite-version'] = 'Print cylc version of a suite server program'
comsum['gscan'] = 'Scan GUI for monitoring multiple suites'
comsum['gpanel'] = 'Internal interface for GNOME 2 panel applet'
comsum['review'] = 'Start/stop ad-hoc Cylc Review web service server.'
# control
comsum['gui'] = '(a.k.a. gcylc) cylc GUI for suite control etc.'
comsum['run'] = 'Start a suite at a given cycle point'
Expand Down
50 changes: 50 additions & 0 deletions bin/cylc-review
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
#!/usr/bin/env python2

# THIS FILE IS PART OF THE CYLC SUITE ENGINE.
# Copyright (C) 2008-2018 NIWA & British Crown (Met Office) & Contributors.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

"""cylc [info] review [OPTIONS] ARGS

Start/stop ad-hoc Cylc Review web service server for browsing users' suite
logs via an HTTP interface.

With no arguments, the status of the ad-hoc web service server is printed.

For 'cylc review start', if 'PORT' is not specified, port 8080 is used."""


import sys

import cylc.flags
from cylc.review import CylcReviewService


def main():
from cylc.ws import ws_cli
ws_cli(CylcReviewService, __doc__)


if __name__ == "__main__":
try:
main()
except Exception as exc:
if cylc.flags.debug:
raise
sys.exit(str(exc))
elif 'doctest' not in sys.argv[0]:
# If called as a module but not by the doctest module.
from cylc.ws import wsgi_app
application = wsgi_app(CylcReviewService)
6 changes: 6 additions & 0 deletions lib/cylc/cylc-review/static/css/bootstrap.min.css

Large diffs are not rendered by default.

115 changes: 115 additions & 0 deletions lib/cylc/cylc-review/static/css/cylc-review.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
pre {
white-space: pre;
}
.entry {
border-radius: 5px;
padding: 5px;
}
.even {
background: #eee;
}
.inline {
margin: 0;
}
.page-header {
padding-left: 10px;
padding-right: 10px;
}
.highlight {
background-color: yellow;
}
.line-number {
cursor: pointer;
}
.badge-label {
border-radius: 1em;
}


@media screen {
div.top_nav {
position: fixed;
bottom: 0;
background-color: lightgrey;
z-index: 10;
}
.next {
background: white
}
.previous {
background: white
}
.page_entries select {
width: 300px;
}
}


/* dropdown-submenu code from bootstrap v2.3.1 (removed in v3.x)
see boostrap v2.3.1 docs/assets/css/boostrap.css #3031->3075 */
.dropdown-submenu {
position: relative;
}

.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
-webkit-border-radius: 0 6px 6px 6px;
-moz-border-radius: 0 6px 6px 6px;
border-radius: 0 6px 6px 6px;
}

.dropdown-submenu:hover > .dropdown-menu {
display: block;
}

.dropup .dropdown-submenu > .dropdown-menu {
top: auto;
bottom: 0;
margin-top: 0;
margin-bottom: -2px;
-webkit-border-radius: 5px 5px 5px 0;
-moz-border-radius: 5px 5px 5px 0;
border-radius: 5px 5px 5px 0;
}

.dropdown-submenu > a:after {
display: block;
float: right;
width: 0;
height: 0;
margin-top: 5px;
margin-right: -10px;
border-color: transparent;
border-left-color: #cccccc;
border-style: solid;
border-width: 5px 0 5px 5px;
content: " ";
}

.dropdown-submenu:hover > a:after {
border-left-color: #222222; /* make the right arrow visible on hover */
}

.dropdown-submenu.pull-left {
float: none;
}

.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-radius: 6px 0 6px 6px;
-moz-border-radius: 6px 0 6px 6px;
border-radius: 6px 0 6px 6px;
}

@-moz-document url-prefix() {
fieldset { display: table-cell; }
}

th,
.livestamp {
white-space: nowrap;
}
Loading