distil 0.10.4 → 0.11.0

data/vendor/jsl-0.3.0/src/config.mk

@@ -84,6 +84,11 @@ endif
 ifeq ($(OS_ARCH), CYGWIN32_NT)
 	OS_ARCH    := WINNT
 endif
+ifeq (MINGW32_NT,$(findstring MINGW32_NT,$(OS_ARCH)))
+	OS_RELEASE          := $(patsubst MINGW32_NT-%,%,$(OS_ARCH))
+	OS_ARCH_ENVIRONMENT := MINGW32_NT
+	OS_ARCH             := WINNT
+endif
 
 # Virtually all Linux versions are identical.
 # Any distinctions are handled in linux.h
@@ -96,10 +101,14 @@ else
 ifeq ($(OS_ARCH),Darwin)
 OS_CONFIG      := Darwin
 else
+ifeq ($(OS_ARCH_ENVIRONMENT),MINGW32_NT)
+OS_CONFIG      := MinGW$(OS_RELEASE)
+else
 OS_CONFIG       := $(OS_ARCH)$(OS_OBJTYPE)$(OS_RELEASE)
 endif
 endif
 endif
+endif
 
 ASFLAGS         =
 DEFINES         =
@@ -114,7 +123,7 @@ endif
 
 ifdef BUILD_OPT
 OPTIMIZER  = -O
-DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(shell whoami)
+DEFINES    += -UDEBUG -DNDEBUG -UDEBUG_$(USER)
 OBJDIR_TAG = _OPT
 else
 ifdef USE_MSVC
@@ -122,11 +131,16 @@ OPTIMIZER  = -Zi
 else
 OPTIMIZER  = -g
 endif
-DEFINES    += -DDEBUG -DDEBUG_$(shell whoami)
+DEFINES    += -DDEBUG -DDEBUG_$(USER)
 OBJDIR_TAG = _DBG
 endif
 
+ifeq ($(OS_ARCH), WINNT)
+SO_SUFFIX = dll
+EXE_DOTSUFFIX = .exe
+else
 SO_SUFFIX = so
+endif
 
 NS_USE_NATIVE = 1
 
@@ -145,6 +159,22 @@ CLASSPATH    = $(JDK)/lib/classes.zip$(SEP)$(CLASSDIR)/$(OBJDIR)
 
 include $(DEPTH)/config/$(OS_CONFIG).mk
 
+ifndef OBJ_SUFFIX
+ifdef USE_MSVC
+OBJ_SUFFIX = obj
+else
+OBJ_SUFFIX = o
+endif
+endif
+
+ifndef HOST_BIN_SUFFIX
+ifeq ($(OS_ARCH),WINNT)
+HOST_BIN_SUFFIX = .exe
+else
+HOST_BIN_SUFFIX =
+endif
+endif
+
 # Name of the binary code directories
 ifdef BUILD_IDG
 OBJDIR          = $(OS_CONFIG)$(OBJDIR_TAG).OBJD

data/vendor/jsl-0.3.0/src/fdlibm/Makefile.ref

@@ -91,8 +91,7 @@ include $(DEPTH)/config.mk
 #
 # Default IEEE libm
 #
-CFLAGS          += -DXP_UNIX $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) \
-		  -DJSFILE $(XCFLAGS) -D_IEEE_LIBM
+CFLAGS          += $(OPTIMIZER) $(OS_CFLAGS) $(DEFINES) $(INCLUDES) -DJSFILE $(XCFLAGS) -D_IEEE_LIBM
 
 # Need for jstypes.h and friends
 INCLUDES += -I..

data/vendor/jsl-0.3.0/src/jsl.c

@@ -63,11 +63,13 @@
 #include "jsscript.h"
 #include "jsstr.h"
 
-#ifdef XP_UNIX
+#if defined(XP_UNIX) || defined(_MINGW)
 #include <unistd.h>
 #include <sys/types.h>
 #include <dirent.h>
+#ifndef _MINGW
 #include <sys/wait.h>
+#endif
 #include <sys/stat.h>
 #endif
 
@@ -180,6 +182,12 @@ typedef struct JSLPathList {
     char path[MAXPATHLEN+1];
 } JSLPathList;
 
