From 265b1e695bcad3d28d241b578e85df490ae570ec Mon Sep 17 00:00:00 2001 From: Alex Padgett Date: Wed, 11 Apr 2012 09:21:39 -0400 Subject: [PATCH 1/2] If file isn't already in config.sources, add it --- mass/parse.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mass/parse.py b/mass/parse.py index a853744..a08383c 100644 --- a/mass/parse.py +++ b/mass/parse.py @@ -34,7 +34,11 @@ def get_output(src): for line in lines: m = re.match(config.import_regex,line) if m: - include_file = config.sources[os.path.abspath(src.dir + '/' + m.group('script'))] + include_path = os.path.abspath(src.dir + '/' + m.group('script')); + if include_path not in config.sources: + script = Script(include_path) + config.sources[script.path] = script + include_file = config.sources[include_path] #require statements dont include if the file has already been included if include_file not in config.stack or m.group('command') == 'import': config.stack.append(include_file) From 64cdb81a7e68ca62844dbd05b00106f683e6a1da Mon Sep 17 00:00:00 2001 From: Alex Padgett Date: Wed, 11 Apr 2012 09:24:08 -0400 Subject: [PATCH 2/2] Update version number --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 143b7ea..ebbd003 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ def read(fname): setup( name='mass', - version='0.1.1', + version='0.1.2', description='Merge and Simplify Scripts: an automated tool for managing, combining and minifying javascript assets for web projects.', long_description=read('README'), author='jack boberg alex padgett',