Tarmac

Merge lp:~dobey/tarmac/drop-web into lp:tarmac

  1. drop-web
  2. Merge into main
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 425
Merged at revision: 425
Proposed branch: lp:~dobey/tarmac/drop-web
Merge into: lp:tarmac
Diff against target: 106 lines (+0/-77)
4 files modified
MANIFEST.in (+0/-1)
bin/tarmac-web (+0/-55)
setup.py (+0/-3)
templates/index.html (+0/-18)
To merge this branch: bzr merge lp:~dobey/tarmac/drop-web
Reviewer Review Type Date Requested Status
Mike McCracken Approve
Review via email: mp+201106@code.launchpad.net

Commit message

Drop the tarmac-web interface as it doesn't work and Jenkins is much better.

To post a comment you must log in.
Revision history for this message
Mike McCracken (mikemc) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2010-07-20 06:38:25 +0000
3+++ MANIFEST.in 2014-01-09 21:35:37 +0000
4@@ -2,4 +2,3 @@
5 include AUTHORS HACKING LICENSE NEWS README
6 recursive-include bin *
7 recursive-include docs *
8-recursive-include templates *
9
10=== removed file 'bin/tarmac-web'
11--- bin/tarmac-web 2010-07-17 23:02:24 +0000
12+++ bin/tarmac-web 1970-01-01 00:00:00 +0000
13@@ -1,55 +0,0 @@
14-#!/usr/bin/env python
15-# This file is part of Tarmac.
16-#
17-# Tarmac is free software: you can redistribute it and/or modify
18-# it under the terms of the GNU General Public License version 3 as
19-# published by
20-# the Free Software Foundation.
21-#
22-# Tarmac is distributed in the hope that it will be useful,
23-# but WITHOUT ANY WARRANTY; without even the implied warranty of
24-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
25-# GNU General Public License for more details.
26-#
27-# You should have received a copy of the GNU General Public License
28-# along with Tarmac. If not, see <http://www.gnu.org/licenses/>.
29-#
30-# Copyright 2009 Elliot Murphy
31-"""Simple WSGI web application for showing the current Tarmac status."""
32-
33-import sys
34-import subprocess
35-from tarmac.config import TarmacConfig
36-import web
37-
38-urls = (
39- '/', 'index'
40-)
41-
42-render = web.template.render('templates/')
43-
44-class index(object):
45- """The main page of the status site."""
46-
47- def __init__(self):
48- config = TarmacConfig()
49- self.statusfile = config.get('Tarmac', 'log_file')
50-
51- def GET(self):
52- tail = subprocess.Popen(('tail', '-n40', self.statusfile),
53- stdout = subprocess.PIPE,
54- stderr = subprocess.PIPE)
55- output, errput = tail.communicate()
56- return render.index(output, errput)
57-
58-
59-def main():
60- if len(sys.argv) != 3:
61- print "Please specify a port number and a project name: ./webui.py 8080 default"
62- return 1
63- app = web.application(urls, globals())
64- return app.run()
65-
66-
67-if __name__ == "__main__":
68- sys.exit(main())
69
70=== modified file 'setup.py'
71--- setup.py 2013-10-30 19:42:15 +0000
72+++ setup.py 2014-01-09 21:35:37 +0000
73@@ -33,9 +33,6 @@
74 packages=['tarmac', 'tarmac.bin', 'tarmac.plugins', 'tarmac.tests'],
75 test_suite='tarmac',
76 scripts=['bin/tarmac'],
77- #data_files=[('share/tarmac/', ['tarmac-web']),
78- # ('share/tarmac/templates/', ['templates/index.html']),
79- # ],
80 data_files=[
81 ('share/man/man1', ['docs/tarmac.1']),
82 ('/etc/apparmor.d', ['data/tarmac.apparmor']),
83
84=== removed directory 'templates'
85=== removed file 'templates/index.html'
86--- templates/index.html 2009-07-10 19:42:24 +0000
87+++ templates/index.html 1970-01-01 00:00:00 +0000
88@@ -1,18 +0,0 @@
89-$def with (output, errput)
90-
91-<!DOCTYPE HTML>
92-<html lang="en">
93-<head>
94- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
95- <title>Tarmac - landing branches so you don't have to</title>
96-</head>
97-<body bgcolor="white">
98-
99-<p>The latest output from the Tarmac log is:</p>
100-<p>
101-<pre>
102-$output
103-</pre>
104-</p>
105-</body>
106-</html>

Subscribers

People subscribed via source and target branches