diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/LICENSE b/LICENSE
old mode 100644
new mode 100755
diff --git a/MANIFEST.in b/MANIFEST.in
old mode 100644
new mode 100755
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 2232caf..5e3b71a
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-WINPYTHON=C:/Python27/python.exe
+WINPYTHON=C:/python27/Scripts/pyinstaller.exe
winexe:
- $(WINPYTHON) C:/Python27/pyinstaller-2.0/pyinstaller.py -y odel-runner.py
+ $(WINPYTHON) -y --onefile odel-runner.py
diff --git a/README.rst b/README.rst
old mode 100644
new mode 100755
diff --git a/odel/__init__.py b/odel/__init__.py
old mode 100644
new mode 100755
diff --git a/odel/__main__.py b/odel/__main__.py
old mode 100644
new mode 100755
diff --git a/odel/odel.py b/odel/odel.py
old mode 100644
new mode 100755
index 0938d94..a3ff19b
--- a/odel/odel.py
+++ b/odel/odel.py
@@ -4,11 +4,12 @@
"""odel.odel: provides entry point main()."""
-__version__ = "0.3.0"
+__version__ = "0.4.0"
import argparse
import logging
+import sys
from argh import ArghParser, completion, set_default_command
@@ -21,6 +22,10 @@
action='store_true',
default=False,
help="Enable debug logging.")
+COMMON_PARSER.add_argument('--version',
+ action='store_true',
+ default=False,
+ help="Print version information and quit.")
def main():
"""Main application entrypoint"""
@@ -39,4 +44,30 @@ def main():
# Cut down suds logs
logging.getLogger('suds').setLevel(logging.WARNING)
+ if args.version:
+ print_version()
+ return
+
parser.dispatch()
+
+
+def print_version():
+ sys.stdout.write(
+ "Odel. Tool to upload Data Integrator files to IBM Tririga.\n"
+ "Version {}\n"
+ "\n"
+ "Copyright (C) 2014 Nithin Philips\n"
+ "\n"
+ "This program is free software: you can redistribute it and/or modify\n"
+ "it under the terms of the GNU General Public License as published by\n"
+ "the Free Software Foundation, either version 3 of the License, or\n"
+ "(at your option) any later version.\n"
+ "\n"
+ "This program is distributed in the hope that it will be useful,\n"
+ "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+ "GNU General Public License for more details.\n"
+ "\n"
+ "You should have received a copy of the GNU General Public License\n"
+ "along with this program. If not, see .\n".format(__version__)
+ )
diff --git a/requirements.txt b/requirements.txt
old mode 100644
new mode 100755
diff --git a/setup.py b/setup.py
old mode 100644
new mode 100755
index 6075f80..e0bc949
--- a/setup.py
+++ b/setup.py
@@ -1,42 +1,42 @@
-# -*- coding: utf-8 -*-
-
-
-"""setup.py: setuptools control."""
-
-
-import re
-from setuptools import setup, find_packages
-
-
-version = re.search(
- '^__version__\s*=\s*"(.*)"',
- open('odel/odel.py').read(),
- re.M
- ).group(1)
-
-
-with open("README.rst", "rb") as f:
- long_descr = f.read().decode("utf-8")
-
-
-setup(
- name = "cmdline-odel",
- packages = find_packages(exclude=['contrib', 'docs', 'tests*']),
- entry_points = {
- "console_scripts": ['odel = odel.odel:main']
- },
- install_requires = [
- "argh",
- "argcomplete",
- "bunch",
- "suds",
- "requests",
- ],
- version = version,
- description = "Odel uploads Data Integrator files to Tririga",
- long_description = long_descr,
- author = "Nithin Philips",
- author_email = "nithin@nithinphilips.com",
- url = "",
- test_suite="odel.tests",
- )
+# -*- coding: utf-8 -*-
+
+
+"""setup.py: setuptools control."""
+
+
+import re
+from setuptools import setup, find_packages
+
+
+version = re.search(
+ '^__version__\s*=\s*"(.*)"',
+ open('odel/odel.py').read(),
+ re.M
+ ).group(1)
+
+
+with open("README.rst", "rb") as f:
+ long_descr = f.read().decode("utf-8")
+
+
+setup(
+ name = "cmdline-odel",
+ packages = find_packages(exclude=['contrib', 'docs', 'tests*']),
+ entry_points = {
+ "console_scripts": ['odel = odel.odel:main']
+ },
+ install_requires = [
+ "argh",
+ "argcomplete",
+ "bunch",
+ "suds",
+ "requests",
+ ],
+ version = version,
+ description = "Odel uploads Data Integrator files to Tririga",
+ long_description = long_descr,
+ author = "Nithin Philips",
+ author_email = "nithin@nithinphilips.com",
+ url = "",
+ test_suite="odel.tests",
+ )
diff --git a/windows/Makefile b/windows/Makefile
index 6a9a044..5c1e50e 100755
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -4,7 +4,7 @@ PROGRAM=Odel
CANDLE=candle
LIGHT=light
-VERSION=0.3.0
+VERSION=0.4.0
MSI_NAME="$(PROGRAM)-$(VERSION)"
diff --git a/windows/Odel.wxs b/windows/Odel.wxs
index 57fa983..0a3b0fe 100755
--- a/windows/Odel.wxs
+++ b/windows/Odel.wxs
@@ -1,6 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+