+typedef struct JSLAliasList {
+    JSCList links;
+    char path[MAXPATHLEN+1];
+    char alias[MAXPATHLEN+1];
+} JSLAliasList;
+
 typedef struct JSLScriptList {
     JSCList links;
 
@@ -189,6 +197,7 @@ typedef struct JSLScriptList {
 } JSLScriptList;
 
 JSLScriptList gScriptList;
+JSLAliasList gScriptAliasList;
 JSLPathList gIncludePathList;
 
 
@@ -305,8 +314,9 @@ IsDir(char *filename)
 
 
 
-#ifdef WIN32
+#if defined(WIN32)
 
+#ifndef _MINGW
 struct dirent {
     char d_name[MAXPATHLEN];
 };
@@ -371,6 +381,7 @@ closedir(DIR *dir)
     }
     return 0;
 }
+#endif
 
 /* caller should allocate MAXPATHLEN; does not set errno; returns null on failure */
 static char *
@@ -603,6 +614,36 @@ OutputErrorMessage(const char *path, int lineno, int colno, const char *errName,
     }
 }
 
+static JSLAliasList*
+AllocAliasListItem(const char *alias, const char *path)
+{
+    JSLAliasList *aliasItem= malloc(sizeof(JSLAliasList));
+    memset(aliasItem, 0, sizeof(JSLAliasList));
+    
+    JS_INIT_CLIST(&aliasItem->links);
+    strncpy(aliasItem->path, path, MAXPATHLEN);
+    strncpy(aliasItem->alias, alias, MAXPATHLEN);
+    
+    return aliasItem;
+}
+
+static void
+AddAliasToList(JSLAliasList *aliasList, const char *alias, const char *path)
+{
+    JSLAliasList *aliasItem= AllocAliasListItem(alias, path);
+    JS_APPEND_LINK(&aliasItem->links, &aliasList->links);
+}
+
+static void
+FreeAliasList(JSContext *cx, JSLAliasList *aliasList)
+{
+    while (!JS_CLIST_IS_EMPTY(&aliasList->links)) {
+        JSLAliasList *item = (JSLAliasList*)JS_LIST_HEAD(&aliasList->links);
+        JS_REMOVE_LINK(&item->links);
+        JS_free(cx, item);
+    }
+}
+
 static JSLPathList*
 AllocPathListItem(const char *path)
 {
@@ -804,6 +845,7 @@ ResolveScriptPath(const char *relpath, char *path, JSLScriptList *parentScript)
     JSBool result;
     struct stat _stat;
     JSLPathList *inc;
+    JSLAliasList *alias;
     
     char workingDir[MAXPATHLEN+1];
     workingDir[0] = 0;
@@ -832,6 +874,22 @@ ResolveScriptPath(const char *relpath, char *path, JSLScriptList *parentScript)
     if (result && -1!=stat(path, &_stat))
         return JS_TRUE;
 
+    //  Check for an alias match. Aliased files still must exist or the search
+    //  will continue.
+    for (alias= (JSLAliasList*)JS_LIST_HEAD(&gScriptAliasList.links);
+         alias!=&gScriptAliasList;
+         alias= (JSLAliasList*)JS_NEXT_LINK(&alias->links))
+    {
+        if (0==strcmp(relpath, alias->alias))
+        {
+            if (-1==stat(alias->path, &_stat))
+                continue;
+            strcpy(path, alias->path);
+            return JS_TRUE;
+        }
+    }
+
+    //  Nothing matches, so look in include folders...
     for (inc= (JSLPathList*)JS_LIST_HEAD(&gIncludePathList.links);
          inc!=&gIncludePathList;
          inc= (JSLPathList*)JS_NEXT_LINK(&inc->links))
@@ -1800,20 +1858,72 @@ ProcessSettingErr_Garbage:
                 *linepos = 0;
 
                 AddPathToList(&gIncludePathList, path);
-/*
-                if (JS_FALSE) {
-ProcessSettingErr_MissingPath:
-                    fclose(file);
-                    return LintConfError(cx, path, lineno, "invalid include setting: missing path");
-ProcessSettingErr_MissingQuote:
-                    fclose(file);
-                    return LintConfError(cx, path, lineno, "invalid include setting: missing or mismatched quote");
-ProcessSettingErr_Garbage:
+            }
+            else if (strncasecmp(linepos, "alias", strlen("alias")) == 0) {
+                char delimiter;
+                char *path;
+                char *alias;
+                
+                if (!enable) {
                     fclose(file);
-                    return LintConfError(cx, path, lineno, "invalid include setting: garbage after path");
+                    return LintConfError(cx, path, lineno, "-alias is an invalid setting");
                 }
-*/
+
+                linepos += strlen("alias");
+
+                /* require (but skip) whitespace */
+                if (!*linepos || !isspace(*linepos)) goto ProcessSettingErr_MissingPath;
+                while (*linepos && isspace(*linepos))
+                    linepos++;
+                if (!*linepos) goto ProcessSettingErr_MissingPath;
+
+                /* allow quote */
+                if (*linepos == '\'') {
+                    delimiter = *linepos;
+                    linepos++;
+                }
+                else if (*linepos == '"') {
+                    delimiter = *linepos;
+                    linepos++;
+                }
+                else
+                    delimiter = 0;
+
+                /* read alias */
+                if (!*linepos) goto ProcessSettingErr_MissingQuote;
+                alias = linepos;
+                while (*linepos)
+                {
+                    if (delimiter && *linepos==delimiter)
+                        break;
+                    if (!delimiter && isspace(*linepos))
+                        break;
+                    linepos++;
                 }
+                if (delimiter && *linepos!=delimiter) goto ProcessSettingErr_MissingQuote;
+                if (!delimiter && !isspace(*linepos)) goto ProcessSettingErr_MissingPath;
+
+                /* terminate path */
+                *linepos++= 0;
+                
+                /* require (but skip) whitespace */
+                while (*linepos && isspace(*linepos))
+                    linepos++;
+                if (!*linepos) goto ProcessSettingErr_MissingPath;
+
+                /* read path */
+                if (!*linepos) goto ProcessSettingErr_MissingQuote;
+                path = linepos;
+                while (*linepos && *linepos != delimiter)
+                    linepos++;
+                if (delimiter && !*linepos) goto ProcessSettingErr_MissingQuote;
+
+                /* yank ending quote */
+                if (linepos[0] && linepos[1]) goto ProcessSettingErr_Garbage;
+                *linepos = 0;
+
+                AddAliasToList(&gScriptAliasList, alias, path);
+            }
             else if (strncasecmp(linepos, "output-format", strlen("output-format")) == 0) {
                 linepos += strlen("output-format");
 
@@ -2304,6 +2414,7 @@ main(int argc, char **argv, char **envp)
     argv++;
 
     JS_INIT_CLIST(&gScriptList.links);
+    JS_INIT_CLIST(&gScriptAliasList.links);
     JS_INIT_CLIST(&gIncludePathList.links);
     JS_ASSERT(sizeof(placeholders) / sizeof(placeholders[0]) == JSLPlaceholder_Limit);
 

data/vendor/jsl-0.3.0/src/rules.mk

@@ -58,7 +58,8 @@ ifdef USE_MSVC
 # TARGETS = $(LIBRARY)   # $(PROGRAM) not supported for MSVC yet
 TARGETS += $(SHARED_LIBRARY) $(PROGRAM)  # it is now
 else
-TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) 
+# TARGETS += $(LIBRARY) $(SHARED_LIBRARY) $(PROGRAM) 
+TARGETS += $(LIBRARY) $(PROGRAM) 
 endif
 
 all:

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 4
-  version: 0.10.4
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jeff Watkins
@@ -14,10 +14,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-05 00:00:00 -07:00
+date: 2010-06-06 00:00:00 -07:00
 default_executable: distil
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 3
+        version: 1.4.3
+  type: :runtime
+  version_requirements: *id001
 description: A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit
 email: 
 executables: 
