Merge branch 'release/0.1.2'

coded-by-hand · Apr 11, 2012 · 26ae7e7 · 26ae7e7
2 parents 9fa67c4 + 64cdb81
commit 26ae7e7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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)

diff --git 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',