distil 0.13.6 → 0.14.0.b

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gemspec.add_dependency('json', '>= 1.4.3')
     gemspec.add_dependency('rubyzip', '>=0.9.4')
     gemspec.add_dependency('treetop', '>=1.4.8')
+    gemspec.add_dependency('directory_watcher', [">= 1.1.1"])
   end
 
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.13.6
+0.14.0.b

data/assets/distil.js

@@ -153,7 +153,7 @@
     return {
       type: type,
       url: url,
-      callback: callback,
+      callbacks: callback ? [callback]: [],
       scope: scope,
       userData: userData,
       loadQueue: [],
@@ -217,8 +217,8 @@
       }
 
       resource.callbacksExecuted= true;
-      if (resource.callback)
-        resource.callback.call(resource.scope, resource.userData);
+      while (resource.callbacks.length)
+        (resource.callbacks.shift()).call(resource.scope, resource.userData);
         
       resource= resource.parent;
     }
@@ -332,7 +332,7 @@
     if (rootResource.callbacksExecuted)
       window.setTimeout(callback, 0);
     else
-      rootResource.callback= callback;
+      rootResource.callbacks.push(callback);
   }
 
   distil.complete= function(name)
@@ -373,15 +373,17 @@
       injectionComplete(currentResource);
   }
 
-  distil.kick= function()
+  distil.moduleDidLoad= function(moduleName)
   {
     if (rootResource===currentResource)
       injectionComplete(currentResource);
   }
   
