distil 0.11.6 → 0.11.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (168) hide show
  1. data/VERSION +1 -1
  2. data/assets/distil.js +2 -1
  3. data/bin/distil +2 -0
  4. data/distil.gemspec +152 -2
  5. data/lib/distil/configurable.rb +3 -1
  6. data/lib/distil/error-reporter.rb +2 -0
  7. data/lib/distil/product/concatenated.rb +1 -3
  8. data/lib/distil/product/debug.rb +1 -3
  9. data/lib/distil/product/javascript-product.rb +2 -8
  10. data/lib/distil/product.rb +5 -5
  11. data/lib/distil/project/distil-project.rb +18 -1
  12. data/lib/distil/project/external-project.rb +1 -1
  13. data/lib/distil/project/remote-project.rb +39 -0
  14. data/lib/distil/project.rb +18 -9
  15. data/lib/distil/target.rb +13 -12
  16. data/lib/distil/task/css-dependency-task.rb +1 -1
  17. data/lib/distil/task/validate-js-task.rb +6 -1
  18. data/lib/distil.rb +1 -0
  19. data/vendor/pdoc/LICENSE +16 -0
  20. data/vendor/pdoc/PDoc.tmbundle/Commands/Continue PDoc Comment.tmCommand +39 -0
  21. data/vendor/pdoc/PDoc.tmbundle/Macros/Collapse PDoc Blocks.tmMacro +4084 -0
  22. data/vendor/pdoc/PDoc.tmbundle/Macros/Expand PDoc Blocks.tmMacro +1388 -0
  23. data/vendor/pdoc/PDoc.tmbundle/Preferences/PDoc.tmPreferences +50 -0
  24. data/vendor/pdoc/PDoc.tmbundle/Snippets/class.tmSnippet +24 -0
  25. data/vendor/pdoc/PDoc.tmbundle/Snippets/constant.tmSnippet +22 -0
  26. data/vendor/pdoc/PDoc.tmbundle/Snippets/event.tmSnippet +16 -0
  27. data/vendor/pdoc/PDoc.tmbundle/Snippets/method.tmSnippet +22 -0
  28. data/vendor/pdoc/PDoc.tmbundle/Snippets/mixin.tmSnippet +23 -0
  29. data/vendor/pdoc/PDoc.tmbundle/Snippets/namespace.tmSnippet +24 -0
  30. data/vendor/pdoc/PDoc.tmbundle/Snippets/param.tmSnippet +16 -0
  31. data/vendor/pdoc/PDoc.tmbundle/Snippets/property.tmSnippet +22 -0
  32. data/vendor/pdoc/PDoc.tmbundle/Snippets/section.tmSnippet +23 -0
  33. data/vendor/pdoc/PDoc.tmbundle/Syntaxes/PDoc.tmLanguage +33 -0
  34. data/vendor/pdoc/PDoc.tmbundle/info.plist +22 -0
  35. data/vendor/pdoc/README.markdown +34 -0
  36. data/vendor/pdoc/Rakefile +46 -0
  37. data/vendor/pdoc/bin/pdoc +58 -0
  38. data/vendor/pdoc/lib/pdoc/error.rb +4 -0
  39. data/vendor/pdoc/lib/pdoc/generators/abstract_generator.rb +16 -0
  40. data/vendor/pdoc/lib/pdoc/generators/html/helpers.rb +256 -0
  41. data/vendor/pdoc/lib/pdoc/generators/html/page.rb +71 -0
  42. data/vendor/pdoc/lib/pdoc/generators/html/syntax_highlighter.rb +41 -0
  43. data/vendor/pdoc/lib/pdoc/generators/html/template.rb +37 -0
  44. data/vendor/pdoc/lib/pdoc/generators/html/website.rb +194 -0
  45. data/vendor/pdoc/lib/pdoc/generators/html.rb +8 -0
  46. data/vendor/pdoc/lib/pdoc/generators/json.rb +15 -0
  47. data/vendor/pdoc/lib/pdoc/generators/pythonesque.rb +105 -0
  48. data/vendor/pdoc/lib/pdoc/generators.rb +6 -0
  49. data/vendor/pdoc/lib/pdoc/models/argument.rb +37 -0
  50. data/vendor/pdoc/lib/pdoc/models/base.rb +107 -0
  51. data/vendor/pdoc/lib/pdoc/models/callable.rb +19 -0
  52. data/vendor/pdoc/lib/pdoc/models/class.rb +28 -0
  53. data/vendor/pdoc/lib/pdoc/models/class_method.rb +18 -0
  54. data/vendor/pdoc/lib/pdoc/models/class_property.rb +9 -0
  55. data/vendor/pdoc/lib/pdoc/models/constant.rb +9 -0
  56. data/vendor/pdoc/lib/pdoc/models/constructor.rb +14 -0
  57. data/vendor/pdoc/lib/pdoc/models/container.rb +114 -0
  58. data/vendor/pdoc/lib/pdoc/models/entity.rb +54 -0
  59. data/vendor/pdoc/lib/pdoc/models/instance_method.rb +18 -0
  60. data/vendor/pdoc/lib/pdoc/models/instance_property.rb +9 -0
  61. data/vendor/pdoc/lib/pdoc/models/mixin.rb +10 -0
  62. data/vendor/pdoc/lib/pdoc/models/namespace.rb +10 -0
  63. data/vendor/pdoc/lib/pdoc/models/root.rb +27 -0
  64. data/vendor/pdoc/lib/pdoc/models/section.rb +19 -0
  65. data/vendor/pdoc/lib/pdoc/models/signature.rb +27 -0
  66. data/vendor/pdoc/lib/pdoc/models/utility.rb +11 -0
  67. data/vendor/pdoc/lib/pdoc/models.rb +47 -0
  68. data/vendor/pdoc/lib/pdoc/parser/argument_description_nodes.rb +21 -0
  69. data/vendor/pdoc/lib/pdoc/parser/basic_nodes.rb +31 -0
  70. data/vendor/pdoc/lib/pdoc/parser/description_nodes.rb +42 -0
  71. data/vendor/pdoc/lib/pdoc/parser/documentation_nodes.rb +483 -0
  72. data/vendor/pdoc/lib/pdoc/parser/ebnf_arguments_nodes.rb +58 -0
  73. data/vendor/pdoc/lib/pdoc/parser/ebnf_expression_nodes.rb +227 -0
  74. data/vendor/pdoc/lib/pdoc/parser/fragment.rb +55 -0
  75. data/vendor/pdoc/lib/pdoc/parser/section_content_nodes.rb +19 -0
  76. data/vendor/pdoc/lib/pdoc/parser/tags_nodes.rb +14 -0
  77. data/vendor/pdoc/lib/pdoc/parser/treetop_files/argument_description.treetop +31 -0
  78. data/vendor/pdoc/lib/pdoc/parser/treetop_files/basic.treetop +41 -0
  79. data/vendor/pdoc/lib/pdoc/parser/treetop_files/description.treetop +7 -0
  80. data/vendor/pdoc/lib/pdoc/parser/treetop_files/documentation.treetop +75 -0
  81. data/vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_arguments.treetop +33 -0
  82. data/vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_expression.treetop +70 -0
  83. data/vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_javascript.treetop +54 -0
  84. data/vendor/pdoc/lib/pdoc/parser/treetop_files/events.treetop +17 -0
  85. data/vendor/pdoc/lib/pdoc/parser/treetop_files/section_content.treetop +8 -0
  86. data/vendor/pdoc/lib/pdoc/parser/treetop_files/tags.treetop +31 -0
  87. data/vendor/pdoc/lib/pdoc/parser.rb +109 -0
  88. data/vendor/pdoc/lib/pdoc/runner.rb +110 -0
  89. data/vendor/pdoc/lib/pdoc/treemaker.rb +94 -0
  90. data/vendor/pdoc/lib/pdoc.rb +32 -0
  91. data/vendor/pdoc/pdoc-0.2.0.gem +0 -0
  92. data/vendor/pdoc/pdoc.gemspec +31 -0
  93. data/vendor/pdoc/templates/html/assets/images/pdoc/alias.png +0 -0
  94. data/vendor/pdoc/templates/html/assets/images/pdoc/class.png +0 -0
  95. data/vendor/pdoc/templates/html/assets/images/pdoc/class_deprecated.png +0 -0
  96. data/vendor/pdoc/templates/html/assets/images/pdoc/class_method.png +0 -0
  97. data/vendor/pdoc/templates/html/assets/images/pdoc/class_property.png +0 -0
  98. data/vendor/pdoc/templates/html/assets/images/pdoc/constant.png +0 -0
  99. data/vendor/pdoc/templates/html/assets/images/pdoc/constructor.png +0 -0
  100. data/vendor/pdoc/templates/html/assets/images/pdoc/deprecated.png +0 -0
  101. data/vendor/pdoc/templates/html/assets/images/pdoc/description.png +0 -0
  102. data/vendor/pdoc/templates/html/assets/images/pdoc/information.png +0 -0
  103. data/vendor/pdoc/templates/html/assets/images/pdoc/instance_method.png +0 -0
  104. data/vendor/pdoc/templates/html/assets/images/pdoc/instance_property.png +0 -0
  105. data/vendor/pdoc/templates/html/assets/images/pdoc/method.png +0 -0
  106. data/vendor/pdoc/templates/html/assets/images/pdoc/method_deprecated.png +0 -0
  107. data/vendor/pdoc/templates/html/assets/images/pdoc/mixin.png +0 -0
  108. data/vendor/pdoc/templates/html/assets/images/pdoc/namespace.png +0 -0
  109. data/vendor/pdoc/templates/html/assets/images/pdoc/property.png +0 -0
  110. data/vendor/pdoc/templates/html/assets/images/pdoc/related_to.png +0 -0
  111. data/vendor/pdoc/templates/html/assets/images/pdoc/search-background.png +0 -0
  112. data/vendor/pdoc/templates/html/assets/images/pdoc/section-background.png +0 -0
  113. data/vendor/pdoc/templates/html/assets/images/pdoc/section.png +0 -0
  114. data/vendor/pdoc/templates/html/assets/images/pdoc/selected-section-background.png +0 -0
  115. data/vendor/pdoc/templates/html/assets/images/pdoc/subclass.png +0 -0
  116. data/vendor/pdoc/templates/html/assets/images/pdoc/superclass.png +0 -0
  117. data/vendor/pdoc/templates/html/assets/images/pdoc/utility.png +0 -0
  118. data/vendor/pdoc/templates/html/assets/javascripts/pdoc/application.js +478 -0
  119. data/vendor/pdoc/templates/html/assets/javascripts/pdoc/prototype.js +4874 -0
  120. data/vendor/pdoc/templates/html/assets/javascripts/pdoc/tabs.js +506 -0
  121. data/vendor/pdoc/templates/html/assets/stylesheets/pdoc/api.css +677 -0
  122. data/vendor/pdoc/templates/html/assets/stylesheets/pdoc/pygments.css +62 -0
  123. data/vendor/pdoc/templates/html/helpers.rb +35 -0
  124. data/vendor/pdoc/templates/html/index.erb +18 -0
  125. data/vendor/pdoc/templates/html/item_index.js.erb +6 -0
  126. data/vendor/pdoc/templates/html/layout.erb +67 -0
  127. data/vendor/pdoc/templates/html/leaf.erb +22 -0
  128. data/vendor/pdoc/templates/html/node.erb +30 -0
  129. data/vendor/pdoc/templates/html/partials/class_relationships.erb +19 -0
  130. data/vendor/pdoc/templates/html/partials/classes.erb +7 -0
  131. data/vendor/pdoc/templates/html/partials/constructor.erb +5 -0
  132. data/vendor/pdoc/templates/html/partials/description.erb +5 -0
  133. data/vendor/pdoc/templates/html/partials/link_list.erb +1 -0
  134. data/vendor/pdoc/templates/html/partials/method_signatures.erb +14 -0
  135. data/vendor/pdoc/templates/html/partials/methodized_note.erb +9 -0
  136. data/vendor/pdoc/templates/html/partials/mixins.erb +7 -0
  137. data/vendor/pdoc/templates/html/partials/namespaces.erb +7 -0
  138. data/vendor/pdoc/templates/html/partials/related_utilities.erb +5 -0
  139. data/vendor/pdoc/templates/html/partials/relationships.erb +11 -0
  140. data/vendor/pdoc/templates/html/partials/short_description_list.erb +7 -0
  141. data/vendor/pdoc/templates/html/partials/title.erb +22 -0
  142. data/vendor/pdoc/templates/html/section.erb +18 -0
  143. data/vendor/pdoc/test/fixtures/ajax.js +809 -0
  144. data/vendor/pdoc/test/fixtures/prototype.js +5789 -0
  145. data/vendor/pdoc/test/fixtures/test.txt +1 -0
  146. data/vendor/pdoc/test/fixtures/text.txt +13 -0
  147. data/vendor/pdoc/test/unit/parser/argument_description_test.rb +40 -0
  148. data/vendor/pdoc/test/unit/parser/basic_test.rb +55 -0
  149. data/vendor/pdoc/test/unit/parser/description_test.rb +34 -0
  150. data/vendor/pdoc/test/unit/parser/documentation_test.rb +520 -0
  151. data/vendor/pdoc/test/unit/parser/ebnf_arguments_test.rb +81 -0
  152. data/vendor/pdoc/test/unit/parser/ebnf_expression_test.rb +382 -0
  153. data/vendor/pdoc/test/unit/parser/ebnf_javascript_test.rb +37 -0
  154. data/vendor/pdoc/test/unit/parser/events_test.rb +27 -0
  155. data/vendor/pdoc/test/unit/parser/section_content_test.rb +44 -0
  156. data/vendor/pdoc/test/unit/parser/tags_test.rb +39 -0
  157. data/vendor/pdoc/test/unit/parser/test_fragment.rb +80 -0
  158. data/vendor/pdoc/test/unit/parser_test_helper.rb +62 -0
  159. data/vendor/pdoc/test/unit/runner/basic_test.rb +14 -0
  160. data/vendor/pdoc/test/unit/templates/html_helpers_test.rb +25 -0
  161. data/vendor/pdoc/vendor/albino.rb +122 -0
  162. data/vendor/pdoc/website/html/documentation.html +280 -0
  163. data/vendor/pdoc/website/html/images/pdoc.jpg +0 -0
  164. data/vendor/pdoc/website/html/index.html +84 -0
  165. data/vendor/pdoc/website/html/stylesheets/main.css +73 -0
  166. data/vendor/pdoc/website/html/stylesheets/reset.css +18 -0
  167. data/vendor/pdoc/website/markdown/syntax.markdown +226 -0
  168. metadata +153 -3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.11.6