@@ -29,32 +42,40 @@ extra_rdoc_files: []
 files: 
 - Rakefile
 - VERSION
+- assets/distil.js
 - bin/distil
 - distil.gemspec
-- lib/bootstrap-template.js
-- lib/configurable.rb
-- lib/file-set.rb
-- lib/file-types/css-file.rb
-- lib/file-types/html-file.rb
-- lib/file-types/javascript-file.rb
-- lib/file-types/json-file.rb
-- lib/filter.rb
-- lib/filters/css-filter.rb
-- lib/filters/file-reference-filter.rb
-- lib/filters/jsl-dependency-filter.rb
+- lib/distil.rb
+- lib/distil/configurable.rb
+- lib/distil/configurable/file-set.rb
+- lib/distil/configurable/interpolated.rb
+- lib/distil/configurable/output-path.rb
+- lib/distil/configurable/project-path.rb
+- lib/distil/error-reporter.rb
+- lib/distil/product.rb
+- lib/distil/product/concatenated.rb
+- lib/distil/product/css-product.rb
+- lib/distil/product/debug.rb
+- lib/distil/product/javascript-base-product.rb
+- lib/distil/product/javascript-doc-product.rb
+- lib/distil/product/javascript-product.rb
+- lib/distil/product/minified.rb
+- lib/distil/project.rb
+- lib/distil/project/distil-project.rb
+- lib/distil/project/external-project.rb
+- lib/distil/source-file.rb
+- lib/distil/source-file/css-file.rb
+- lib/distil/source-file/html-file.rb
+- lib/distil/source-file/javascript-file.rb
+- lib/distil/source-file/json-file.rb
+- lib/distil/target.rb
+- lib/distil/task.rb
+- lib/distil/task/css-dependency-task.rb
+- lib/distil/task/jsl-dependency-task.rb
+- lib/distil/task/nib-task.rb
+- lib/distil/task/validate-js-task.rb
 - lib/jsdoc.conf
 - lib/jsl.conf
