jsus 0.1.20 → 0.1.21

data/CHANGELOG

@@ -1,4 +1,7 @@
 = Jsus Changelog
+== Version 0.1.21
+* Support for wildcards in requires statements (beware, something could break)
+
 == Version 0.1.20
 * Better integration for murdoc (factored it into class Jsus::Documenter)
 * Tree structure for future reuse

data/VERSION

@@ -1 +1 @@
-0.1.20
+0.1.21

data/bin/jsus

@@ -3,7 +3,7 @@ require 'rubygems'
 begin
   require 'jsus'
 rescue LoadError
-  $: << "./lib"
+  $: << File.expand_path(File.dirname(__FILE__) + "/../lib")
   require "jsus"
 end
 
@@ -65,6 +65,13 @@ Choice.options do
 
   end
 
+  option "no_syntax_highlight", :required => false do
+    default false
+    long "--no-syntax-highlight"
+    desc "Disable syntax highlighting in murdoc. Greatly increases docs generation speed. " <<
+         "Note: This option won't have any effect unless you have Pygments installed."
+  end
+
   option "verbose", :required => false do
     default false
     short "-v"
@@ -107,7 +114,7 @@ end
 
 # Generate documentation
 unless Choice.choices[:docs_classes].empty?  
-  documenter = Jsus::Documenter.new
+  documenter = Jsus::Documenter.new(:highlight_source => !Choice.choices[:no_syntax_highlight])
   package.source_files.each {|source| documenter << source }
   pool.sources.each {|source| documenter << source } if pool
   documenter.only(Choice.choices[:docs_classes]).generate(Choice.choices[:output_directory] + "/docs")

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.20"
+  s.version = "0.1.21"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2010-11-27}
+  s.date = %q{2010-11-28}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -57,6 +57,12 @@ Gem::Specification.new do |s|
     "spec/data/ChainDependencies/app/javascripts/Hash/package.yml",
     "spec/data/ChainDependencies/app/javascripts/Mash/Source/Mash.js",
     "spec/data/ChainDependencies/app/javascripts/Mash/package.yml",
+    "spec/data/DependenciesWildcards/app/javascripts/Class/Source/Class.js",
+    "spec/data/DependenciesWildcards/app/javascripts/Class/package.yml",
+    "spec/data/DependenciesWildcards/app/javascripts/Hash/Source/Hash.js",
+    "spec/data/DependenciesWildcards/app/javascripts/Hash/package.yml",
+    "spec/data/DependenciesWildcards/app/javascripts/Mash/Source/Mash.js",
+    "spec/data/DependenciesWildcards/app/javascripts/Mash/package.yml",
     "spec/data/Extensions/app/javascripts/Core/Source/Class.js",
     "spec/data/Extensions/app/javascripts/Core/package.yml",
     "spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js",

data/lib/jsus/documenter.rb

@@ -1,7 +1,10 @@
 module Jsus
   class Documenter
-    def initialize
+    attr_accessor :options
+
+    def initialize(options = {:highlight_source => true})
       require "murdoc"
+      self.options = options
     rescue LoadError
       raise "You should install murdoc gem in order to produce documentation"
     end