1
+ 0.11.8
data/assets/distil.js CHANGED
@@ -103,7 +103,8 @@
103
103
  tag.onload= complete;
104
104
  tag.type= "text/javascript";
105
105
  tag.src= url;
106
- root.insertBefore(tag, root.firstChild);
106
+ // root.insertBefore(tag, root.firstChild);
107
+ head.appendChild(tag);
107
108
  };
108
109
 
109
110
  var injectStylesheet= distil.injectStylesheet= function(url, callback, scope, userData)
data/bin/distil CHANGED
@@ -56,6 +56,8 @@ if !project_file
56
56
  exit
57
57
  end
58
58
 
59
+ Dir.chdir(File.dirname(project_file))
60
+
59
61
  project= Distil::DistilProject.new(project_file, arg_settings)
60
62
 
61
63
  if 0==args.length
data/distil.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{distil}
8
- s.version = "0.11.6"
8
+ s.version = "0.11.8"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Jeff Watkins"]
12
- s.date = %q{2010-06-18}
12
+ s.date = %q{2010-06-24}
13
13
  s.default_executable = %q{distil}
14
14
  s.description = %q{A build tool for Javascript and CSS that takes advantage of best-of-breed helper applications Javascript Lint and JSDoc Toolkit}
15
15
  s.executables = ["distil"]
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
40
40
  "lib/distil/project.rb",