-- lib/project.rb
-- lib/source-file.rb
-- lib/target.rb
-- lib/task.rb
-- lib/tasks/copy-task.rb
-- lib/tasks/css-task.rb
-- lib/tasks/javascript-task.rb
-- lib/tasks/multiple-output-task.rb
-- lib/tasks/output-task.rb
-- lib/tasks/single-output-task.rb
-- lib/tasks/test-task.rb
 - lib/test/HtmlTestReporter.js
 - lib/test/Test.js
 - lib/test/TestReporter.js

data/lib/bootstrap-template.js

@@ -1,58 +0,0 @@
-/*jsl:ignore*/ /**#nocode+*/
-(function() {
-    var baseUrl= findScriptBaseName();
-
-    function findScriptBaseName()
-    {
-        var scripts= document.getElementsByTagName("script");
-        if (!scripts || !scripts.length)
-            throw new Error("Could not find script");
-
-        var l= scripts.length;
-        var s;
-        
-        for (--l; l>=0; --l)
-        {
-            s= scripts[l];
-            if (s.src)
-            {
-                var src= s.src;
-                var lastSlash= src.lastIndexOf('/');
-        
-                if (-1===lastSlash)
-                    throw new Error("Couldn't determine path from src: " + src);
-            
-                return src.substring(0, lastSlash+1);
-            }
-        }
-        
-        throw new Error("No script tags with src attribute.");
-    }
-
-    window.__bootstrap_nextScript= function()
-    {
-        if (!scripts.length)
-            window.__filename__= null;
-        else
-            window.__filename__= scripts.shift();
-    }
-    
-    var scripts= [];
-    
-    function loadScript(script)
-    {
-        script= baseUrl + script;
-        scripts.push(script);
-
-        if (!window.__filename__)
-            window.__bootstrap_nextScript();
-        
-        document.write( ['<', 'script type="text/javascript"',
-                         ' onload="window.__bootstrap_nextScript()"',
-                         ' src="', script, '"></script>'].join("") );
-    }
-    
-    @LOAD_SCRIPTS@
-    
-})();
-/**#nocode-*/ /*jsl:end*/

data/lib/configurable.rb

