Merge pull request #34 from redcanari/fixing-windows-bugs

Fixing windows bugs

Author: allfro

scripts/canari

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+
+from canari.entrypoints import main
+
+__author__ = 'Nadeem Douba'
+__copyright__ = 'Copyright 2012, Canari Project'
+__credits__ = []
+
+__license__ = 'GPLv3'
+__version__ = '0.2'
+__maintainer__ = 'Nadeem Douba'
+__email__ = 'ndouba@gmail.com'
+__status__ = 'Development'
+
+if __name__ == '__main__':
+    main()

scripts/canari.bat

@@ -0,0 +1 @@
+@%~dp0..\python.exe %~dp0canari %*

scripts/dispatcher

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from canari.entrypoints import dispatcher
+
+__author__ = 'Nadeem Douba'
+__copyright__ = 'Copyright 2012, Canari Project'
+__credits__ = []
+
+__license__ = 'GPLv3'
+__version__ = '0.1'
+__maintainer__ = 'Nadeem Douba'
+__email__ = 'ndouba@gmail.com'
+__status__ = 'Development'
+
+
+if __name__ == '__main__':
+    dispatcher()

scripts/dispatcher.bat

@@ -0,0 +1 @@
+@%~dp0..\python.exe %~dp0dispatcher %*

scripts/pysudo

@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+
+from canari.entrypoints import sudo
+
+__author__ = 'Nadeem Douba'
+__copyright__ = 'Copyright 2012, Canari Project'
+__credits__ = []
+
+__license__ = 'GPLv3'
+__version__ = '0.5'
+__maintainer__ = 'Nadeem Douba'
+__email__ = 'ndouba@gmail.com'
+__status__ = 'Development'
+
+
+if __name__ == '__main__':
+    sudo()

setup.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 
 import os
+import sys
 
 from setuptools import setup, find_packages
 
@@ -71,17 +72,10 @@ def do_transform(self, request, response, config):
     long_description = open('README.rst').read()
 
 scripts = [
-    'src/scripts/canari',
-    'src/scripts/dispatcher',
+    'canari',
+    'dispatcher'
 ]
 
-if os.name == 'posix':
-    scripts.extend(
-        [
-            'src/scripts/pysudo'
-        ]
-    )
-
 extras = [
     'readline'
 ]
@@ -100,26 +94,29 @@ def do_transform(self, request, response, config):
     'future'
 ]
 
-if os.name == 'nt':
+if sys.platform == 'win32':
     requires.append('pyreadline')
-    scripts += ['%s.bat' % s for s in scripts]
+    scripts.extend(['%s.bat' % s for s in scripts])
+else:
+    scripts.append('pysudo')
 
 setup(
     name='canari',
     author='Nadeem Douba',
-    version='3.2.1',
+    version='3.2.2',
     author_email='ndouba@gmail.com',
     description='Canari Framework - Maltego rapid transform development and execution framework.',
     long_description=long_description,
     license='GPLv3',
     packages=find_packages('src'),
     package_dir={'': 'src'},
     include_package_data=True,
-    scripts=scripts,
+    # scripts=scripts,
     zip_safe=False,
     install_requires=requires,
     dependency_links=[],
     url='https://github.com/redcanari/canari',
+    scripts=[os.path.join('scripts', s) for s in scripts],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',

src/TODO

@@ -3,7 +3,7 @@
 __credits__ = []
 
 __license__ = 'GPLv3'
-__version__ = '3.2.1'
+__version__ = '3.2.2'
 __maintainer__ = 'Nadeem Douba'
 __email__ = 'ndouba@gmail.com'
 __status__ = 'Development'
@@ -17,6 +17,7 @@
     'framework',
     'mode',
     'resource',
-    'tas'
+    'tas',
+    'entrypoints'
 ]
 

src/canari/__init__.py

@@ -25,4 +25,5 @@
     description='Show version of Canari framework that is currently active.'
 )
 def version(args):
-    print('Your running *Canari Framework v%s*' % canari.__version__, file=sys.stderr)
+    print('Canari Framework v%s' % canari.__version__, file=sys.stderr)
+    print('Running on Python %s (%s)' % (sys.version, sys.executable))

src/canari/commands/version.py

@@ -1,5 +1,3 @@
-from past.builtins import cmp
-
 """
 @version: 0.96(2010-08-29)
 
@@ -35,14 +33,14 @@
 are permitted provided that the following conditions are met:
 
     1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer. 
-    
+       this list of conditions and the following disclaimer.
+
     2. Redistributions in binary form must reproduce the above copyright notice,
        this list of conditions and the following disclaimer in the documentation and/or
-       other materials provided with the distribution. 
-    
+       other materials provided with the distribution.
+
     3. The name of the author may not be used to endorse or promote products derived
-       from this software without specific prior written permission. 
+       from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS"
 AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -68,7 +66,7 @@
 See http://www.gnu.org/licenses/license-list.html#GPLCompatibleLicenses
 
 The BSD License is less restrictive than GPL.
-It allows software released under the license to be incorporated into proprietary products. 
+It allows software released under the license to be incorporated into proprietary products.
 Works based on the software may be released under a proprietary license or as closed source software.
 http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29
 
@@ -100,6 +98,7 @@
 #    , 'EgStore'
     ]
 
+from past.builtins import cmp
 import sys, os
 import string
 import pickle