Changeset 801

Timestamp:

09/16/07 22:59:00 (1 year ago)

Author:

robin

Message:

--

Files:

• pyrun/trunk/bakescripts.py (moved) (moved from pyrun/trunk/pyscriptbake.py) (12 diffs)

pyrun/trunk/bakescripts.py

@@ -9 +9 @@
-import logging
-log = logging.getLogger(__name__)
-
-log = logging.getLogger(__name__)
-log.setLevel(logging.INFO)
-
-pyrun = None
@@ -216 +213 @@
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-    ensure_pkg_resources()
-
-
-
+
+
+
+
+
-
-    locations, parameters = resolve_egg_scripts(
@@ -231 +235 @@
-    generated = []
-    for sname, name, module_name, attrs in parameters:
-
+
+
+
-            continue
-        # if scripts is a flat list it is simply saying
@@ -246 +252 @@
-            invoke_program = '%s.%s(%s)' % (module_name, attrs, s[1])
-        else:
-
+
+
-
-        sname = join(bindir, sname)
-
-
-
-
+
+
+
+
+
+
-
-    return generated
-
-
-
-
-
+
-    """Generate script `dest` with bake in relative paths to items in `path`
-
-    """
-
+    ensure_pkg_resources()
+
+    variables = _default_generator_opts.copy()
+    variables.update(opts)
+
+    dry_run = variables['dry_run']
+    extrapath = variables['extrapath']
+    executable = variables['executable']
+    initialization = variables['initialization']
+    arguments = variables['arguments']
+    template = variables['template']
+    xtemplatekw = variables['xtemplatekw']
+    invoke_program = variables.get('invoke_program', None)
+
-    if invoke_program is None:
-)' % module_name
+%s)' % (module_name, arguments or '')
-    if not template:
-        template = script_template
@@ -272 +293 @@
-    if initialization is None:
-        initialization = ''
+    if not xtemplatekw:
+        xtemplatekw = {}
-
-    generated = []
@@ -309 +332 @@
-            # generate exe file and give the script a magic name:
-            exe = script+'.exe'
-
-
-
+
+
+
+
-            generated.append(exe)
+
-    if changed:
-
-
-
+
+
-        try:
-            os.chmod(dest, 0755)
@@ -397 +421 @@
-# command line tool
-
+def reportline(head, tail, truncate=78, reportmethod=log.info):
+
+    if not truncate:
+        reportmethod(''.join([head, tail]))
+    else:
+        maxlen = truncate - len(tail) - 1
+        if len(head) > maxlen:
+            maxlen -= len(' ...')
+            reportmethod(head[:maxlen] + ' ... ' + tail)
+        else:
+            head += ' ' * (maxlen - len(head))
+            reportmethod(''.join([head, tail]))
+
+
-def get_options(parser=None):
-    """Create (or update) an optparse.OptionParser.
@@ -407 +445 @@
-
-    parser.add_option('-q', '--quiet', default=False, action='store_true')
+    parser.add_option('-N', '--dry-run', default=False, action='store_true')
-    parser.add_option('-R', dest='requirements', default=[], action='append')
-    parser.add_option('-P', dest='projects', default=[], action='append')
@@ -416 +455 @@
-def run(argv=None):
-
+    logging.basicConfig(
+        level=logging.INFO,
+        format='%(message)s'
+    )
+    log.setLevel(logging.INFO)
+
+
-    ensure_pkg_resources()
-    ensure_pyrun()
@@ -430 +476 @@
-    parser.disable_interspersed_args()
-    opts, args = parser.parse_args(args=argv[1:])
+
+    dry_run = getattr(opts, 'dry_run', False)
-    legal_postpath_opts={
-            '-R': opts.requirements, '-P' : opts.projects, '-s':opts.scripts
@@ -452 +500 @@
-        log.warning('\t' + '\n\t'.join(doesnotexist))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        ia += 1
+        while ia < len(argv):
+            if argv[ia] in legal_postpath_opts:
+                curoplist = legal_postpath_opts[argv[ia]]
+            elif argv[ia].startswith('-'):
+                log.error(dedent('''\
+                "%s" is ileagal after the discovery path. [%s] are the only
+                options which may follow the discovery path.''' % ( argv[ia],
+                    '|'.join(legal_postpath_opts.keys())))
+                )
+                sys.exit(-1)
+            else:
+                curoplist.append(argv[ia])
+            ia += 1
-
-    generated = generate_egg_scripts(pthextend,
@@ -473 +521 @@
-            opts.projects,
-            opts.scripts,
-
-
+
+
+
+
+
+
-
-