@@ -30,7 +33,7 @@ module Jsus
     def create_documentation_for_source(source, template)
       skipped_lines = 0
       content = source.original_content.gsub(/\A\s*\/\*.*?\*\//m) {|w| skipped_lines += w.split("\n").size; "" }
-      annotator = Murdoc::Annotator.new(content, :javascript, :highlight_source => true)
+      annotator = Murdoc::Annotator.new(content, :javascript, options)
       Murdoc::Formatter.new(template).render(:paragraphs => annotator.paragraphs, :header => source.header, :source => source, :skipped_lines => skipped_lines)
     end
 

data/lib/jsus/pool.rb

@@ -105,7 +105,8 @@ module Jsus
     def <<(source_or_sources_or_package)
       case
       when source_or_sources_or_package.kind_of?(SourceFile)
-        source = source_or_sources_or_package        
+        source = source_or_sources_or_package
+        add_source_to_trees(source)
         sources << source
         if source.extends
           extensions_map[source.extends] ||= []
@@ -156,10 +157,10 @@ module Jsus
     def lookup_direct_dependencies!(source)
       result = if source
         (source.dependencies + source.external_dependencies).map do |dependency|
-          result = lookup(dependency)
+          result = provides_tree.glob("/#{dependency}").map {|node| node.value }
           puts "#{source.filename} is missing #{dependency.is_a?(SourceFile) ? dependency.filename : dependency.to_s}" if !result && Jsus.verbose?
           result
-        end
+        end.flatten
       else
         []
       end
@@ -170,36 +171,29 @@ module Jsus
     # Returs a tree, containing all the sources
     #
     def source_tree
-      @source_tree ||= source_tree! 
-    end
-
-    def source_tree! # :nodoc:
-      tree = Tree.new
-      sources.each do |source|
-        if source.package
-          tree.insert("/" + source.package.name + "/" + File.basename(source.filename), source)
-        else
-          tree.insert("/" + File.basename(source.filename), source)
-        end
-      end
-      tree
+      @source_tree ||= Tree.new 
     end
 
     #
     # Returns a tree containing all the provides tags
     #
     def provides_tree
-      @provides_tree ||= provides_tree!
+      @provides_tree ||= Tree.new
     end
 
-    def provides_tree!
-      tree = Tree.new
-      sources.each do |source|
-        source.provides.each do |tag|
-          tree.insert("/" + tag.to_s, source)          
-        end
+
+    #
+    # Registers the source in both trees
+    #
+    def add_source_to_trees(source)
+      if source.package
+        source_tree.insert("/" + source.package.name + "/" + File.basename(source.filename), source)
+      else
+        source_tree.insert("/" + File.basename(source.filename), source)
+      end
+      source.provides.each do |tag|
+        provides_tree.insert("/" + tag.to_s, source)
       end
-      tree
     end
 
     protected

data/spec/data/DependenciesWildcards/app/javascripts/Class/Source/Class.js

@@ -0,0 +1,13 @@
+/*
+---
+ 
+script: Class.js
+ 
+description: Contains the Class Function for easily creating, extending, and implementing reusable Classes.
+ 
+license: MIT-style license.
+
+provides: [Class]
+ 
+...
+*/

data/spec/data/DependenciesWildcards/app/javascripts/Class/package.yml

@@ -0,0 +1,8 @@
+name: Class
+filename: class.js
+description: Class class
+license: MIT-Style License, http://mootools.net/license
+copyright: Somebody
+authors: Someone
+sources:
+  - Source/Class.js

data/spec/data/DependenciesWildcards/app/javascripts/Hash/Source/Hash.js

@@ -0,0 +1,16 @@
+/*
+---
+ 
+script: Hash.js
+ 
+description: Contains the Hash extensions for objects
+ 
+license: MIT-style license.
+ 
+requires:
+- Class/Class
+ 
+provides: [Hash]
+ 
+...
+*/

data/spec/data/DependenciesWildcards/app/javascripts/Hash/package.yml

@@ -0,0 +1,8 @@
+name: Hash
+filename: hash.js
+description: Hash class
+license: MIT-Style License, http://mootools.net/license
+copyright: Somebody
+authors: Someone
+sources:
+  - Source/Hash.js

data/spec/data/DependenciesWildcards/app/javascripts/Mash/Source/Mash.js

@@ -0,0 +1,16 @@
+/*
+---
+ 
+script: Mash.js
+ 
+description: Contains the Mash extensions for objects
+ 
+license: MIT-style license.
+ 
+requires:
+- Hash/*
+ 
+provides: [Mash]
+ 
+...
+*/

data/spec/data/DependenciesWildcards/app/javascripts/Mash/package.yml

@@ -0,0 +1,8 @@
+name: Mash
+filename: mash.js
+description: Mash class
+license: MIT-Style License, http://mootools.net/license
+copyright: Somebody
+authors: Someone
+sources:
+  - Source/Mash.js

data/spec/jsus/pool_spec.rb

@@ -100,6 +100,14 @@ describe Jsus::Pool do
       subject.lookup_dependencies("Lol/Wtf").should == []
       subject.lookup_dependencies(Jsus::Tag["Caught/Mosh"]).should == []
     end
+
+    context "wildcard support" do
+      let(:input_dir) { "spec/data/DependenciesWildcards/app/javascripts" }
+
+      it "should support wildcards" do
+        subject.lookup_dependencies("Mash/Mash").should == [sources[1], sources[2]]
+      end
+    end
   end
 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 20
-  version: 0.1.20
+  - 21
+  version: 0.1.21
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-27 00:00:00 +03:00
+date: 2010-11-28 00:00:00 +03:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -221,6 +221,12 @@ files:
 - spec/data/ChainDependencies/app/javascripts/Hash/package.yml
 - spec/data/ChainDependencies/app/javascripts/Mash/Source/Mash.js
 - spec/data/ChainDependencies/app/javascripts/Mash/package.yml
+- spec/data/DependenciesWildcards/app/javascripts/Class/Source/Class.js
+- spec/data/DependenciesWildcards/app/javascripts/Class/package.yml
+- spec/data/DependenciesWildcards/app/javascripts/Hash/Source/Hash.js
+- spec/data/DependenciesWildcards/app/javascripts/Hash/package.yml
+- spec/data/DependenciesWildcards/app/javascripts/Mash/Source/Mash.js
+- spec/data/DependenciesWildcards/app/javascripts/Mash/package.yml
 - spec/data/Extensions/app/javascripts/Core/Source/Class.js
 - spec/data/Extensions/app/javascripts/Core/package.yml
 - spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js
@@ -281,7 +287,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1317162541712808956
+      hash: -3919880184784396237
       segments: 
       - 0
       version: "0"