+  distil.kick= distil.moduleDidLoad;
+  
   distil.urlForAssetWithNameInModule= function(asset, moduleName)
   {
-    var module= moduleName ? moduleIndex[moduleName] : distil.mainModule;
+    var module= name ? moduleIndex[moduleName] : distil.mainModule;
     if (!module)
       throw new Error(NO_MODULE_ERROR + moduleName);
     if (!module.asset_map)
@@ -391,7 +393,7 @@
 
   distil.dataForAssetWithNameInModule= function(asset, moduleName)
   {
-    var module= moduleName ? moduleIndex[moduleName] : distil.mainModule;
+    var module= name ? moduleIndex[moduleName] : distil.mainModule;
     if (!module)
       throw new Error(NO_MODULE_ERROR + moduleName);
     if (!module.assets)

data/bin/distil

@@ -1,78 +1,54 @@
 #!/usr/bin/env ruby
+
 module Distil
-  
+
   LIB_DIR= File.expand_path(File.join(File.dirname(__FILE__), "..", "lib"))
   VENDOR_DIR= File.expand_path(File.join(File.dirname(__FILE__), "..", "vendor"))
   ASSETS_DIR= File.expand_path(File.join(File.dirname(__FILE__), "..", "assets"))
   APP_NAME= File.basename($0)
-
+  APP_SCRIPT= $0
+  
   $:.unshift(LIB_DIR)
 
-end
-
-require "distil"
+  require 'distil'
 
-arg_settings= {}
-project_file= nil
-args= []
+  help = <<-HELP
+  Distil is a tool for building HTML applications from its component CSS & Javascript files.
 
-ARGV.each { |v|
-  if (!v[/^-/])
-    args << v
-    next
-  end
-
-  v= v.gsub(/^-+/, '')
-
-  key,value= v.split("=")
-  key.gsub!("-", "_")
-
-  value=true if !value
-
-  if ("f"==key || "file"==key || "buildfile"==key)
-    project_file= value
-    next
-  end
+  HELP
 
-  arg_settings[key]= value
-}
+  require 'optparse'
 
-def find_project_file(dir=nil)
-  dir ||= Dir.pwd
+  options = {}
+  opts = OptionParser.new do |opts|
+    opts.banner = help
 
-  immediate_projects= Dir.glob(File.join(dir, "*.jsproj"))
-  if (!immediate_projects.empty? && 1==immediate_projects.length)
-    return immediate_projects[0]
+    opts.on("--server [PORT]", "Start web server (default port 8888)") do |port|
+      options['server'] = true
+      options['server_port'] = port unless port.nil?
+    end
+    
+    opts.on("--base URL", "The base path for the server") do |url|
+      options['url']= url
+    end
   end
+  opts.parse!
   
-  while dir.length > 1
-    Dir.glob(File.join(dir, '*.jsproj')) { |file|
-      return file if File.basename(dir)===File.basename(file, '.jsproj')
-    }
-    dir = File.dirname(dir)
+  project= Project.find(Dir.pwd)
+  unless project
+    puts "#{APP_NAME}: Could not find project to build"
+    exit 1
   end
 
+  puts "\n#{project.name}:\n\n"
+  commands= ARGV.empty? ? ['build'] : ARGV
+  commands.each { |cmd|
+    project.send cmd
+  }
+  project.report
+  
+  if true==options['server']
+    start_server(project, options)
+  end
+  
 end
-
-
-# Change working directory to the folder containing the build YML file.
-project_file||= find_project_file
-
-if !project_file
-  puts "#{Distil::APP_NAME}: can't find project file"
-  exit
-end
-
-Dir.chdir(File.dirname(project_file))
-
-project= Distil::DistilProject.new(project_file, arg_settings)
-
-if 0==args.length
-  args << "build"
-end
-
-args.each { |cmd|
-  project.send cmd
-  exit 1 if project.total_error_count > 0
-  exit 1 if project.warnings_are_errors && project.total_warning_count > 0
-}

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.13.6"
+  s.version = "0.14.0.b"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-12-05}
+  s.date = %q{2010-12-21}
   s.default_executable = %q{distil}
   s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
   s.executables = ["distil"]
@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "assets/distil.js",
-     "assets/mime.types",
      "bin/distil",
      "bin/distil-old",
      "distil.gemspec",
@@ -27,45 +26,28 @@ Gem::Specification.new do |s|
      "lib/distil.rb",
      "lib/distil/browser.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/file-vendor.rb",
+     "lib/distil/hash-additions.rb",
+     "lib/distil/javascript-code.rb",
+     "lib/distil/javascript-file-validator.rb",
+     "lib/distil/library.rb",
      "lib/distil/product.rb",
-     "lib/distil/product/concatenated.rb",
+     "lib/distil/product/cache-manifest-product.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/html-product.rb",
      "lib/distil/product/javascript-product.rb",
-     "lib/distil/product/minified.rb",
-     "lib/distil/product/page-product.rb",
-     "lib/distil/product/pdoc-product.rb",
      "lib/distil/project.rb",
-     "lib/distil/project/distil-project.rb",
-     "lib/distil/project/external-project.rb",
-     "lib/distil/project/remote-project.rb",
+     "lib/distil/recursive-http-fetcher.rb",
+     "lib/distil/server.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/distil/source-file/yui-minifiable-file.rb",
+     "lib/distil/subclass-tracker.rb",
      "lib/jsl.conf",
-     "lib/test/HtmlTestReporter.js",
-     "lib/test/Test.js",
-     "lib/test/TestReporter.js",
-     "lib/test/TestRunner.js",
-     "lib/test/browser.rb",
-     "lib/test/scriptwrapper.html",
-     "lib/test/unittest.html",
      "vendor/Makefile",
      "vendor/extconf.rb",
      "vendor/jsdoc-extras/plugins/distil-plugin.js",
@@ -778,15 +760,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json>, [">= 1.4.3"])
       s.add_runtime_dependency(%q<rubyzip>, [">= 0.9.4"])
       s.add_runtime_dependency(%q<treetop>, [">= 1.4.8"])
+      s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
     else
       s.add_dependency(%q<json>, [">= 1.4.3"])
       s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
       s.add_dependency(%q<treetop>, [">= 1.4.8"])