41
41
  "lib/distil/project/distil-project.rb",
42
42
  "lib/distil/project/external-project.rb",
43
+ "lib/distil/project/remote-project.rb",
43
44
  "lib/distil/source-file.rb",
44
45
  "lib/distil/source-file/css-file.rb",
45
46
  "lib/distil/source-file/html-file.rb",
@@ -585,6 +586,155 @@ Gem::Specification.new do |s|
585
586
  "vendor/jsl-0.3.0/tests/warnings/useless_void.js",
586
587
  "vendor/jsl-0.3.0/tests/warnings/var_hides_arg.js",
587
588
  "vendor/jsl-0.3.0/tests/warnings/with_statement.js",
589
+ "vendor/pdoc/LICENSE",
590
+ "vendor/pdoc/PDoc.tmbundle/Commands/Continue PDoc Comment.tmCommand",
591
+ "vendor/pdoc/PDoc.tmbundle/Macros/Collapse PDoc Blocks.tmMacro",
592
+ "vendor/pdoc/PDoc.tmbundle/Macros/Expand PDoc Blocks.tmMacro",
593
+ "vendor/pdoc/PDoc.tmbundle/Preferences/PDoc.tmPreferences",
594
+ "vendor/pdoc/PDoc.tmbundle/Snippets/class.tmSnippet",
595
+ "vendor/pdoc/PDoc.tmbundle/Snippets/constant.tmSnippet",
596
+ "vendor/pdoc/PDoc.tmbundle/Snippets/event.tmSnippet",
597
+ "vendor/pdoc/PDoc.tmbundle/Snippets/method.tmSnippet",
598
+ "vendor/pdoc/PDoc.tmbundle/Snippets/mixin.tmSnippet",
599
+ "vendor/pdoc/PDoc.tmbundle/Snippets/namespace.tmSnippet",
600
+ "vendor/pdoc/PDoc.tmbundle/Snippets/param.tmSnippet",
601
+ "vendor/pdoc/PDoc.tmbundle/Snippets/property.tmSnippet",
602
+ "vendor/pdoc/PDoc.tmbundle/Snippets/section.tmSnippet",
603
+ "vendor/pdoc/PDoc.tmbundle/Syntaxes/PDoc.tmLanguage",
604
+ "vendor/pdoc/PDoc.tmbundle/info.plist",
605
+ "vendor/pdoc/README.markdown",
606
+ "vendor/pdoc/Rakefile",
607
+ "vendor/pdoc/bin/pdoc",
608
+ "vendor/pdoc/lib/pdoc.rb",
609
+ "vendor/pdoc/lib/pdoc/error.rb",
610
+ "vendor/pdoc/lib/pdoc/generators.rb",
611
+ "vendor/pdoc/lib/pdoc/generators/abstract_generator.rb",
612
+ "vendor/pdoc/lib/pdoc/generators/html.rb",
613
+ "vendor/pdoc/lib/pdoc/generators/html/helpers.rb",
614
+ "vendor/pdoc/lib/pdoc/generators/html/page.rb",
615
+ "vendor/pdoc/lib/pdoc/generators/html/syntax_highlighter.rb",
616
+ "vendor/pdoc/lib/pdoc/generators/html/template.rb",
617
+ "vendor/pdoc/lib/pdoc/generators/html/website.rb",
618
+ "vendor/pdoc/lib/pdoc/generators/json.rb",
619
+ "vendor/pdoc/lib/pdoc/generators/pythonesque.rb",
620
+ "vendor/pdoc/lib/pdoc/models.rb",
621
+ "vendor/pdoc/lib/pdoc/models/argument.rb",
622
+ "vendor/pdoc/lib/pdoc/models/base.rb",
623
+ "vendor/pdoc/lib/pdoc/models/callable.rb",
624
+ "vendor/pdoc/lib/pdoc/models/class.rb",
625
+ "vendor/pdoc/lib/pdoc/models/class_method.rb",
626
+ "vendor/pdoc/lib/pdoc/models/class_property.rb",
627
+ "vendor/pdoc/lib/pdoc/models/constant.rb",
628
+ "vendor/pdoc/lib/pdoc/models/constructor.rb",
629
+ "vendor/pdoc/lib/pdoc/models/container.rb",
630
+ "vendor/pdoc/lib/pdoc/models/entity.rb",
631
+ "vendor/pdoc/lib/pdoc/models/instance_method.rb",
632
+ "vendor/pdoc/lib/pdoc/models/instance_property.rb",
633
+ "vendor/pdoc/lib/pdoc/models/mixin.rb",
634
+ "vendor/pdoc/lib/pdoc/models/namespace.rb",
635
+ "vendor/pdoc/lib/pdoc/models/root.rb",
636
+ "vendor/pdoc/lib/pdoc/models/section.rb",
637
+ "vendor/pdoc/lib/pdoc/models/signature.rb",
638
+ "vendor/pdoc/lib/pdoc/models/utility.rb",
639
+ "vendor/pdoc/lib/pdoc/parser.rb",
640
+ "vendor/pdoc/lib/pdoc/parser/argument_description_nodes.rb",
641
+ "vendor/pdoc/lib/pdoc/parser/basic_nodes.rb",
642
+ "vendor/pdoc/lib/pdoc/parser/description_nodes.rb",
643
+ "vendor/pdoc/lib/pdoc/parser/documentation_nodes.rb",
644
+ "vendor/pdoc/lib/pdoc/parser/ebnf_arguments_nodes.rb",
645
+ "vendor/pdoc/lib/pdoc/parser/ebnf_expression_nodes.rb",
646
+ "vendor/pdoc/lib/pdoc/parser/fragment.rb",
647
+ "vendor/pdoc/lib/pdoc/parser/section_content_nodes.rb",
648
+ "vendor/pdoc/lib/pdoc/parser/tags_nodes.rb",
649
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/argument_description.treetop",
650
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/basic.treetop",
651
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/description.treetop",
652
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/documentation.treetop",
653
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_arguments.treetop",
654
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_expression.treetop",
655
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/ebnf_javascript.treetop",
656
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/events.treetop",
657
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/section_content.treetop",
658
+ "vendor/pdoc/lib/pdoc/parser/treetop_files/tags.treetop",
659
+ "vendor/pdoc/lib/pdoc/runner.rb",
660
+ "vendor/pdoc/lib/pdoc/treemaker.rb",
661
+ "vendor/pdoc/pdoc-0.2.0.gem",
662
+ "vendor/pdoc/pdoc.gemspec",
663
+ "vendor/pdoc/templates/html/assets/images/pdoc/alias.png",
664
+ "vendor/pdoc/templates/html/assets/images/pdoc/class.png",
665
+ "vendor/pdoc/templates/html/assets/images/pdoc/class_deprecated.png",
666
+ "vendor/pdoc/templates/html/assets/images/pdoc/class_method.png",
667
+ "vendor/pdoc/templates/html/assets/images/pdoc/class_property.png",
668
+ "vendor/pdoc/templates/html/assets/images/pdoc/constant.png",
669
+ "vendor/pdoc/templates/html/assets/images/pdoc/constructor.png",
670
+ "vendor/pdoc/templates/html/assets/images/pdoc/deprecated.png",
671
+ "vendor/pdoc/templates/html/assets/images/pdoc/description.png",
672
+ "vendor/pdoc/templates/html/assets/images/pdoc/information.png",
673
+ "vendor/pdoc/templates/html/assets/images/pdoc/instance_method.png",
674
+ "vendor/pdoc/templates/html/assets/images/pdoc/instance_property.png",
675
+ "vendor/pdoc/templates/html/assets/images/pdoc/method.png",
676
+ "vendor/pdoc/templates/html/assets/images/pdoc/method_deprecated.png",
677
+ "vendor/pdoc/templates/html/assets/images/pdoc/mixin.png",
678
+ "vendor/pdoc/templates/html/assets/images/pdoc/namespace.png",
679
+ "vendor/pdoc/templates/html/assets/images/pdoc/property.png",
680
+ "vendor/pdoc/templates/html/assets/images/pdoc/related_to.png",
681
+ "vendor/pdoc/templates/html/assets/images/pdoc/search-background.png",
682
+ "vendor/pdoc/templates/html/assets/images/pdoc/section-background.png",
683
+ "vendor/pdoc/templates/html/assets/images/pdoc/section.png",
684
+ "vendor/pdoc/templates/html/assets/images/pdoc/selected-section-background.png",
685
+ "vendor/pdoc/templates/html/assets/images/pdoc/subclass.png",
686
+ "vendor/pdoc/templates/html/assets/images/pdoc/superclass.png",
687
+ "vendor/pdoc/templates/html/assets/images/pdoc/utility.png",
688
+ "vendor/pdoc/templates/html/assets/javascripts/pdoc/application.js",
689
+ "vendor/pdoc/templates/html/assets/javascripts/pdoc/prototype.js",
690
+ "vendor/pdoc/templates/html/assets/javascripts/pdoc/tabs.js",
691
+ "vendor/pdoc/templates/html/assets/stylesheets/pdoc/api.css",
692
+ "vendor/pdoc/templates/html/assets/stylesheets/pdoc/pygments.css",
693
+ "vendor/pdoc/templates/html/helpers.rb",
694
+ "vendor/pdoc/templates/html/index.erb",
695
+ "vendor/pdoc/templates/html/item_index.js.erb",
696
+ "vendor/pdoc/templates/html/layout.erb",
697
+ "vendor/pdoc/templates/html/leaf.erb",
698
+ "vendor/pdoc/templates/html/node.erb",
699
+ "vendor/pdoc/templates/html/partials/class_relationships.erb",
700
+ "vendor/pdoc/templates/html/partials/classes.erb",
701
+ "vendor/pdoc/templates/html/partials/constructor.erb",
702
+ "vendor/pdoc/templates/html/partials/description.erb",
703
+ "vendor/pdoc/templates/html/partials/link_list.erb",
704
+ "vendor/pdoc/templates/html/partials/method_signatures.erb",
705
+ "vendor/pdoc/templates/html/partials/methodized_note.erb",
706
+ "vendor/pdoc/templates/html/partials/mixins.erb",
707
+ "vendor/pdoc/templates/html/partials/namespaces.erb",
708
+ "vendor/pdoc/templates/html/partials/related_utilities.erb",
709
+ "vendor/pdoc/templates/html/partials/relationships.erb",
710
+ "vendor/pdoc/templates/html/partials/short_description_list.erb",
711
+ "vendor/pdoc/templates/html/partials/title.erb",
712
+ "vendor/pdoc/templates/html/section.erb",
713
+ "vendor/pdoc/test/fixtures/ajax.js",
714
+ "vendor/pdoc/test/fixtures/prototype.js",
715
+ "vendor/pdoc/test/fixtures/test.txt",
716
+ "vendor/pdoc/test/fixtures/text.txt",
717
+ "vendor/pdoc/test/unit/parser/argument_description_test.rb",
718
+ "vendor/pdoc/test/unit/parser/basic_test.rb",
719
+ "vendor/pdoc/test/unit/parser/description_test.rb",
720
+ "vendor/pdoc/test/unit/parser/documentation_test.rb",
721
+ "vendor/pdoc/test/unit/parser/ebnf_arguments_test.rb",
722
+ "vendor/pdoc/test/unit/parser/ebnf_expression_test.rb",
723
+ "vendor/pdoc/test/unit/parser/ebnf_javascript_test.rb",
724
+ "vendor/pdoc/test/unit/parser/events_test.rb",
725
+ "vendor/pdoc/test/unit/parser/section_content_test.rb",
726
+ "vendor/pdoc/test/unit/parser/tags_test.rb",
727
+ "vendor/pdoc/test/unit/parser/test_fragment.rb",
728
+ "vendor/pdoc/test/unit/parser_test_helper.rb",
729
+ "vendor/pdoc/test/unit/runner/basic_test.rb",
730
+ "vendor/pdoc/test/unit/templates/html_helpers_test.rb",
731
+ "vendor/pdoc/vendor/albino.rb",
732
+ "vendor/pdoc/website/html/documentation.html",
733
+ "vendor/pdoc/website/html/images/pdoc.jpg",
734
+ "vendor/pdoc/website/html/index.html",
735
+ "vendor/pdoc/website/html/stylesheets/main.css",
736
+ "vendor/pdoc/website/html/stylesheets/reset.css",
737
+ "vendor/pdoc/website/markdown/syntax.markdown",
588
738
  "vendor/yuicompressor-2.4.2.jar"
