TooAngel · Sep 12, 2014 · Sep 11, 2014 · Sep 12, 2014 · Sep 11, 2014 · Sep 11, 2014
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 cctrl.egg-info/
+dotcloudng.egg-info/
 htmlcov/
 .cache/
diff --git a/cctrl/dcapp b/cctrl/dcapp
@@ -0,0 +1,26 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+    Copyright 2014 cloudControl GmbH
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+
+from cctrl.settings import Settings
+from cctrl.app_commands import setup_cli
+
+
+if __name__ == "__main__":
+    settings = Settings(api_url='https://api.dotcloudapp.com', ssh_forwarder_url='sshforwarder.dotcloudapp.com')
+    setup_cli(settings)
diff --git a/cctrl/dcuser b/cctrl/dcuser
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+    Copyright 2014 cloudControl GmbH
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+"""
+from cctrl.settings import Settings
+from cctrl.user_commands import setup_cli
+
+
+if __name__ == "__main__":
+    settings = Settings(api_url='https://api.dotcloudapp.com', ssh_forwarder_url='sshforwarder.dotcloudapp.com')
+    setup_cli(settings)
diff --git a/cctrl/version.py b/cctrl/version.py
@@ -1,2 +1,2 @@
 # -*- coding: utf-8 -*-
-__version__ = '1.11.1'
+__version__ = '1.12.0'
diff --git a/ci/README.md b/ci/README.md
@@ -0,0 +1,40 @@
+Continous releasing
+===================
+
+This CI setup releases `cctrl` and `dotcloudng` packages on PyPI whenever a new bumped version
+is pushed into master branch.
+
+Requirements
+------------
+
+* Create a [PyPI account](https://pypi.python.org/pypi?%3Aaction=register_form) for jenkins user.
+* Create `.pypirc` file at jenkins user's $HOME:
+
+~~~
+[distutils]
+index-servers =
+    pypi
+
+[pypi]
+username:{Jenkins username at PyPI}
+password:{Jenkins password at PyPI}
+~~~
+
+* Add _maintainer_ [role](https://pypi.python.org/pypi?:action=role_form&package_name=cctrl) in `cctrl` and `dotcloung` to jenkins user.
+
+Build Configuration
+-------------------
+
+Build configuration is basic and similar to other jenkins builds. Furthermore,
+_Execute shell_ is pretty simple:
+
+    ci/prepare
+    python ci/release.py
+
+Double checking
+---------------
+
+When build is executed, you should find fresh new packages released under:
+
+* `cctrl`: https://pypi.python.org/pypi/cctrl
+* `dotcloudng`: https://pypi.python.org/pypi/dotcloudng
diff --git a/ci/prepare b/ci/prepare
@@ -0,0 +1,12 @@
+#!/bin/bash -e
+
+echo "Install python tools..."
+cd $WORKSPACE
+
+if [ ! -d "cctrl_venv" ]; then
+    virtualenv --system-site-packages cctrl_venv
+fi
+source cctrl_venv/bin/activate
+pip install -r requirements_tests.txt --upgrade
+
+./pre-commit
diff --git a/ci/release.py b/ci/release.py
@@ -0,0 +1,43 @@
+import os
+import sys
+import xmlrpclib
+
+from shutil import rmtree
+from subprocess import check_call
+
+TEMP_DIR = 'tmp'
+PROJECT_NAME = 'cctrl'
+DIST_DIR = os.path.join(TEMP_DIR, 'dist')
+
+
+def main():
+    if is_current_version():
+        sys.exit("Version is not updated. Aborting release.")
+
+    dist()
+    cleanup()
+
+
+def is_current_version():
+    pypi = xmlrpclib.ServerProxy('http://pypi.python.org/pypi')
+    return pypi.package_releases('cctrl')[0] == __version__
+
+
+def dist():
+    try:
+        check_call(['python',
+                    'setup.py',
+                    'sdist',
+                    '--dist-dir={0}'.format(DIST_DIR),
+                    '--formats=gztar',
+                    'upload'])
+    except OSError as e:
+        print e
+
+
+def cleanup():
+    rmtree(TEMP_DIR)
+
+if __name__ == '__main__':
+    execfile(os.path.join(PROJECT_NAME, 'version.py'))
+    main()
diff --git a/setup.py b/setup.py
@@ -27,7 +27,7 @@
 required.append('pycclib>=1.5.2')
 required.append('argparse>=1.1')
 
-srcscripts = ['cctrl/cctrlapp', 'cctrl/cctrluser', 'cctrl/exoapp', 'cctrl/exouser']
+srcscripts = ['cctrl/cctrlapp', 'cctrl/cctrluser', 'cctrl/exoapp', 'cctrl/exouser', 'cctrl/dcapp', 'cctrl/dcuser']
 
 if sys.platform == 'win32':
     import py2exe
@@ -95,3 +95,30 @@
     test_suite='test',
     **extra_options
 )
+
+setup(
+    name="dotcloudng",
+    version=__version__,
+    description='dotcloud command line utilities',
+    author='dotcloud Team',
+    author_email='info@dotcloud.com',
+    url='https://www.dotcloud.com',
+    license='Apache 2.0',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Console',
+        'Intended Audience :: Developers',
+        'Intended Audience :: Information Technology',
+        'Intended Audience :: System Administrators',
+        'License :: OSI Approved :: Apache Software License',
+        'Operating System :: MacOS :: MacOS X',
+        'Operating System :: Microsoft :: Windows',
+        'Operating System :: POSIX',
+        'Programming Language :: Python',
+        'Topic :: Internet'
+    ],
+    install_requires=required,
+    tests_require=['mock'],
+    test_suite='test',
+    **extra_options
+)
diff --git a/win32/README.md b/win32/README.md
@@ -0,0 +1,26 @@
+Building cloudControl CLI Windows installer
+============================
+
+### PRE-INSTALLATION STEPS
+
+1. Install python 2.7.6 via msi installer: [http://www.python.org/download/releases/2.7.6/](http://www.python.org/download/releases/2.7.6/)
+2. Install setuptools: [https://bitbucket.org/pypa/setuptools#rst-header-windows](https://bitbucket.org/pypa/setuptools#rst-header-windows)
+3. Install pycrypto for python 2.7: [http://www.voidspace.org.uk/python/modules.shtml#pycrypto](http://www.voidspace.org.uk/python/modules.shtml#pycrypto)
+4. Install p2exe: [http://sourceforge.net/projects/py2exe](http://sourceforge.net/projects/py2exe)
+5. Install Inno Setup: [http://www.jrsoftware.org/isdl.php#stable](http://www.jrsoftware.org/isdl.php#stable)
+6. Install git bash: [http://msysgit.github.io/](http://msysgit.github.io/)
+
+### BUILDING CLI FOR SPECIFIC ENVIRONMENT
+
+* To start build, simply execute (use git bash):
+
+	~~~bash
+	$ win32/build_installer.sh ENV PATH_TO_CCTRL_DIR
+	~~~
+
+	where:
+
+	- `ENV` is `[cctrl|dotcloudng]`
+	- `PATH_TO_CCTRL_DIR` is an optional parameter specifying path to cctrl source directory. If not specified build script will clone master version.
+
+Optionally, you can specify locations of `Python` and `ISCC` home directories by setting these env variables: `PYTHON_HOME` and `ISCC_HOME`. After successful build, executable file is located in `win32setup` directory.
diff --git a/win32/build_host_dependencies.txt b/win32/build_host_dependencies.txt
diff --git a/win32/build_installer.sh b/win32/build_installer.sh
@@ -1,17 +1,9 @@
 #!/bin/bash
 
-# Script for building cloudControl CLI Windows installer
-
-# Preparation steps:
-# Install python 2.7.6 via msi installer: http://www.python.org/download/releases/2.7.6/
-# Install setuptool: https://bitbucket.org/pypa/setuptools#rst-header-windows
-# Install pycrypto for python 2.7: http://www.voidspace.org.uk/python/modules.shtml#pycrypto
-# Install p2exe: http://sourceforge.net/projects/py2exe
-# Install Inno Setup: http://www.jrsoftware.org/isdl.php#stable
-
 set -e
 
 echo "[INFO] Checking env..."
+ENV=$1
 
 if [ ! -f "$PYTHON_HOME" ]; then
 	PYTHON_HOME=c:/Python27
@@ -46,18 +38,18 @@ pushd pycclib > /dev/null
 popd > /dev/null
 
 echo "[INFO] Installing cctrl..."
-if [ ! -d  "$1" ]; then
+if [ ! -d  "$2" ]; then
 	git clone https://github.com/cloudControl/cctrl 2>&1 | handle_log
 	cctrl_dir=cctrl
 else
-	cctrl_dir="$1"
+	cctrl_dir="$2"
 fi
 
 pushd "$cctrl_dir" > /dev/null
 "$PYTHON_HOME/python.exe" setup.py py2exe 2>&1 | handle_log
 pushd win32 > /dev/null
 echo "[INFO] Building executable..."
-"$ISCC_HOME/ISCC.exe" wininstaller.iss 2>&1 | handle_log
+"$ISCC_HOME/ISCC.exe" wininstaller_$ENV.iss 2>&1 | handle_log
 popd > /dev/null
 popd > /dev/null
-echo "[INFO] Build successful :-)"
+echo "[INFO] Build successful :-)"
diff --git a/win32/wininstaller.iss → win32/wininstaller_cctrl.iss b/win32/wininstaller.iss → win32/wininstaller_cctrl.iss
@@ -7,7 +7,7 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppId={{86DDE49A-CB27-4B64-A816-887A13C06D58}
 AppName=cctrl
-AppVerName=cctrl-1.11.1
+AppVerName=cctrl-1.12.0
 AppPublisher=cloudControl GmbH
 AppPublisherURL=https://www.cloudcontrol.com
 AppSupportURL=https://www.cloudcontrol.com
@@ -17,7 +17,7 @@ DefaultGroupName=cloudControl
 AllowNoIcons=yes
 SourceDir=..\
 OutputDir=win32setup
-OutputBaseFilename=cctrl-1.11.1-setup
+OutputBaseFilename=cctrl-1.12.0-setup
 Compression=lzma
 SolidCompression=yes
 ChangesEnvironment=yes