+      s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
     end
   else
     s.add_dependency(%q<json>, [">= 1.4.3"])
     s.add_dependency(%q<rubyzip>, [">= 0.9.4"])
     s.add_dependency(%q<treetop>, [">= 1.4.8"])
+    s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
   end
 end
 

data/distil.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>Rakefile</string>
+	<string>lib/distil/source-file.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -21,58 +21,89 @@
 	<integer>270</integer>
 	<key>metaData</key>
 	<dict>
-		<key>Rakefile</key>
+		<key>lib/distil/product.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>48</integer>
+				<integer>0</integer>
 				<key>line</key>
-				<integer>17</integer>
+				<integer>57</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>0</integer>
+			<integer>42</integer>
 		</dict>
-		<key>lib/distil/product.rb</key>
+		<key>lib/distil/product/javascript-product.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>25</integer>
+				<integer>47</integer>
 				<key>line</key>
-				<integer>106</integer>
+				<integer>40</integer>
 			</dict>
+			<key>columnSelection</key>
+			<false/>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>65</integer>
+			<integer>20</integer>
+			<key>selectFrom</key>
+			<dict>
+				<key>column</key>
+				<integer>34</integer>
+				<key>line</key>
+				<integer>40</integer>
+			</dict>
+			<key>selectTo</key>
+			<dict>
+				<key>column</key>
+				<integer>58</integer>
+				<key>line</key>
+				<integer>40</integer>
+			</dict>
 		</dict>
-		<key>lib/distil/product/pdoc-product.rb</key>
+		<key>lib/distil/project.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>10</integer>
+				<integer>32</integer>
 				<key>line</key>
-				<integer>2</integer>
+				<integer>220</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
+			<integer>195</integer>
+		</dict>
+		<key>lib/distil/source-file.rb</key>
+		<dict>
+			<key>caret</key>
+			<dict>
+				<key>column</key>
+				<integer>13</integer>
+				<key>line</key>
+				<integer>30</integer>
+			</dict>
+			<key>firstVisibleColumn</key>
 			<integer>0</integer>
+			<key>firstVisibleLine</key>
+			<integer>10</integer>
 		</dict>
 	</dict>
 	<key>openDocuments</key>
 	<array>
-		<string>Rakefile</string>
+		<string>lib/distil/project.rb</string>
+		<string>lib/distil/source-file.rb</string>
+		<string>lib/distil/product/javascript-product.rb</string>
 		<string>lib/distil/product.rb</string>
-		<string>lib/distil/product/pdoc-product.rb</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>windowFrame</key>
-	<string>{{831, 300}, {1089, 878}}</string>
+	<string>{{833, 300}, {1087, 878}}</string>
 </dict>
 </plist>

data/lib/distil/browser.rb

@@ -1,34 +1,38 @@
-class Browser
-  def supported?; true; end
-  def setup ; end
-  def open(url) ; end
-  def teardown ; end
+module Distil
+  
+  class Browser
+    def supported?; true; end
+    def setup ; end
+    def open(url) ; end
+    def teardown ; end
 
-  def host
-    require 'rbconfig'
-    Config::CONFIG['host']
-  end
+    def host
+      require 'rbconfig'
+      Config::CONFIG['host']
+    end
   
-  def macos?
-    host.include?('darwin')
-  end
+    def macos?
+      host.include?('darwin')
+    end
   
-  def windows?
-    host.include?('mswin')
-  end
+    def windows?
+      host.include?('mswin')
+    end
   
-  def linux?
-    host.include?('linux')
-  end
+    def linux?
+      host.include?('linux')
+    end
 
-  def open(url)
-    case
-    when macos?
-      `open #{url}`
-    when windows?
-      `start #{url}`
-    else
-      puts "I don't know how to open a browser for #{url} on your system"
+    def open(url)
+      case
+      when macos?
+        `open #{url}`
+      when windows?
+        `start #{url}`
+      else
+        puts "I don't know how to open a browser for #{url} on your system"
+      end
     end
   end
+
 end