589
739
  ]
590
740
  s.homepage = %q{http://code.google.com/p/distil-js/}
@@ -75,7 +75,7 @@ class Configurable
75
75
 
76
76
  arg= rest.shift
77
77
 
78
- if (arg.is_a?(Class))
78
+ if (arg.is_a?(Class) || arg==URI)
79
79
  info[:type]= arg
80
80
  info[:value]= nil
81
81
  arg= rest.shift
@@ -148,6 +148,8 @@ class Configurable
148
148
  value ? value.to_s : nil;
149
149
  when value.nil?
150
150
  value
151
+ when URI==type
152
+ URI.parse(value)
151
153
  else
152
154
  if type.respond_to?(:from_options)
153
155
  type.from_options(value, self)
@@ -54,6 +54,8 @@ module Distil
54
54
  def report
55
55
  puts "\n" if (@@error_count>0 || @@warning_count>0)
56
56
  puts "#{@@error_count} error(s), #{@@warning_count} warning(s)#{ignore_warnings ? " ignored" : ""}"
57
+ @@error_count=0
58
+ @@warning_count=0
57
59
  end
58
60
 
59
61
  end
@@ -33,9 +33,7 @@ module Distil
33
33
  return @external_files if @external_files
34
34
  @external_files= []
35
35
 
36
- target.project.external_projects.each { |ext|
37
- next if STRONG_LINKAGE!=ext.linkage
38
-
36
+ target.include_projects.each { |ext|
39
37
  @external_files << ext.product_name(:concatenated, File.extname(filename)[1..-1])
40
38
  }
41
39
  @external_files
@@ -21,9 +21,7 @@ module Distil
21
21
  return @external_files if @external_files
22
22
  @external_files= []
23
23
 
24
- target.project.external_projects.each { |ext|
25
- next if STRONG_LINKAGE!=ext.linkage
26
-
24
+ target.include_projects.each { |ext|
27
25
  @external_files << ext.product_name(:debug, File.extname(filename)[1..-1])
28
26
  }
29
27
  @external_files
@@ -7,12 +7,6 @@ module Distil
7
7
 
8
8
  option :global_export
9
9
  option :additional_globals, [], :aliases=>['globals']
10
-
11
- # def initialize(settings, target)
12
- # super(settings, target)
13
- #
14
- # @options.global_export=target.name if true==global_export
15
- # end
16
10
 
17
11
  def before_externals(f)
18
12
  f.puts("/*#nocode+*/")
@@ -64,7 +58,7 @@ EOS
64
58
 
65
59
  def after_files(f)
66
60
  if global_export
67
- exports= ["window.#{global_export}={}", *additional_globals].join(", ")
61
+ exports= ["window.#{global_export}=window.#{global_export}||{}", *additional_globals].join(", ")
68
62
  f.puts "})(#{exports});"
69
63
  end
70
64
 
@@ -112,7 +106,7 @@ EOS
112
106
  f.write("#{bootstrap_source}\n\n") if bootstrap
113
107
 
114
108
  if global_export
115
- f.write("window.#{global_export}={};");
109
+ f.write("window.#{global_export}=window.#{global_export}||{};");
116
110
  f.write("\n\n");
117
111
  end
118
112
 
@@ -30,6 +30,10 @@ module Distil
30
30
  @files
31
31
  end
32
32
 
33
+ def external_files
34
+ []
35
+ end
36
+
33
37
  def files=(fileset)
34
38
  fileset.each { |f|
35
39
  next if !handles_file?(f)
@@ -54,17 +58,13 @@ module Distil
54
58
  max_asset_modified= f.last_modified if f.last_modified > max_asset_modified
55
59
  }
56
60
 
57
- return @up_to_date=false if (output_modified < max_asset_modified)
58
-
59
61
  external_files.each { |f|
60
62
  next if !File.exist?(f)
61
63
  last_modified= File.stat(f).mtime
62
64
  max_asset_modified= last_modified if last_modified > max_asset_modified
63
65
  }
64
66
 
65
- return @up_to_date=false if (output_modified < max_asset_modified)
66
-
67
- @up_to_date= true
67
+ return @up_to_date=(output_modified > max_asset_modified)
68
68
  end
69
69
 
70
70
  def filename
@@ -85,6 +85,7 @@ module Distil
85
85
  def build
86
86
  FileUtils.mkdir_p(output_folder)
87
87
  load_distileries
88
+ targets
88
89
  build_external_projects
89
90
  build_targets
90
91
  end
@@ -120,8 +121,24 @@ module Distil
120
121
  targets.each { |target|
121
122
  target.build
122
123
  }
123
- report
124
124
  end
125
+
126
+ def find_file(file, source_file=nil)
127
+ return nil if external_projects.nil?
128
+
129
+ parts= file.split(File::SEPARATOR)
130
+ project_name= parts[0]
131
+
132
+ external_project= external_project_with_name(project_name)
133
+ return nil if !external_project
134
+
135
+ if 1==parts.length
136
+ return SourceFile::from_path(external_project.product_name(:import, source_file.extension))
137
+ else
138
+ return SourceFile::from_path(File.join(external_project.output_folder, *parts[1..-1]))
139
+ end
140
+ end
141
+
125
142
  end
126
143
 
127
144
  end
@@ -39,7 +39,7 @@ module Distil
39
39
  return if WEAK_LINKAGE==linkage
40
40
 
41
41
  FileUtils.rm_r(output_folder) if File.directory?(output_folder)
42
- FileUtils.unlink(output_folder) if File.symlink?(output_folder)
42
+ FileUtils.rm(output_folder) if File.symlink?(output_folder)
43
43
 
44
44
  if DEBUG_MODE==mode
45
45
  FileUtils.symlink(File.expand_path(source_folder), output_folder)
@@ -0,0 +1,39 @@
1
+ module Distil
2
+
3
+ class RemoteProject < Project
4
+
5
+ option :name, String
6
+ option :href, URI
7
+ option :linkage, WEAK_LINKAGE, :valid_values=> [WEAK_LINKAGE, STRONG_LINKAGE, LAZY_LINKAGE]
8
+
9
+ def initialize(config, parent=nil)
10
+
11
+ super(config, parent)
12
+
13
+ if !href.respond_to?(:read)
14
+ raise ValidationError, "Cannot read from project source url: #{source}"
15
+ end
16
+
17
+ @source_path= File.join(parent.output_folder, href.host, href.path)
18
+ self.source_folder= File.dirname(@source_path)
19
+
20
+ if !File.exist?(@source_path)
21
+ FileUtils.mkdir_p(source_folder)
22
+ text= href.read
23
+ File.open(@source_path, "w") { |output|
24
+ output.write text
25
+ }
26
+ end
27
+
28
+ end
29
+
30
+ def product_name(product_type, extension)
31
+ File.join(File.dirname(@source_path), "#{File.basename(@source_path, ".*")}.#{extension}")
32
+ end
33
+
34
+ def build
35
+ end
36
+
37
+ end
38
+
39
+ end
@@ -38,7 +38,7 @@ module Distil
38
38
  base_cmd = "git pull #{uri}"
39
39
  base_cmd+= " -q"
40
40
  # base_cmd += " -q" if options[:quiet] and not $verbose
41
- base_cmd += " #{options[:version]}" if options[:version]
41
+ base_cmd += " #{options["version"]}" if options["version"]
42
42
  # puts base_cmd if $verbose
43
43
  if system(base_cmd)
44
44
  # puts "removing: .git .gitignore" if $verbose
@@ -56,18 +56,22 @@ module Distil
56
56
  uri= URI.parse(string)
57
57
 
58
58
  config= { "name" => File.basename(config, ".*") }
59
- if uri.scheme
59
+
60
+ case
61
+ when ['.js', '.css'].include?(File.extname(uri.path))
62
+ config["href"]= uri.to_s
63
+ when uri.scheme
60
64
  config["repository"]= uri.to_s
61
65
  else
62
66
  config["path"]= uri.to_s
63
- end
64
67
 
65
- full_path= File.expand_path(config["path"])
68
+ full_path= File.expand_path(config["path"])
66
69
 
67
- if File.exist?(full_path) && File.file?(full_path)
68
- config["path"]= File.dirname(full_path)
69
- else
70
- config["path"]= full_path
70
+ if File.exist?(full_path) && File.file?(full_path)
71
+ config["path"]= File.dirname(full_path)
72
+ else
73
+ config["path"]= full_path
74
+ end
71
75
  end
72
76
  end
73
77
 
@@ -81,6 +85,10 @@ module Distil
81
85
  raise ValidationError.new("External project has neither name, path nor repository")
82
86
  end
83
87
  end
88
+
89
+ if config["href"]
90
+ return RemoteProject.new(config, parent)
91
+ end
84
92
 
85
93
  config["path"]||= "ext/#{config["name"]}"
86
94
 
@@ -135,5 +143,6 @@ module Distil
135
143
 
136
144
  end
137
145
 
146
+ require 'distil/project/remote-project'
138
147
  require 'distil/project/external-project'
139
- require 'distil/project/distil-project'
148
+ require 'distil/project/distil-project'
data/lib/distil/target.rb CHANGED
@@ -43,16 +43,13 @@ module Distil
43
43
 
44
44
  @options.global_export=name if true==global_export
45
45
 
46
- include_projects.each { |p|
47
- external_project= project.external_project_with_name(p)
48
- if !external_project
49
- raise ValidationError.new("No such external project: #{p}")
50
- end
51
-
52
- if (WEAK_LINKAGE==external_project.linkage)
53
- external_project.linkage= STRONG_LINKAGE
54
- end
46
+ projects= []
47
+ include_projects.each { |name|
48
+ ext= project.external_project_with_name(name)
49
+ ext.linkage= STRONG_LINKAGE
50
+ projects << ext
55
51
  }
52
+ self.include_projects= projects
56
53
  end
57
54
 
58
55
  def source_folder
@@ -206,12 +203,16 @@ module Distil
206
203
 
207
204
  def build
208
205
  puts "\n#{name}:\n\n"
206
+
207
+ if !up_to_date
208
+ tasks.each { |t| t.process_files(files) }
209
209
 
210
- tasks.each { |t| t.process_files(files) }
210
+ products.each { |p| p.write_output }
211
211
 
212
- products.each { |p| p.write_output }
212
+ build_assets
213
+ end
213
214
 
214
- build_assets
215
+ report
215
216
  end
216
217
 
217
218
  def find_file(file, source_file=nil)
@@ -2,7 +2,7 @@ module Distil
2
2
 
3
3
  CSS_IMPORT_REGEX = /@import\s+url\("?(.*\.css)"?\)/
4
4
 
5
- class CssDependencyFilter < Task
5
+ class CssDependencyTask < Task
6
6
 
7
7
  def handles_file(file)
8
8
  return ["css"].include?(file.content_type)
@@ -9,6 +9,7 @@ module Distil
9
9
 
10
10
  option :jsl_conf, "#{LIB_DIR}/jsl.conf"
11
11
  option :global_export
12
+ option :additional_globals
12
13
 
13
14
  def handles_file(file)
14
15
  return ["js"].include?(file.content_type)
@@ -32,9 +33,13 @@ module Distil
32
33
  tmp << "+define distil\n"
33
34
 
34
35
  if (global_export)
35
- tmp << "+define #{global_export}"
36
+ tmp << "+define #{global_export}\n"
36
37
  end
37
38
 
39
+ # additional_globals.each { |g|
40
+ # tmp << "+define #{g}\n"
41
+ # }
42
+
38
43
  # add aliases
39
44
  target.project.external_projects.each { |project|
40
45
  import_file= project.product_name(:import, 'js')
data/lib/distil.rb CHANGED
@@ -5,6 +5,7 @@ require 'fileutils'
5
5
  require 'zlib'
6
6
  require "open3"
7
7
  require 'uri'
8
+ require 'open-uri'
8
9
 
9
10
  def class_attr(*rest)
10
11
  rest.each { |name|
@@ -0,0 +1,16 @@
1
+ Copyright (c) 2008 - 2010 Tobie Langel
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining a copy
4
+ of this software and associated documentation files (the "Software"), to deal
5
+ in the Software without restriction, including without limitation the rights
6
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7
+ copies of the Software, and to permit persons to whom the Software is
8
+ furnished to do so, subject to the following conditions:
9
+
10
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
11
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
12
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
13
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
14
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
15
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
16
+ SOFTWARE.
@@ -0,0 +1,39 @@
1
+ <?xml version="1.0" encoding="UTF-8"?>
2
+ <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+ <plist version="1.0">
4
+ <dict>
5
+ <key>beforeRunningCommand</key>
6
+ <string>nop</string>
7
+ <key>command</key>
8
+ <string>#!/usr/bin/env ruby
9
+
10
+ # Input: Entire Document
11
+ # Output: Insert as Snippet
12
+ # Key Equivalent: &lt;Return&gt;
13
+ # Scope: comment.block
14
+
15
+ line = ENV['TM_CURRENT_LINE']
16
+ index = ENV['TM_LINE_NUMBER'].to_i
17
+ nextline = $stdin.readlines[index + 1]
18
+
19
+ puts
20
+ print " " if line =~ /\/\*\*/
21
+ print "* $0"
22
+ if line.match(/\/\*\*/) &amp;&amp; !nextline.match(/^\s*\*/)
23
+ puts
24
+ print "**/"
25
+ end</string>
26
+ <key>input</key>
27
+ <string>document</string>
28
+ <key>keyEquivalent</key>
29
+ <string>
30
+ <key>name</key>
31
+ <string>Continue PDoc Comment</string>
32
+ <key>output</key>
33
+ <string>insertAsSnippet</string>
34
+ <key>scope</key>
35
+ <string>comment.block</string>
36
+ <key>uuid</key>
37
+ <string>58E0442A-7A56-4D19-A063-19C1616C5B6E</string>
38
+ </dict>
39
+ </plist>