@@ -1,161 +0,0 @@
-module Kernel
-
-  def Boolean(string)
-    return true if string == true || string =~ /^true$/i
-    return false if string == false || string.nil? || string =~ /^false$/i
-    raise ArgumentError.new("invalid value for Boolean: \"#{string}\"")
-  end
-
-end
-
-
-
-class Configurable
-  attr_reader :options
-  
-  @@options= {}
-
-  def get_options(settings=nil, parent=nil)
-    keys= @@options.keys
-    values= @@options.map { |k,v| v[:value] }
-  
-    s= Struct.new(*keys).new(*values)
-    return s if !settings
-  
-    setting_keys= settings.keys.map { |key| key.to_s }
-  
-    @@options.each { |key, value|
-
-      intersect= value[:aliases] & setting_keys
-      next if !parent && intersect.empty?
-
-      if (intersect.empty?)
-        s[key]= parent[key]
-        next
-      end
-    
-      if (intersect.length>1)
-        raise ArgumentError, "Multiple variants for #{key.to_s} defined: #{intersect.join(", ")}"
-      end
-          
-      setting_key= intersect[0]
-      setting_value= settings[setting_key]
-      settings.delete(setting_key)
-    
-      # decide if any type conversions are needed...
-      type= value[:type]
-      setting_value= case
-        when FalseClass==type || TrueClass==type
-          Boolean(setting_value)
-        when Array==type
-          setting_value.is_a?(String) ? setting_value.split(/\s*,\s*/) : setting_value
-        when Fixnum==type
-          setting_value.to_i
-        when NilClass==type
-          setting_value
-        when String==type
-          setting_value.to_s
-        else
-          type.new(setting_value)
-        end
-    
-      s[key]= setting_value
-
-    }
-
-    s
-  end
-
-  def self.class_attr(name)
-    if (@class_attributes.nil?)
-      @class_attributes=[name]
-    else
-      @class_attributes<<name
-    end
-    
-    class_eval %(
-          def self.#{name}(*rest)
-            if (rest.length>0)
-              @#{name}= rest[0]
-            else
-              @#{name}
-            end
-          end
-          def self.#{name}=(value)
-            @#{name}= value
-          end
-          def #{name}
-            @#{name} || self.class.#{name}
-          end
-          def #{name}=(value)
-            @#{name}=value
-          end
-        )
-        
-  end
-  
-  def self.inherited(subclass)
-    super(subclass)
-    (@class_attributes||[]).each { |a|
-        instance_var = "@#{a}"
-        subclass.instance_variable_set(instance_var, instance_variable_get(instance_var))
-      }
-  end
-  
-  # option name, [type], [default], [options]
-  def self.option(name, *rest)
-  
-    name_string= name.to_s
-  
-    info= {
-      :aliases=>[name_string, name_string.gsub('_', '-'), name_string.gsub('_', ' ')].uniq
-    }
-
-    arg= rest.shift
-
-    if (arg.is_a?(Class))
-      info[:type]= arg
-      info[:value]= nil #arg.new
-      arg= rest.shift
-    end
-
-    if (!arg.is_a?(Hash))
-      info[:value]= arg
-      info[:type]= arg.class if !info.key?(:type)
-      arg= rest.shift
-    end
-
-    # handle named arguments
-    if (arg.is_a?(Hash))
-      info.merge!(arg)
-    end
-
-    @@options[name]= info
-  
-    Configurable.send :define_method, name do
-      @options[name]
-    end
-  
-  end
-
-  def self.option_alias(name, name_alias)
-    if (!@@options.key?(name))
-      raise ArgumentError, "No such option: #{name}"
-    end
-  
-    name_alias= name_alias.to_s
-  
-    @@options[name][:aliases].concat([name_alias,
-                                      name_alias.to_s.gsub('_', '-'),
-                                      name_alias.to_s.gsub('_', ' ')].uniq)
-  end
-  
-  def initialize(options={}, parent=nil)
-    if (parent.is_a?(Configurable))
-      parent_options= parent.options
-    end
-    @options= get_options(options, parent_options)
-    @extras= options
-  end
-  
-end

data/lib/file-set.rb

@@ -1,49 +0,0 @@
-require "#{$script_dir}/source-file"
-
-class FileSet
-  include Enumerable
-  attr_reader :files
-  
-  def initialize(set)
-   @files= []
-   case
-     when (set.is_a?(String))
-       include_file(set)
-     when (set.is_a?(Array))
-       set.each { |f| include_file(f) }
-    end
-  end
-  
-  def include_file(file)
-    full_path= File.expand_path(file)
-
-    if File.directory?(full_path)
-      Dir.foreach(full_path) { |f|
-          next if ('.'==f[/^\./])
-          include_file(File.join(full_path, f))
-      }
-      return
-    end
-
-    files= Dir.glob(full_path)
-    if (files.length>0)
-      files.each { |f|
-        source_file= SourceFile.from_path(f)
-        next if (@files.include?(source_file))
-        @files << source_file
-      }
-      return
-    end
-    
-    # file not found by globbing (would also find explicit reference)
-    source_file= Project.current.find_file(file)
-    return if (!source_file)
-    return if (@files.include?(source_file))
-    @files << source_file
-  end
-  
-  def each
-    @files.each { |f| yield f }
-  end
-  
-end

data/lib/file-types/css-file.rb

@@ -1,12 +0,0 @@
-class CssFile < SourceFile
-
-  def self.extension
-    ".css"
-  end
-
-  def debug_content(options)
-    destination= File.expand_path(options.remove_prefix||"")
-    "@import url(\"#{self.relative_to_folder(destination)}\");\n"
-  end
-  
-end

data/lib/file-types/html-file.rb

@@ -1,11 +0,0 @@
-class HtmlFile < SourceFile
-
-  def self.extension
-    ".html"
-  end
-
-  def minify_content(source)
-    source.gsub(/>\s+</, "><")
-  end
-  
-end