Changeset 256

Timestamp:

07/19/07 11:53:22 (1 year ago)

Author:

marc

Message:

Improved arugment handling and man pages across both branches

Files:

• branches/release/0.2/ChangeLog (modified) (1 diff)
• branches/release/0.2/config.py (modified) (3 diffs)
• branches/release/0.2/console.py (modified) (1 diff)
• branches/release/0.2/itaka.py (modified) (2 diffs)
• branches/release/0.2/share/itaka.1 (modified) (1 diff)
• trunk/ChangeLog (modified) (1 diff)
• trunk/config.py (modified) (2 diffs)
• trunk/console.py (modified) (1 diff)
• trunk/itaka.py (modified) (2 diffs)
• trunk/itaka.spec (modified) (1 diff)
• trunk/share/itaka.1 (modified) (1 diff)

branches/release/0.2/ChangeLog

@@ -2 +2 @@
- * Fixed a serious security bug in which /screenshot prompted no auth. Also
- fixed sending the wrong Content-Lenght for the screenshot. Report Itaka
-
-
+
+
+
+
-
-0.2 (I've been watching you...):

branches/release/0.2/config.py

@@ -51 +51 @@
-image_dir = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "share/images/")
-#: To be changed on install to specify where the installed files actually are
-/
+
-if os.path.exists(prefix):
-    image_dir = prefix
@@ -114 +114 @@
-    """
-
-None
+1
-        """
-        Configuration engine constructor. It also handles whether the L{output} setting is set to print everything to the console.
@@ -121 +121 @@
-        @param arguments: A tuple of sys.argv 
-        """
-arguments is not None and len(arguments) > 1 and arguments[-1] == "-debug"
+len(arguments) > 1 and arguments[-1] in ("--debug", "-d")
-            global output
-            output = {'normal': True, 'debug': True, 'quiet': False}

branches/release/0.2/console.py

@@ -87 +87 @@
-
-        self.itakaglobals = itakaglobals
-
+
+
+
+
-            BaseMessage('Itaka %s starting' % (itakaglobals.version))
-            

branches/release/0.2/itaka.py

@@ -25 +25 @@
-import sys, traceback
-
-elp', '
+', '--help', '-v', '--version', '-r', '--revision', '-d', '-
-arguments = sys.argv
-
-# Only one option at a time
-
-
+
+
+
+
+
+
+
+
+
+
+
-    sys.exit(1)
-elif len(arguments) == 1:
-    arguments = None
-
-# Itaka core modules
@@ -59 +66 @@
-
-if __name__ == "__main__":
+    if len(arguments) >= 2: 
+        if (arguments[-1] in (validarguments[2], validarguments[3])):
+            print itakaglobals.version
+            sys.exit(0)
+        if (arguments[-1] in (validarguments[4], validarguments[5])):
+            print itakaglobals.revision
+            sys.exit(0)
+
-    try:
-        gui = igui.Gui(console, (itakaglobals, configinstance))

branches/release/0.2/share/itaka.1

@@ -8 +8 @@
-.PP 
-Itaka is a on-demand screenshooting server based on the HTTP protocol. It integrates a specifically coded server to take screenshots on-demand when your machine is queried through a remote browser. It has a GTK GUI for client notification. 
+.SH OPTIONS
+Itaka follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-r, \-\-revision
+Show the revision of program.
+.TP
+.B \-d, \-\-debug
+Start in debug mode.
-.SH "SEE ALSO" 
-.PP 
-.gz
+
-.SH "AUTHOR" 
-.PP 
-santusmarc@gmail.com. 
+<santusmarc@gmail.com>
-.PP 
-This manual page was written by Marc E. santusmarc@gmail.com for 

trunk/ChangeLog

@@ -12 +12 @@
- * Fixed a serious security bug in which /screenshot prompted no auth. Also
- fixed sending the wrong Content-Lenght for the screenshot. Report Itaka
-
+
+
+
+
-
-0.2 (I've been watching you...):

trunk/config.py

@@ -101 +101 @@
-    """
-
-None
+1
-        """
-        Configuration engine constructor. It also handles whether the
@@ -110 +110 @@
-        """
-
-arguments is not None and len(arguments) > 1 and arguments[-1] == '-debug'
+len(arguments) > 1 and arguments[-1] in ('-d', '--debug')
-            global console_verbosity
-            console_verbosity = {'normal': True, 'debug': True, 'quiet': False}

trunk/console.py

@@ -134 +134 @@
-
-        self.itaka_globals = itaka_globals
-
-
+
+
+
+
-            
-    def message(self, message):

trunk/itaka.py

@@ -59 +59 @@
-    gettext.textdomain('itaka')
-
-_arguments = ('-help', '
+arguments = ('-h', '--help', '-v', '--version', '-r', '--revision', '-d', '-
-arguments = sys.argv
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    sys.exit(1)
-elif len(arguments) == 1:
-    arguments = None
-
-try:
@@ -89 +94 @@
-
-if __name__ == "__main__":
+    if len(arguments) >= 2:
+        if (arguments[-1] in (validarguments[2], validarguments[3])):
+            print itaka_globals.__version__
+            sys.exit(0)
+        if (arguments[-1] in (validarguments[4], validarguments[5])):
+            print itaka_globals.__revision__
+            sys.exit(0)
+
-    try:
-        gui = igui.Gui(console_instance, (itaka_globals, config_instance))

trunk/itaka.spec

@@ -76 +76 @@
-%{_prefix}/lib/itaka/screenshot.py
-%{_prefix}/lib/itaka/console.py
-%{_prefix}/lib/itaka/config.pyc
-%{_prefix}/lib/itaka/console.pyc
-%{_prefix}/lib/itaka/error.pyc
-%{_prefix}/lib/itaka/itaka.pyc
-%{_prefix}/lib/itaka/screenshot.pyc
-%{_prefix}/lib/itaka/server.pyc
-%{_prefix}/lib/itaka/uigtk.pyc
-
-%changelog

trunk/share/itaka.1

@@ -8 +8 @@
-.PP 
-Itaka is a on-demand screenshooting server based on the HTTP protocol. It integrates a specifically coded server to take screenshots on-demand when your machine is queried through a remote browser. It has a GTK GUI for client notification. 
+.SH OPTIONS
+Itaka follows the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.TP
+.B \-r, \-\-revision
+Show the revision of program.
+.TP
+.B \-d, \-\-debug
+Start in debug mode.
-.SH "SEE ALSO" 
-.PP 
-.gz
+
-.SH "AUTHOR" 
-.PP 
-santusmarc@gmail.com. 
+<santusmarc@gmail.com>
-.PP 
-This manual page was written by Marc E. santusmarc@gmail.com for