Skip to content

Commit

Permalink
Releasing under a new name: ubuntu make
Browse files Browse the repository at this point in the history
  • Loading branch information
didrocks committed Dec 9, 2014
1 parent fd4d144 commit b5d19c3
Show file tree
Hide file tree
Showing 87 changed files with 976 additions and 958 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Docker container for ubuntu developer tools center
# Docker container for Ubuntu Make
# this installs a full ubuntu desktop environment in an
# unprivileged container, and adds a passwordless sudo user.

# This enables running medium tests of udtc.
# This enables running medium tests of umake.

FROM ubuntu:14.04
MAINTAINER Didier Roche <didrocks@ubuntu.com>
Expand All @@ -25,14 +25,14 @@ RUN \
# install add-apt-repository and tools to create build-deps
apt-get install -y software-properties-common devscripts equivs dpkg-dev && \

# add udtc ppa
add-apt-repository -y ppa:didrocks/ubuntu-developer-tools-center && \
# add umake ppa
add-apt-repository -y ppa:ubuntu-desktop/ubuntu-make && \
apt-get update && \

# install system udtc (from latest released version)
#RUN apt-get install -y ubuntu-developer-tools-center
# install system umake (from latest released version)
#RUN apt-get install -y ubuntu-make

# install udtc build-deps
# install umake build-deps
mk-build-deps /tmp/control -i --tool 'apt-get --yes' && \

# for running it as a daemon (and ssh requires the sshd directory)
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Ubuntu Developer Tools Center
Ubuntu Developer Tools Center is a project to enable quick and easy setup of common developers needs on Ubuntu.
# Ubuntu Make
Ubuntu Make is a project to enable quick and easy setup of common developers needs on Ubuntu.

