Changeset 107

Show
Ignore:
Timestamp:
08/04/06 01:43:49 (2 years ago)
Author:
robin
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • streamservice/trunk/python/streamservice/json_provides.py

    r103 r107  
    1515GENERATORID='<http://svn.wiretooth.com/svn/open/scripts/%s>' % BASENAME 
    1616 
    17 def run_json_provides(): 
     17def run_json_provides(progname, args, outf=sys.stdout): 
    1818    """setuptools compatible entry point.""" 
    19     parser=optparse.OptionParser(usage=__doc__) 
    20     options,args=parser.parse_args(sys.argv[1:]) 
    21     produce_namespace_boilerplate(sys.stdout, args) 
     19    parser=optparse.OptionParser( 
     20        usage=__doc__.replace(BASENAME, progname), prog=progname) 
     21    options,args=parser.parse_args(args) 
     22    produce_namespace_boilerplate(outf, args) 
     23 
     24def entrypoint_json_provides(): 
     25    run_json_provides(BASENAME, sys.argv[1:]) 
    2226 
    2327def produce_namespace_boilerplate(outf, infilenames): 
    …… 
    8185 
    8286if __name__=='__main__': 
    83     run_json_provides() 
     87    entrypoint_json_provides() 

  • streamservice/trunk/python/streamservice/tools.py

    r106 r107  
    11#!/usr/bin/env python2.4 
    2 import os 
     2import os,shutil,sys 
    33from slavetools.optionsapi import COMMON_OPTS, build_parser 
    44from slavetools.slaveapi import run_wrapper_withconfig, run_withconfig 
     5from slavetools.slaveapi import run_wrapper_withoptions 
    56from slavetools.slaveapi import get_log 
    67from streamservice.clientapi import * 
     8from streamservice.json_provides import run_json_provides 
    79 
    810def run_dispatch_batch(progname, options, args, conf): 
    …… 
    101103    ] 
    102104 
    103 def run_pack_javascript(options, args): 
    104     pass 
     105def run_pack_javascript(progname, options, args): 
     106    run_json_provides(progname, ['%s.json' % fn for fn in args], 
     107        sys.stdout) 
     108    for fn in args: 
     109        sys.stdout.write(file(fn).read()) 
    105110 
    106111COMMANDMAP = { 
    …… 
    119124            PACK_JAVASCRIPT_OPTS), {}, 
    120125        run_wrapper_withoptions, (run_pack_javascript,), {}), 
    121     'declare-json' : (1, run_declare_json) 
     126    'json-provides' : (1, run_json_provides) 
     127    } 
    122128 
    123129def run(argv=None): 

  • streamservice/trunk/setup.py

    r105 r107  
    2323    entry_points = { 
    2424        'console_scripts': [ 
    25         'json-provides = streamservice.json_provides:run_json_provides', 
     25        'json-provides = streamservice.json_provides:entrypoint_json_provides', 
    2626        # python implementation to ease testing server implementations 
    2727        'streamservice-tools = streamservice.tools:run [CLI]', 
    …… 
    3131        exclude_directories=data_standard_exclude_directories + ( 
    3232            'develop',)), 
    33     package_dir = {'':'./src-python'}, 
    34     packages=find_packages('./src-python', exclude=( 
     33    package_dir = {'':'./python'}, 
     34    packages=find_packages('./python', exclude=( 
    3535        'ez_setup','develop', '*.tests','*.tests.*','tests.*', 'tests')), 
    3636    classifiers=[ 

  • streamservice/trunk/tests/test-Dispatch.html

    r105 r107  
    88    src="../lib/SimpleTest/SimpleTest.js"></script> 
    99    <script type="text/javascript"  
    10     src="../lib/streamservice/streamservice.declare.js"></script> 
    11     <script type="text/javascript"  
    12     src="../lib/streamservice/Dispatch.js"></script> 
    13     <script type="text/javascript"  
    14     src="../lib/streamservice/Loopback.js"></script> 
     10    src="../lib/streamservice/streamservice.js"></script> 
    1511    <script type="text/javascript"  
    1612    src="test_Dispatch.js"></script>