distil 0.12.6 → 0.13.0

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gemspec.name = 'distil'
     gemspec.authors= ["Jeff Watkins"]
     gemspec.summary= "A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit"
-    gemspec.homepage= "http://code.google.com/p/distil-js/"
+    gemspec.homepage= "http://github.com/jeffwatkins/distil"
     gemspec.description= gemspec.summary
     gemspec.files= Dir['assets/*', 'lib/**/*', 'bin/*', '[A-Za-z]*', 'vendor/**/*']
     gemspec.files.reject! { |f| File.directory?(f) }
@@ -25,6 +25,18 @@ rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
+namespace :git do
+  namespace :submodules do
+    desc "Initialize git submodules"
+    task :init do
+      system "git submodule init"
+      system "git submodule update"
+    end
+  end
+end
+
+task :"gemspec:generate" => :"git:submodules:init"
+
 task :default => [ :build ] do
     puts "generated latest version"
 end

data/VERSION

@@ -1 +1 @@
-0.12.6
+0.13.0

data/bin/distil

@@ -1,11 +1,14 @@
 #!/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)
 
-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)
+  $:.unshift(LIB_DIR)
 
-$:.unshift(LIB_DIR)
+end
 
 require "distil"
 
@@ -18,24 +21,29 @@ ARGV.each { |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
-  
+
   arg_settings[key]= value
 }
 
 def find_project_file(dir=nil)
   dir ||= Dir.pwd
+
+  immediate_projects= Dir.glob(File.join(dir, "*.jsproj"))
+  if (!immediate_projects.empty? && 1==immediate_projects.length)
+    return immediate_projects[0]
+  end
   
   while dir.length > 1
     Dir.glob(File.join(dir, '*.jsproj')) { |file|
@@ -43,15 +51,15 @@ def find_project_file(dir=nil)
     }
     dir = File.dirname(dir)
   end
-  
+
 end
 
-  
+
 # Change working directory to the folder containing the build YML file.
 project_file||= find_project_file
 
 if !project_file
-  puts "#{APP_NAME}: can't find project file"
+  puts "#{Distil::APP_NAME}: can't find project file"
   exit
 end
 

data/distil.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{distil}
-  s.version = "0.12.6"
+  s.version = "0.13.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeff Watkins"]
-  s.date = %q{2010-08-14}
+  s.date = %q{2010-08-30}
   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"]
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "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",
@@ -587,6 +588,29 @@ Gem::Specification.new do |s|
      "vendor/jsl-0.3.0/tests/warnings/useless_void.js",
      "vendor/jsl-0.3.0/tests/warnings/var_hides_arg.js",
      "vendor/jsl-0.3.0/tests/warnings/with_statement.js",
+     "vendor/pdoc-template/assets/stylesheets/api.css",
+     "vendor/pdoc-template/assets/stylesheets/core.css",
+     "vendor/pdoc-template/assets/stylesheets/pygments.css",
+     "vendor/pdoc-template/assets/stylesheets/reset.css",
+     "vendor/pdoc-template/assets/stylesheets/syntax.css",
+     "vendor/pdoc-template/helpers.rb",
+     "vendor/pdoc-template/index.erb",
+     "vendor/pdoc-template/item_index.js.erb",
+     "vendor/pdoc-template/layout.erb",
+     "vendor/pdoc-template/leaf.erb",
+     "vendor/pdoc-template/node.erb",
+     "vendor/pdoc-template/partials/class_relationships.erb",
+     "vendor/pdoc-template/partials/classes.erb",
+     "vendor/pdoc-template/partials/constructor.erb",
+     "vendor/pdoc-template/partials/link_list.erb",
+     "vendor/pdoc-template/partials/method_signatures.erb",
+     "vendor/pdoc-template/partials/methodized_note.erb",
+     "vendor/pdoc-template/partials/namespaces.erb",
+     "vendor/pdoc-template/partials/related_utilities.erb",
+     "vendor/pdoc-template/partials/relationships.erb",
+     "vendor/pdoc-template/partials/short_description_list.erb",
+     "vendor/pdoc-template/partials/title.erb",
+     "vendor/pdoc-template/section.erb",
      "vendor/pdoc/LICENSE",
      "vendor/pdoc/PDoc.tmbundle/Commands/Continue PDoc Comment.tmCommand",
      "vendor/pdoc/PDoc.tmbundle/Macros/Collapse PDoc Blocks.tmMacro",