<!---[![Build Status](https://api.travis-ci.org/didrocks/ubuntu-developer-tools-center.svg?branch=master)](https://travis-ci.org/didrocks/ubuntu-developer-tools-center) TRAVIS disabled until they support 14.04 (need python 3.4 with platform gi.repository)-->
<!---[![Build Status](https://api.travis-ci.org/didrocks/ubuntu-make.svg?branch=master)](https://travis-ci.org/didrocks/ubuntu-make) TRAVIS disabled until they support 14.04 (need python 3.4 with platform gi.repository)-->

As a first step, it's focusing on installing a full-fledged android developer environment on latest Ubuntu LTS (14.04).

Expand All @@ -11,7 +11,7 @@ As a first step, it's focusing on installing a full-fledged android developer en
To run the tool:

```sh
$ ./udtc
$ ./umake
```

You can of course use `--help` to get more information and change the verbosity of the output with `-v`, `-vv`.
Expand Down Expand Up @@ -45,19 +45,19 @@ Under normal circumstances, we expect *error.log* to remain empty../
To load one of those logging profiles:

```sh
$ LOG_CFG=confs/debug.logcfg bin/udtc
$ LOG_CFG=confs/debug.logcfg bin/umake
```

## Development
### Providing user's framework

It's possible for anyone to have local frameworks for either development purpose or for special local or team use-case.
* Any files in a directory set with the "UDTC_FRAMEWORKS" environment variable will be loaded first.
* Any files inside ~/.udtc/frameworks will be loaded next.
* Any files in a directory set with the "UMAKE_FRAMEWORKS" environment variable will be loaded first.
* Any files inside ~/.umake/frameworks will be loaded next.

Any file should eventually contain a category or frameworks like the ones in udtc/frameworks/*.
Any file should eventually contain a category or frameworks like the ones in umake/frameworks/*.

If categories name are duplicated only one will be loaded. Ubuntu Developer Tools Center will first load the one controlled by the environment variable, then in home based directory, and finally, the system one.
If categories name are duplicated only one will be loaded. Ubuntu Make will first load the one controlled by the environment variable, then in home based directory, and finally, the system one.
Note that duplicate filenames aren't encouraged, but supported.


Expand All @@ -82,7 +82,7 @@ $ pep8 .
#### Types of tests
There are four kinds of tests that can be combined in runtests:

* **pep8**: Run the pep8 tests on all the udtc and tests code.
* **pep8**: Run the pep8 tests on all the umake and tests code.
* **small**: mostly testing modules and component with mocks around it. Note that it's using a local webserver (http and https) to serve mock content
* **medium**: testing the whole workflow, directly calling end user tool from the command line, but without any effect on the system. Requirements like installing packages are mocked, as well as the usage of a local webserver serving (smaller) content similar that what will be fetched in a real use case. The assets have the same formats and layout.
* **large**: same tests are run as for the medium tests, but with real server download and installation of dpkg packages. Most of those tests need root rights. However, be aware that those tests only run on a graphical environment, will interfere with it and will install/remove packages on your system.
Expand Down Expand Up @@ -148,7 +148,7 @@ $ sudo apt-get install -qq apt apt-utils libapt-pkg-dev # those are the requirem
$ sudo apt-get install -qq python3-progressbar python3-gi python3-argcomplete
$ env/bin/pip install -r requirements.txt
$ source env/bin/activate
$ bin/udtc
$ bin/umake
```

## Release management
Expand Down
4 changes: 2 additions & 2 deletions bin/udtc → bin/umake
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

import os
import sys
# Run local udtc from this helper
# Run local umake from this helper
root_dir = os.path.dirname(os.path.dirname(__file__))
sys.path.insert(0, root_dir)

from udtc import main
from umake import main

if __name__ == '__main__':
main()
2 changes: 1 addition & 1 deletion confs/debug_network.logcfg
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ handlers:
backupCount: 20
encoding: utf8
loggers:
udtc.network:
umake.network:
level: DEBUG
handlers: [console, debug_network_file_handler]
propagate: no
Expand Down
2 changes: 1 addition & 1 deletion confs/prod.nose
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[nosetests]
with-cov=1
cov=udtc
cov=umake
cov-report=term-missing,html,xml
cov-config=confs/coverage.cov
9 changes: 9 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
ubuntu-make (0.2-0ubuntu1) UNRELEASED; urgency=medium

* Releasing under new name: ubuntu-make. Handle transition by shipping
a temporary binary under the older name (udtc). New command is umake.
Note as well that the new framework environment variable is
UMAKE_FRAMEWORKS.

-- Didier Roche <didrocks@ubuntu.com> Tue, 09 Dec 2014 08:23:33 +0100

ubuntu-developer-tools-center (0.1.1-0ubuntu1) vivid; urgency=medium

* Bug-fix release as Google changed their android-studio checksum from
Expand Down
14 changes: 11 additions & 3 deletions debian/control
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Source: ubuntu-developer-tools-center
Source: ubuntu-make
Section: devel
Priority: optional
Build-Depends: debhelper (>= 9),
Expand All @@ -25,7 +25,7 @@ Standards-Version: 3.9.5
X-Python3-Version: >= 3.4
XS-Testsuite: autopkgtest

Package: ubuntu-developer-tools-center
Package: ubuntu-make
Architecture: all
Depends: ${misc:Depends},
${python3:Depends},
Expand All @@ -38,9 +38,17 @@ Depends: ${misc:Depends},
python3-requests,
python3-xdg,
Description: setup your development environment on ubuntu easily
Ubuntu Developer Tools Center provides a set of functionality to setup,
Ubuntu Make provides a set of functionality to setup,
maintain and personalize your developer environment easily. It will handle
all dependencies, even those which aren't in Ubuntu itself, and install
latest versions of the desired and recommended tools.
.
For now, you can configure a complete android studio environment.

Package: ubuntu-developer-tools-center
Architecture: all
Section: oldlibs
Priority: extra
Depends: ubuntu-make, ${misc:Depends},
Description: transitional dummy package
This is a transitional dummy package. It can safely be removed.
4 changes: 2 additions & 2 deletions debian/copyright
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Ubuntu Developer Tools Center
Source: https://github.com/didrocks/ubuntu-developer-tools-center
Upstream-Name: Ubuntu Make
Source: https://github.com/didrocks/ubuntu-make

Files: *
Copyright: (C) 2014 Canonical
Expand Down
2 changes: 1 addition & 1 deletion debian/tests/all
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
# autopkgtest check: Run all udtc tests, including coverage
# autopkgtest check: Run all umake tests, including coverage
# (C) 2014 Canonical Ltd.
# Author: Didier Roche <didrocks@ubuntu.com>

Expand Down
3 changes: 2 additions & 1 deletion debian/ubuntu-developer-tools-center.postinst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ set -e

case "$1" in
configure)
register-python-argcomplete3 udtc > /etc/bash_completion.d/udtc
rm -f /etc/bash_completion.d/udtc
register-python-argcomplete3 umake > /etc/bash_completion.d/umake
;;

abort-upgrade|abort-remove|abort-deconfigure)
Expand Down
2 changes: 1 addition & 1 deletion debian/ubuntu-developer-tools-center.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -e

case "$1" in
purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
rm -f /etc/bash_completion.d/udtc
rm -f /etc/bash_completion.d/umake
;;

*)
Expand Down
4 changes: 2 additions & 2 deletions enable_completion
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# just source that file to enable shell completion on udtc
eval "$(register-python-argcomplete bin/udtc)"
# just source that file to enable shell completion on umake
eval "$(register-python-argcomplete bin/umake)"
70 changes: 35 additions & 35 deletions po/de.po
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# German translation for ubuntu-developer-tools-center
# German translation for ubuntu-make
# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
# This file is distributed under the same license as the ubuntu-developer-tools-center package.
# This file is distributed under the same license as the ubuntu-make package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
#
msgid ""
msgstr ""
"Project-Id-Version: ubuntu-developer-tools-center\n"
"Project-Id-Version: ubuntu-make\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2014-09-23 08:44+0200\n"
"PO-Revision-Date: 2014-10-24 20:48+0000\n"
Expand All @@ -17,134 +17,134 @@ msgstr ""
"X-Launchpad-Export-Date: 2014-10-29 09:16+0000\n"
"X-Generator: Launchpad (build 17203)\n"

#: udtc/__init__.py:104
#: umake/__init__.py:104
msgid "* Command '{}':"
msgstr "* Befehl '{}':"

#: udtc/__init__.py:112
#: umake/__init__.py:112
msgid "Deploy and setup developers environment easily on ubuntu"
msgstr "Entwicklerumgebungen einfach auf Ubuntu Aufspielen und Konfigurieren"

#: udtc/__init__.py:113
#: umake/__init__.py:113
msgid ""
"Note that you can also configure different debug logs behaviors using "
"LOG_CFG pointing to a log yaml profile."
msgstr ""

#: udtc/__init__.py:116
#: umake/__init__.py:116
msgid "Show this help"
msgstr "Hilfe anzeigen"

#: udtc/__init__.py:117
#: umake/__init__.py:117
msgid "Increase output verbosity (2 levels)"
msgstr ""

#: udtc/__init__.py:119
#: umake/__init__.py:119
msgid "Remove specified framework if installed"
msgstr ""

#: udtc/tools.py:329
msgid "# UDTC installation of {}\n"
#: umake/tools.py:329
msgid "# Ubuntu make installation of {}\n"
msgstr ""

#: udtc/interactions/__init__.py:73
#: umake/interactions/__init__.py:73
msgid "No suitable answer provided"
msgstr "Keine rightige Antwort gegeben"

#: udtc/interactions/__init__.py:75
#: umake/interactions/__init__.py:75
msgid "Your entry '{}' isn't an acceptable choice. choices are: {}"
msgstr "Ihre Eingabe '{}' ist nicht erlaubt. Mögliche Eingaben sind: {}"

#: udtc/interactions/__init__.py:78
#: umake/interactions/__init__.py:78
msgid "Your entry '{}' isn't an acceptable choice. choices are: {} and {}"
msgstr ""
"Ihre Eingabe '{}' ist nicht erlaubt. Mögliche Eingaben sind {} oder {}"

#: udtc/interactions/__init__.py:96
#: umake/interactions/__init__.py:96
msgid " ({})"
msgstr " ({})"

#: udtc/interactions/__init__.py:100
#: umake/interactions/__init__.py:100
msgid ""
"{}\n"
"[{}] "
msgstr ""
"{}\n"
"[{}] "

#: udtc/interactions/__init__.py:103
#: umake/interactions/__init__.py:103
msgid "{} [{}] "
msgstr "{} [{}] "

#: udtc/interactions/__init__.py:111
#: umake/interactions/__init__.py:111
msgid "I Accept"
msgstr "Ich akzeptiere"

#: udtc/interactions/__init__.py:111
#: umake/interactions/__init__.py:111
msgid "a"
msgstr "a"

#: udtc/interactions/__init__.py:112
#: umake/interactions/__init__.py:112
msgid "I don't accept"
msgstr "Ich akzeptiere nicht"

#: udtc/interactions/__init__.py:112 udtc/interactions/__init__.py:145
#: umake/interactions/__init__.py:112 umake/interactions/__init__.py:145
msgid "N"
msgstr "N"

#: udtc/interactions/__init__.py:121 udtc/interactions/__init__.py:122
#: umake/interactions/__init__.py:121 umake/interactions/__init__.py:122
msgid "{} ({})"
msgstr "{} ({})"

#: udtc/interactions/__init__.py:125
#: umake/interactions/__init__.py:125
msgid "[{}] "
msgstr "[{}] "

#: udtc/interactions/__init__.py:144
#: umake/interactions/__init__.py:144
msgid "Yes"
msgstr "Ja"

#: udtc/interactions/__init__.py:144
#: umake/interactions/__init__.py:144
msgid "y"
msgstr "j"

#: udtc/interactions/__init__.py:145
#: umake/interactions/__init__.py:145
msgid "No"
msgstr "Nein"

#: udtc/frameworks/__init__.py:240
#: umake/frameworks/__init__.py:240
msgid "You can't remove {} as it isn't installed"
msgstr ""

#: udtc/frameworks/__init__.py:271
#: umake/frameworks/__init__.py:271
msgid ""
"If the default framework name isn't provided, destdir should contain a /"
msgstr ""

#: udtc/frameworks/__init__.py:274
#: umake/frameworks/__init__.py:274
msgid "Remove framework if installed"
msgstr ""

#: udtc/frameworks/android.py:39
#: umake/frameworks/android.py:39
msgid "Android"
msgstr "Android"

#: udtc/frameworks/android.py:39
#: umake/frameworks/android.py:39
msgid "Android Development Environment"
msgstr "Android Entwicklungsumgebung"

#: udtc/frameworks/android.py:93
#: umake/frameworks/android.py:93
msgid "Android Studio"
msgstr "Android Studio"

#: udtc/frameworks/android.py:96
#: umake/frameworks/android.py:96
msgid "Android Studio developer environment"
msgstr "Android Studio Entwicklungsumgebung"

#: udtc/frameworks/android.py:143
#: umake/frameworks/android.py:143
msgid "ADT Eclipse"
msgstr ""

#: udtc/frameworks/android.py:146
#: umake/frameworks/android.py:146
msgid "Android Developer Tools (using eclipse)"
msgstr ""
Loading

0 comments on commit b5d19c3

Please sign in to comment.