[copr] master: Fix typo in API doc HTML (8fdf149)
by Mikolaj Izdebski
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 8fdf149f1078a2b5baa4d6516556e0d8b785e75e
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Mar 18 18:02:47 2014 +0100
Fix typo in API doc HTML
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/templates/api.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/templates/api.html b/frontend/coprs_frontend/coprs/templates/api.html
index 9b511f3..2d41745 100644
--- a/frontend/coprs_frontend/coprs/templates/api.html
+++ b/frontend/coprs_frontend/coprs/templates/api.html
@@ -110,7 +110,7 @@ copr_url = http://copr.fedoraproject.org
<h4>Result:</h4>
<ul>
- <li><b>"detial"</b> – dictionary with following keys:
+ <li><b>"detail"</b> – dictionary with following keys:
<ul>
<li><b>"yum_repos"</b> – Map of chroots to yum repository
URLs. Chroots are in format
10 years, 1 month
[copr] master: replace 'copr' with 'project' (3e74f24)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 3e74f246e3cd2c7829afe034a5b7bd227b775194
Author: Peter Hutterer <peter.hutterer(a)who-t.net>
Date: Tue Mar 18 07:39:24 2014 +1000
replace 'copr' with 'project'
Use "Copr service" where the man page refers to the service itself, and
"project" where it refers to a single project.
>---------------------------------------------------------------
cli/man/copr-cli.1.asciidoc | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/cli/man/copr-cli.1.asciidoc b/cli/man/copr-cli.1.asciidoc
index b556cef..d8b87c7 100644
--- a/cli/man/copr-cli.1.asciidoc
+++ b/cli/man/copr-cli.1.asciidoc
@@ -5,7 +5,7 @@ copr-cli(1)
NAME
----
-copr-cli - command line interface for Copr
+copr-cli - command line interface for the Copr service
SYNOPSIS
@@ -15,7 +15,7 @@ copr-cli [-h] [--version] {list,create,build} ...
DESCRIPTION
-----------
-This command allows you to interact with the Copr build system from the command line.
+This command allows you to interact with the Copr service from the command line.
You need to generate an API key first (see the API KEY section below).
@@ -32,14 +32,14 @@ ACTIONS
-------
list [username]::
-List all the coprs of the provided username. If no username is provided,
-then your copr repositories are listed.
+List all the projects of the provided username. If no username is provided,
+then your projects are listed.
create::
-Create a new copr.
+Create a new project.
build ::
-Build packages for a specified copr.
+Build packages for a specified project.
status::
Get the status of the build.
@@ -55,26 +55,26 @@ usage: copr-cli create [-h] --chroot CHROOTS [--repo REPOS]
name
--chroot::
-Chroot to use for this copr. Can be specified multiple times, but at least one must be present.
+Chroot to use for this project. Can be specified multiple times, but at least one must be present.
--repo::
-Repository to add to this copr. Can be specified multiple times.
+Repository to add to this project. Can be specified multiple times.
--initial-pkgs::
-List of packages to build in this new copr. Can be specified multiple times.
+List of packages to build in this new project. Can be specified multiple times.
--description::
-Description of the copr.
+Description of the project.
--instructions::
-Instructions for the copr.
+Instructions for the project.
`copr-cli build [options]`
~~~~~~~~~~~~~~~~~~~~~~~~~~
usage: copr-cli build [-h] [--memory MEMORY] [--timeout TIMEOUT] [--nowait]
- copr pkg_url [pkg_url ...]
+ project pkg_url [pkg_url ...]
--memory::
Override memory for this build
@@ -85,8 +85,8 @@ Override timeout for this build
--nowait::
Don't wait for build completion
-copr::
-The copr repo to build the package in. This can be a simple name of some of
+project::
+The project build the package in. This can be a simple name of some of
your projects. Alternatively, you can specify it as username/project. This
way you can build into the project of another user provided you have the
permissions to do so.
10 years, 1 month
[copr] master: white background (0556b3c)
by asamalik＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 0556b3c898823c3f51da8bce48a838a3056d0641
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Tue Mar 18 17:06:03 2014 +0100
white background
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/static/copr.css | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css
index 9345a13..4262b64 100644
--- a/frontend/coprs_frontend/coprs/static/copr.css
+++ b/frontend/coprs_frontend/coprs/static/copr.css
@@ -1,7 +1,7 @@
html, body {
font-family: Cantarell, "Droid Sans", Verdana, sans-serif;
font-size: 1em;
-
+ background-color: #FFF;
color: #000;
margin: 0px;
padding: 0px;
10 years, 1 month
[copr] master: status page fix (f9f7c30)
by asamalik＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit f9f7c3000925bd204e926eb10eb51654b194c47f
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Tue Mar 18 13:30:36 2014 +0100
status page fix
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/__init__.py | 3 ++
frontend/coprs_frontend/coprs/static/copr.css | 17 ++++++++++++
.../coprs/views/status_ns/__init__.py | 3 ++
.../coprs/views/status_ns/status_general.py | 27 ++++++++++++++++++++
4 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/__init__.py b/frontend/coprs_frontend/coprs/__init__.py
index 63192ab..d69a635 100644
--- a/frontend/coprs_frontend/coprs/__init__.py
+++ b/frontend/coprs_frontend/coprs/__init__.py
@@ -41,11 +41,14 @@ from coprs.views.coprs_ns import coprs_chroots
from coprs.views import backend_ns
from coprs.views.backend_ns import backend_general
from coprs.views import misc
+from coprs.views import status_ns
+from coprs.views.status_ns import status_general
app.register_blueprint(api_ns.api_ns)
app.register_blueprint(admin_ns.admin_ns)
app.register_blueprint(coprs_ns.coprs_ns)
app.register_blueprint(misc.misc)
app.register_blueprint(backend_ns.backend_ns)
+app.register_blueprint(status_ns.status_ns)
app.add_url_rule("/", "coprs_ns.coprs_show", coprs_general.coprs_show)
diff --git a/frontend/coprs_frontend/coprs/static/copr.css b/frontend/coprs_frontend/coprs/static/copr.css
index cb6621c..9345a13 100644
--- a/frontend/coprs_frontend/coprs/static/copr.css
+++ b/frontend/coprs_frontend/coprs/static/copr.css
@@ -285,6 +285,23 @@ table.builds-table tr.details {
display: none;
}
+table.status-table {
+ width: 100%;
+}
+
+table.status-table tr:nth-child(odd) {
+ background-color: #ccc;
+}
+
+table.status-table tr:nth-child(even) {
+ background-color: #eee;
+}
+
+table.status-table tr:first-child {
+ color: #fff;
+ background-color: #1f4b89;
+}
+
tr.build-state:hover {
text-decoration: underline;
background-color: #E6E6E6;
diff --git a/frontend/coprs_frontend/coprs/views/status_ns/__init__.py b/frontend/coprs_frontend/coprs/views/status_ns/__init__.py
new file mode 100644
index 0000000..cc39bb4
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/views/status_ns/__init__.py
@@ -0,0 +1,3 @@
+import flask
+
+status_ns = flask.Blueprint("status_ns", __name__, url_prefix="/status")
diff --git a/frontend/coprs_frontend/coprs/views/status_ns/status_general.py b/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
new file mode 100644
index 0000000..eaa0607
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/views/status_ns/status_general.py
@@ -0,0 +1,27 @@
+import flask, os
+
+from urlparse import urlparse
+from coprs.views.status_ns import status_ns
+from coprs.logic import builds_logic
+
+(a)status_ns.route("/")
+def status_home():
+ builds_number = 0
+ builds_list = []
+
+ for build in builds_logic.BuildsLogic.get_waiting():
+ for chroot in build.chroots:
+ pkgs = []
+ for url in build.pkgs.split(' '):
+ pkgs.append(os.path.basename(urlparse(url)[2]))
+ build_dict = {
+ 'chroot' : chroot.name,
+ 'time' : build.submitted_on,
+ 'owner' : build.user.name,
+ 'pkgs' : pkgs,
+ 'copr' : build.copr.name}
+ builds_list.append(build_dict)
+ builds_number = len(builds_list)
+ return flask.render_template("status.html",
+ builds=builds_list,
+ number=builds_number)
10 years, 1 month
[copr] master: status page finished (3aa0fc8)
by asamalik＠fedoraproject.org
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 3aa0fc8d780e47a8a44e5c3cad2a0160451c585c
Author: Adam Samalik <asamalik(a)redhat.com>
Date: Tue Mar 18 14:33:10 2014 +0100
status page finished
>---------------------------------------------------------------
frontend/coprs_frontend/coprs/filters.py | 17 +++++++++
.../coprs_frontend/coprs/templates/coprs/show.html | 4 ++
.../coprs_frontend/coprs/templates/status.html | 37 ++++++++++++++++++++
3 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/frontend/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py
index 6a3432e..d079123 100644
--- a/frontend/coprs_frontend/coprs/filters.py
+++ b/frontend/coprs_frontend/coprs/filters.py
@@ -54,6 +54,23 @@ def localized_time(time_in, timezone):
return dt_my_tz.strftime(format_tz)
+(a)app.template_filter('time_ago')
+def time_ago(time_in):
+ """ returns string saying how long ago the time on input was
+
+ Input is in EPOCH (seconds since epoch).
+ """
+ now = datetime.datetime.now()
+ diff = now - datetime.datetime.fromtimestamp(time_in)
+ secdiff = diff.seconds
+ if secdiff < 120:
+ return "1 minute"
+ elif secdiff < 7200:
+ return str(secdiff/60) + " minutes"
+ else:
+ return str(secdiff/3600) + "hours"
+
+
@app.template_filter("markdown")
def markdown_filter(data):
if not data:
diff --git a/frontend/coprs_frontend/coprs/templates/coprs/show.html b/frontend/coprs_frontend/coprs/templates/coprs/show.html
index a3d041e..c64f765 100644
--- a/frontend/coprs_frontend/coprs/templates/coprs/show.html
+++ b/frontend/coprs_frontend/coprs/templates/coprs/show.html
@@ -13,6 +13,10 @@
<a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Projects">{{ g.user.coprs_count }}</a>
</p>
<p class="other-text">projects</p>
+ <hr>
+ <p class="coprs-count">
+ <a href="{{url_for("status_ns.status_home")}}">Copr status</a>
+ </p>
</div>
{% endif %}
{% if not g.user and not fulltext%}
diff --git a/frontend/coprs_frontend/coprs/templates/status.html b/frontend/coprs_frontend/coprs/templates/status.html
new file mode 100644
index 0000000..f7d1f48
--- /dev/null
+++ b/frontend/coprs_frontend/coprs/templates/status.html
@@ -0,0 +1,37 @@
+{% extends "layout.html" %}
+{% block title %} Copr status {% endblock %}
+{% block header %} Copr status {% endblock %}
+{% block body %}
+<h1>{%if number == 0:%}
+ No tasks
+ {%elif number == 1:%}
+ {{number}} task
+ {%else%}
+ {{number}} tasks
+ {%endif%}
+ in queue
+</h1>
+
+ </h2>
+<table class="status-table">
+ <tr>
+ <th>Waiting</th>
+ <th>Project</th>
+ <th>Packages</th>
+ <th>Chroot</th>
+ </tr>
+ {% for build in builds %}
+ <tr>
+ <th>{{ build.time | time_ago }}</th>
+ <th><a href="{{ url_for('coprs_ns.copr_detail', username = build.owner, coprname = build.copr) }}">{{build.owner}}/{{build.copr}}</a></th>
+ <th>{%for pkg in build.pkgs[0:2]:%}{{pkg}}<br>{%endfor%}
+ {%if build.pkgs|length > 2:%}
+ ...{{build.pkgs|length}} more
+ {%endif%}
+ </th>
+ <th>{{ build.chroot }}</th>
+ </tr>
+ {% endfor %}
+</table>
+
+{% endblock %}
10 years, 1 month
[copr] master: Automatic commit of package [copr-backend] release [1.30-1]. (8594671)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 859467179ffb6cd6affef2bfc88636958aad719f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 15:30:39 2014 +0100
Automatic commit of package [copr-backend] release [1.30-1].
>---------------------------------------------------------------
backend/copr-backend.spec | 7 ++++++-
rel-eng/packages/copr-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 4fd0c25..1605eaa 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -3,7 +3,7 @@
%endif
Name: copr-backend
-Version: 1.29
+Version: 1.30
Release: 1%{?dist}
Summary: Backend for Copr
@@ -170,6 +170,11 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%exclude %{_pkgdocdir}/playbooks
%changelog
+* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.30-1
+- [backend] exclude files which are part of main package
+- copr-backend.src:113: W: mixed-use-of-spaces-and-tabs (spaces: line 5, tab:
+ line 113)
+
* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1
- move backend into separate package
diff --git a/rel-eng/packages/copr-backend b/rel-eng/packages/copr-backend
index d087bda..0a8a54b 100644
--- a/rel-eng/packages/copr-backend
+++ b/rel-eng/packages/copr-backend
@@ -1 +1 @@
-1.29-1 backend/
+1.30-1 backend/
10 years, 1 month
[copr] master: copr-backend.src:113: W: mixed-use-of-spaces-and-tabs (spaces: line 5, tab: line 113) (11feff9)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 11feff9ccc80033c473e7d0b65ecbf89ee234e55
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 15:16:33 2014 +0100
copr-backend.src:113: W: mixed-use-of-spaces-and-tabs (spaces: line 5, tab: line 113)
>---------------------------------------------------------------
backend/copr-backend.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 2d96f8e..0318b02 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -110,7 +110,7 @@ cp -a tmpfiles.d/* %{buildroot}/%{_tmpfilesdir}
# for ghost files
touch %{buildroot}%{_var}/log/copr/copr.log
for i in `seq 7`; do
- touch %{buildroot}%{_var}/log/copr/workers/worker-$i.log
+ touch %{buildroot}%{_var}/log/copr/workers/worker-$i.log
done
touch %{buildroot}%{_var}/run/copr-backend/copr-be.pid
10 years, 1 month
[copr] master: [backend] exclude files which are part of main package (16e5f47)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 16e5f471c0e1619273a778762ac65e3394dc6b50
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Mar 18 15:27:13 2014 +0100
[backend] exclude files which are part of main package
>---------------------------------------------------------------
backend/copr-backend.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/backend/copr-backend.spec b/backend/copr-backend.spec
index 0318b02..4fd0c25 100644
--- a/backend/copr-backend.spec
+++ b/backend/copr-backend.spec
@@ -166,6 +166,8 @@ useradd -r -g copr -G lighttpd -s /bin/bash -c "COPR user" copr
%files doc
%doc %{_pkgdocdir}/python-doc
+%exclude %{_pkgdocdir}/lighttpd
+%exclude %{_pkgdocdir}/playbooks
%changelog
* Tue Mar 18 2014 Miroslav Suchý <msuchy(a)redhat.com> 1.29-1
10 years, 1 month
[copr] master: Add Java library licensing information to README (6ba96be)
by Mikolaj Izdebski
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 6ba96be34f1a192664ea38b8aa68ffb308400e50
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Mar 18 15:20:34 2014 +0100
Add Java library licensing information to README
>---------------------------------------------------------------
README | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/README b/README
index 0adcdcd..a48ace1 100644
--- a/README
+++ b/README
@@ -20,4 +20,6 @@ Overview of use:
- it retrieves the results and saves them into the results dir
- it returns the build status and where to find the results to the front end
-copr project is licensed under GPLv2+ (see LICENSE file for details).
+copr project is licensed under GPLv2+ (see LICENSE file for details),
+except for Java parts (contents of java directory) which are licensed
+under Apache License v2.0 (see java/LICENSE).
10 years, 1 month