@@ -659,7 +683,6 @@ Gem::Specification.new do |s|
      "vendor/pdoc/lib/pdoc/parser/treetop_files/tags.treetop",
      "vendor/pdoc/lib/pdoc/runner.rb",
      "vendor/pdoc/lib/pdoc/treemaker.rb",
-     "vendor/pdoc/pdoc-0.2.0.gem",
      "vendor/pdoc/pdoc.gemspec",
      "vendor/pdoc/templates/html/assets/images/pdoc/alias.png",
      "vendor/pdoc/templates/html/assets/images/pdoc/class.png",
@@ -738,7 +761,7 @@ Gem::Specification.new do |s|
      "vendor/pdoc/website/markdown/syntax.markdown",
      "vendor/yuicompressor-2.4.2.jar"
   ]
-  s.homepage = %q{http://code.google.com/p/distil-js/}
+  s.homepage = %q{http://github.com/jeffwatkins/distil}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}

data/distil.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>assets/distil.js</string>
+	<string>lib/distil/target.rb</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -21,65 +21,7 @@
 	<integer>270</integer>
 	<key>metaData</key>
 	<dict>
-		<key>Rakefile</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>35</integer>
-				<key>line</key>
-				<integer>13</integer>
-			</dict>
-			<key>columnSelection</key>
-			<false/>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-			<key>selectFrom</key>
-			<dict>
-				<key>column</key>
-				<integer>4</integer>
-				<key>line</key>
-				<integer>13</integer>
-			</dict>
-			<key>selectTo</key>
-			<dict>
-				<key>column</key>
-				<integer>35</integer>
-				<key>line</key>
-				<integer>13</integer>
-			</dict>
-		</dict>
-		<key>assets/distil.js</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>4</integer>
-				<key>line</key>
-				<integer>306</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>270</integer>
-		</dict>
-		<key>bin/distil</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>70</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>distil.gemspec</key>
+		<key>lib/distil/target.rb</key>
 		<dict>
 			<key>caret</key>
 			<dict>
@@ -93,77 +35,14 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>lib/distil.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>0</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/distil/project.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>44</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>1</integer>
-		</dict>
-		<key>lib/distil/project/distil-project.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>145</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>lib/distil/project/external-project.rb</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>35</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
 	</dict>
 	<key>openDocuments</key>
 	<array>
-		<string>bin/distil</string>
-		<string>lib/distil/project/external-project.rb</string>
-		<string>lib/distil/project/distil-project.rb</string>
-		<string>lib/distil/project.rb</string>
-		<string>assets/distil.js</string>
-		<string>Rakefile</string>
-		<string>lib/distil.rb</string>
-		<string>distil.gemspec</string>
+		<string>lib/distil/target.rb</string>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>windowFrame</key>
-	<string>{{351, 0}, {1089, 878}}</string>
+	<string>{{831, 300}, {1089, 878}}</string>
 </dict>
 </plist>

data/lib/distil/configurable.rb

@@ -155,6 +155,7 @@ class Configurable
       if type.respond_to?(:from_options)
         type.from_options(value, self)
       else
+        puts "type=#{type} value=#{value}"
         type.new(value)
       end
     end

data/lib/distil/product/javascript-product.rb

@@ -23,7 +23,8 @@ module Distil
         asset_map= []
         assets.each { |a|
           if can_embed_file?(a)
-            content= target.get_content_for_file(a)
+            next if @files.include?(a)
+            content= a.minified_content(target.get_content_for_file(a))
             content= content.gsub("\\", "\\\\").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
             asset_references << "\"#{target.alias_for_asset(a)}\": \"#{content}\""
           else

data/lib/distil/product/pdoc-product.rb

@@ -0,0 +1,42 @@
+module Distil
+
+  require "#{VENDOR_DIR}/pdoc/lib/pdoc"
+  
+  class PDocProduct < Product
+
+    option :pdoc_template, "#{VENDOR_DIR}/pdoc-template"
+    option :doc_folder, Interpolated, "$(path)/doc"
+
+    extension "js"
+    
+    def filename
+      File.join(doc_folder, 'index.html')
+    end
+    
+    def write_output
+      return if up_to_date
+      @up_to_date= true
+
+      PDoc.run({
+        :source_files => files,
+        :destination => doc_folder,
+        :templates => pdoc_template,
+        :syntax_highlighter => :pygments,
+        :markdown_parser => :bluecloth,
+        # :src_code_href => proc { |entity|
+        #   "http://github.com/example/ex/#{entity.file}##{entity.line_number}"
+        # },
+        :pretty_urls => true,
+        :bust_cache => true,
+        :name => 'Example JavaScript Framework',
+        :short_name => 'Ex',
+        :home_url => 'http://example.com',
+        :doc_url => 'http://example.com/api',
+        :version => "1.2.0",
+        :copyright_notice => 'This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share Alike 3.0 Unported License</a>.' 
+      })
+    end
+    
+  end
+  
+end

data/lib/distil/product.rb

@@ -104,4 +104,5 @@ require 'distil/product/css-product'
 require 'distil/product/javascript-base-product'
 require 'distil/product/javascript-product'
 require 'distil/product/javascript-doc-product'
+require 'distil/product/pdoc-product'
 require 'distil/product/page-product'

data/lib/distil/source-file.rb

@@ -1,9 +1,7 @@
 require 'fileutils'
 
-$compressor = File.expand_path("#{VENDOR_DIR}/yuicompressor-2.4.2.jar")
-
 module Distil
-  
+
   class SourceFile
     attr_accessor :parent_folder, :full_path
     class_attr :extension
@@ -100,7 +98,7 @@ module Distil
       return source if !content_type
     	buffer= ""
     
-    	IO.popen("java -jar #{$compressor} --type #{content_type}", "r+") { |pipe|
+    	IO.popen("java -jar #{COMPRESSOR} --type #{content_type}", "r+") { |pipe|
     	  pipe.puts(source)
     	  pipe.close_write
     	  buffer= pipe.read
@@ -165,6 +163,6 @@ module Distil
 end
 
 # load all the other file types
-Dir.glob("#{LIB_DIR}/distil/source-file/*-file.rb") { |file|
+Dir.glob("#{Distil::LIB_DIR}/distil/source-file/*-file.rb") { |file|
   require file
 }

data/lib/distil/target.rb

@@ -16,7 +16,7 @@ module Distil
     option :include_projects, [], :aliases=>['include']
     
     option :validate, true
-    option :generate_docs, false
+    option :generate_docs, nil
 
     option :minify, true
     option :compress, true
@@ -75,7 +75,11 @@ module Distil
       end
 
       if generate_docs
-        product_types << JavascriptDocProduct
+        if ('pdoc'==generate_docs)
+          product_types << PDocProduct
+        else
+          product_types << JavascriptDocProduct
+        end
       end
       
       @products=[]
@@ -117,7 +121,6 @@ module Distil
       @probed << file
 
       tasks.each { |t| t.include_file(file) }
-      
       file.dependencies.each { |d| include_file(d) }
       @assets.merge(file.assets)
       @assets << file

data/lib/distil/task.rb

@@ -45,6 +45,6 @@ module Distil
 end
 
 # load all the other task types
-Dir.glob("#{LIB_DIR}/distil/task/*-task.rb") { |file|
+Dir.glob("#{Distil::LIB_DIR}/distil/task/*-task.rb") { |file|
   require file
 }

data/lib/distil.rb

@@ -46,20 +46,6 @@ class String
 end
 
 
-module Distil
-  
-  FRAMEWORK_TYPE = "framework"
-  APP_TYPE = "application"
-  
-  WEAK_LINKAGE = 'weak'
-  STRONG_LINKAGE = 'strong'
-  LAZY_LINKAGE = 'lazy'
-  
-  DEBUG_MODE = 'debug'
-  RELEASE_MODE = 'release'
-  
-end
-
 #  Do a simple token substitution. Tokens begin and end with @.
 def replace_tokens(string, params)
 	return string.gsub(/(\n[\t ]*)?@([^@ \t\r\n]*)@/) { |m|
@@ -74,6 +60,20 @@ def replace_tokens(string, params)
 	}
 end
 
+module Distil
+
+  FRAMEWORK_TYPE = "framework"
+  APP_TYPE = "application"
+
+  WEAK_LINKAGE = 'weak'
+  STRONG_LINKAGE = 'strong'
+  LAZY_LINKAGE = 'lazy'
+
+  DEBUG_MODE = 'debug'
+  RELEASE_MODE = 'release'
+
+end
+
 require 'distil/browser'
 require 'distil/error-reporter'
 require 'distil/configurable'

data/vendor/pdoc/Rakefile

@@ -8,9 +8,9 @@ task :build_doc do
     :destination => OUTPUT_DIR,
     :syntax_highlighter => :pygments,
     :markdown_parser => :bluecloth,
-    :src_code_href => proc { |file, line|
-      "http://github.com/example/ex/#{file}##{line}"
-    },
+    # :src_code_href => proc { |file, line|
+    #   "http://github.com/example/ex/#{file}##{line}"
+    # },
     :pretty_urls => false,
     :bust_cache => true,
     :name => 'Example JavaScript Framework',