jsus 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,4 +1,13 @@
 = Jsus Changelog
+== Version 0.2.5
+* Fixed Container#sort not dealing with wildcards, which made it slower but
+  at least made it work
+* Reduced a whole ton of Container creation calls wherever they didn't seem
+  appropriate
+* Container sorting routine is now lazily evaluated
+
+All in all, this resulted in 70% speedups on complex cases.
+
 == Version 0.2.4
 * Replacements feature
 * Postprocessing feature

data/Gemfile

@@ -11,4 +11,6 @@ group :development do
   gem "cucumber"
   gem "jeweler"
   gem "murdoc"
+  gem "ruby-debug19", :platforms => :ruby_19
+  gem "ruby-debug",   :platforms => :ruby_18
 end

data/Gemfile.lock

@@ -2,7 +2,9 @@ GEM
   remote: http://rubygems.org/
   specs:
     activesupport (3.0.3)
+    archive-tar-minitar (0.5.2)
     builder (3.0.0)
+    columnize (0.3.2)
     cucumber (0.10.0)
       builder (>= 2.1.2)
       diff-lcs (~> 1.1.2)
@@ -20,6 +22,9 @@ GEM
       rake
     json (1.4.6)
     json_pure (1.4.6)
+    linecache (0.43)
+    linecache19 (0.5.11)
+      ruby_core_source (>= 0.1.4)
     murdoc (0.1.5)
       haml (~> 3.0.0)
       haml (~> 3.0.0)
@@ -38,6 +43,21 @@ GEM
     rspec-expectations (2.4.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.4.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.24)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.4)
+      archive-tar-minitar (>= 0.5.2)
     stream (0.5)
     term-ansicolor (1.0.5)
 
@@ -53,3 +73,5 @@ DEPENDENCIES
   murdoc
   rgl
   rspec
+  ruby-debug
+  ruby-debug19

data/Rakefile

@@ -39,7 +39,7 @@ require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do |t|
 end
 
-task :default => :spec
+task :default => [:spec, :features]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/bin/jsus

@@ -22,7 +22,7 @@ cli = OptionParser.new do |opts|
     options[:input_dir] = dir
   end
 
-  opts.on('-o', '--input-directory [DIR]', '[DEPRECATED] path to output directory ') do |dir|
+  opts.on('-o', '--output-directory [DIR]', '[DEPRECATED] path to output directory ') do |dir|
     $stderr.puts "DEPRECATION NOTICE: please do not use -o command-line argument"
     options[:output_dir] = dir
   end

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.2.4"
+  s.version = "0.2.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-02-20}
+  s.date = %q{2011-03-04}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -207,6 +207,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<murdoc>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<ruby-debug>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
@@ -216,6 +218,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<murdoc>, [">= 0"])
+      s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<ruby-debug>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
@@ -226,6 +230,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<murdoc>, [">= 0"])
+    s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<ruby-debug>, [">= 0"])
   end
 end
 

data/lib/jsus/container.rb

@@ -10,33 +10,25 @@ module Jsus
     #
     def initialize(*sources)
       sources.each do |source|
-        self << source
+        push(source)
       end
     end
-    
-    # Public API
 
-    #
-    # Pushes an item to container and sorts container. 
-    #
-    # When given an array or another container, enumerates its contents.
-    #
-    def <<(source)
-      push(source)
-      sort!
-    end
+    # Public API
 
-    # Pushes an item to container *without sorting it*. Use with care.
+    # Pushes an item to container
     def push(source)
       if source
         if source.kind_of?(Array) || source.kind_of?(Container)
           source.each {|s| self.push(s) }
         else
-          sources.push(source)
+          sources.push(source) unless sources.include?(source)
         end
       end
+      clear_cache!
       self
     end
+    alias_method :<<, :push
 
     # Flattens the container items.
     def flatten
@@ -48,20 +40,30 @@ module Jsus
       @sources ||= []
     end
     alias_method :to_a, :sources
-    
+
     def sources=(new_value) # :nodoc:
       @sources = new_value
     end
 
-    # Performs a sort and returns self. Executed automatically by #<< .
+    # Performs a sort and returns self.
     def sort!
-      self.sources = topsort
+      unless sorted?
+        remove_replaced_files!
+        self.sources = topsort
+        @sorted = true
+      end
       self
     end
 
+    # Returns whether collection is sorted already
+    def sorted?
+      !!@sorted
+    end
+
     # Lists all the required files (dependencies and extensions) for
-    # the sources in the container.    
+    # the sources in the container.
     def required_files(root = nil)
+      sort!
       files = sources.map {|s| s.required_files }.flatten
       if root
         root = Pathname.new(File.expand_path(root))
@@ -75,22 +77,17 @@ module Jsus
     end
 
     # Private API
-    
+
     def topsort # :nodoc:
       graph = RGL::DirectedAdjacencyGraph.new
-      provides_map = {}
       # init vertices
-      items = self.sources
-      items.each do |item|
-        graph.add_vertex(item)
-        item.provides.each do |provides|
-          provides_map[provides] = item
-        end
-      end
+      items = sources
+      items.each {|item| graph.add_vertex(item) }
       # init edges
       items.each do |item|
         item.dependencies.each do |dependency|
-          if required_item = provides_map[dependency]
+          cache[dependency] ||= provides_tree.glob("/" + dependency.to_s).map {|node| node.value }
+          cache[dependency].each do |required_item|
             graph.add_edge(required_item, item)
           end
         end
@@ -100,12 +97,81 @@ module Jsus
       result
     end
 
+    def cache # :nodoc:
+      @cache ||= {}
+    end
+
+    def provides_tree # :nodoc:
+      @provides_tree ||= provides_tree!
+    end
+
+    def provides_tree! # :nodoc:
+      tree = Tree.new
+      # Provisions
+      sources.each do |file|
+        file.provides.each do |tag|
+          tree["/#{tag}"] = file
+        end
+      end
+      # Replacements
+      sources.each do |file|
+        if file.replaces
+          tree["/#{file.replaces}"] = file
+        end
+      end
+      tree
+    end
+
+    def remove_replaced_files!
+      sources.reject! do |sf|
+        !sf.provides.empty? && sf.provides.any? { |tag|
+          replacements_tree["/#{tag}"] &&
+          replacements_tree["/#{tag}"].value &&
+          replacements_tree["/#{tag}"].value != sf
+        }
+      end
+    end
+
+    def replacements_tree
+      @replacements_tree ||= replacements_tree!
+    end
+
+    def replacements_tree!
+      tree = Tree.new
+      sources.each do |file|
+        if file.replaces
+          tree["/#{file.replaces}"] = file
+        end
+      end
+      tree
+    end
+
+    def clear_cache! # :nodoc:
+      @provides_tree = nil
+      @replacements_tree = nil
+      @cache = nil
+      @sorted = nil
+    end
+
+
+    CACHE_CLEAR_METHODS = [
+      "map!", "reject!", "inject!"
+    ] # :nodoc:
+
     DELEGATED_METHODS = [
-                          "==", "map", "map!", "each", "inject", "inject!",
-                          "reject", "reject!", "detect", "size", "length", "[]", 
-                          "empty?", "index", "include?", "select", "-", "+", "|", "&"
-                        ] # :nodoc:
+      "==", "to_a", "map", "map!", "each", "inject", "inject!",
+      "reject", "reject!", "detect", "size", "length", "[]",
+      "empty?", "index", "include?", "select", "-", "+", "|", "&"
+    ] # :nodoc:
     # delegates most Enumerable methods to #sources
-    (DELEGATED_METHODS).each {|m| delegate m, :to => :sources }
+    (DELEGATED_METHODS).each do |m|
+      class_eval <<-EVAL
+        def #{m}(*args, &block)
+          sort!
+          #{"clear_cache!" if CACHE_CLEAR_METHODS.include?(m)}
+          self.sources.send(:#{m}, *args, &block)
+        end
+      EVAL
+    end
   end
 end

data/lib/jsus/package.rb

@@ -25,6 +25,7 @@ module Jsus
       elsif File.exists?(File.join(directory, 'package.json'))
         self.header           = JSON.load(IO.read(File.join(directory, 'package.json')))
       else
+        raise "Directory #{directory} does not contain a valid package.yml / package.json file!"
       end
       Dir.chdir(directory) do
         files.each do |source|

data/lib/jsus/packager.rb

@@ -16,7 +16,7 @@ module Jsus
     end
 
     def sources # :nodoc:
-      container.sources
+      container
     end
 
     # 

data/lib/jsus/pool.rb

@@ -38,11 +38,11 @@ module Jsus
     end
 
     #
-    # Container with all the sources in the pool. It is actually ordered in case you
-    # want to include ALL the source files from the pool.
+    # Container with all the sources in the pool.
+    # Attention: the sources are no more ordered.
     #
     def sources
-      @sources ||= Container.new
+      @sources ||= []
     end
 
     #
@@ -69,7 +69,7 @@ module Jsus
     #
     # Looks up for dependencies for given file recursively.
     #
-    # Returns an instance of Container which contains needed files sorted.
+    # Returns an instance of Container which contains the needed files sorted.
     #
     def lookup_dependencies(source_or_source_key)
       source = lookup(source_or_source_key)
@@ -78,12 +78,11 @@ module Jsus
       if source
         dependencies = lookup_direct_dependencies(source)
         while !((dependencies - looked_up).empty?)
-          dependencies.each { |d| result.push(d); looked_up << d }
+          dependencies.each { |d| result << d; looked_up << d }
           dependencies = dependencies.map {|d| lookup_direct_dependencies(d).to_a }.flatten.uniq
         end
-        result.sort!
       end
-      result
+      result.sort!
     end
 
     #
@@ -158,18 +157,15 @@ module Jsus
     # Performs the actual lookup for #lookup_direct_dependencies
     #
     def lookup_direct_dependencies!(source)
-      result = if source
-        (source.dependencies).map do |dependency|
-          result = provides_tree.glob("/#{dependency}").map {|node| node.value }
-          if (!result || (result.is_a?(Array) && result.empty?)) && Jsus.verbose?
-            puts "#{source.filename} is missing #{dependency.is_a?(SourceFile) ? dependency.filename : dependency.to_s}"
-          end
-          result
-        end.flatten.map {|tag| lookup(tag) }
-      else
-        []
-      end
-      Container.new(*result)
+      return [] unless source
+
+      source.dependencies.map do |dependency|
+        result = provides_tree.glob("/#{dependency}").map {|node| node.value }
+        if (!result || (result.is_a?(Array) && result.empty?)) && Jsus.verbose?
+          puts "#{source.filename} is missing #{dependency.is_a?(SourceFile) ? dependency.filename : dependency.to_s}"
+        end
+        result
+      end.flatten.map {|tag| lookup(tag) }
     end
 
     #

data/lib/jsus/source_file.rb

@@ -253,7 +253,7 @@ module Jsus
     end
     
     def eql?(other) # :nodoc:
-      filename == other.filename
+      other.kind_of?(SourceFile) && filename == other.filename
     end
     
     def hash

data/lib/jsus/tree.rb

@@ -95,6 +95,7 @@ module Jsus
       node.value = value
       node
     end
+    alias_method :[]=, :insert
 
     def traverse(all_nodes = false)
       node_list = [root]
@@ -105,6 +106,11 @@ module Jsus
       end
     end
 
+    def leaves(only_with_value = true)
+      result = []
+      traverse {|node| result << node if !only_with_value || node.value }
+      result
+    end
 
 
     def create_all_nodes_if_needed(full_path)

data/spec/jsus/container_spec.rb

@@ -5,7 +5,7 @@ describe Jsus::Container do
   let(:simple_source)         { Source.new(:provides => [0], :dependencies => [],  :content => "// simple",   :filename => "/home/jsus/simple.js") }
   let(:another_simple_source) { Source.new(:provides => [1], :dependencies => [],  :content => "// simple 2", :filename => "/home/jsus/other/simple2.js") }
   let(:dependant_source)      { Source.new(:provides => [3], :dependencies => [0], :content => "// simple 3", :filename => "/home/dependencies/simple3.js") }
-
+  let(:replacement_source)    { Source.new(:provides => [0,4,6], :dependencies => [], :replaces => 0, :content => "// simple replaced",   :filename => "/home/jsus/simple_replaced.js") }
   let(:simple_container)        { Jsus::Container.new(simple_source, another_simple_source) }
   let(:container_with_dependency) { Jsus::Container.new(dependant_source, simple_source) }
 
@@ -17,26 +17,24 @@ describe Jsus::Container do
   end
 
   describe "#<<" do
+    subject { Jsus::Container.new }
     it "should allow multiple items via arrays" do
-      container = Jsus::Container.new
-      container << [simple_source, another_simple_source]
-      container.should have_exactly(2).sources
+      subject << [simple_source, another_simple_source]
+      subject.should have_exactly(2).sources
     end
 
     it "should allow multiple items via containers" do
-      container = Jsus::Container.new
-      container << Jsus::Container.new(simple_source, another_simple_source)
-      container.should have_exactly(2).sources
+      subject << Jsus::Container.new(simple_source, another_simple_source)
+      subject.should have_exactly(2).sources
     end
-
   end
 
   describe "#sources" do
     subject { container_with_dependency }
     it "should always be sorted" do
-      subject.sources.index(simple_source).should < subject.sources.index(dependant_source)
+      subject.index(simple_source).should < subject.sources.index(dependant_source)
       subject << another_simple_source
-      subject.sources.index(simple_source).should < subject.sources.index(dependant_source)
+      subject.index(simple_source).should < subject.sources.index(dependant_source)
     end
 
     it "should not allow duplicates" do
@@ -64,4 +62,31 @@ describe Jsus::Container do
       subject.required_files("/home/jsus").should == ["simple.js", "../dependencies/simple3.js"]
     end
   end
+
+  context "lazy sorting" do
+    subject { container_with_dependency.sort! }
+
+    it "should remove replaced files" do
+      subject << replacement_source
+      subject.should include(replacement_source)
+      subject.should_not include(simple_source)
+    end
+
+    it "should only call topsort when it's needed" do
+      subject.should_not_receive(:topsort)
+      subject.sort!
+      subject.each {|source| } # no-op
+    end
+
+    it "should not call topsort when adding resources" do
+      subject.should_not_receive(:topsort)
+      subject << simple_source
+    end
+    
+    it "should call topsort for kicker methods" do
+      subject << simple_source
+      subject.should_receive(:topsort)
+      subject.each {|source| }
+    end
+  end
 end

data/spec/jsus/pool_spec.rb

@@ -80,10 +80,10 @@ describe Jsus::Pool do
       packages.each {|package| subject << package.source_files }
     end
 
-    it "should return a container with direct dependencies" do
-      subject.lookup_direct_dependencies("Mash/Mash").should be_a(Jsus::Container)
+    it "should return an array with direct dependencies" do
+      subject.lookup_direct_dependencies("Mash/Mash").should be_an(Array)
       subject.lookup_direct_dependencies("Mash/Mash").should == [sources[2]]
-      subject.lookup_direct_dependencies(Jsus::Tag["Mash/Mash"]).should be_a(Jsus::Container)
+      subject.lookup_direct_dependencies(Jsus::Tag["Mash/Mash"]).should be_a(Array)
       subject.lookup_direct_dependencies(Jsus::Tag["Mash/Mash"]).should == [sources[2]]
     end
 

data/spec/jsus/tree_spec.rb

@@ -169,4 +169,25 @@ describe Jsus::Tree do
     end
   end
 
+  describe "#leaves" do
+    subject { Jsus::Tree.new }
+    let(:nodes) { [] }
+    before(:each) do
+      nodes << subject.insert("/hello/world/one", 1) <<
+               subject.insert("/hello/world/two", 2) <<
+               subject.insert("/hello/three", nil)     <<
+               subject.insert("/hello/four", 4)
+    end
+    
+    it "should return only the leaves with content by default" do
+      subject.leaves.should =~ [nodes[0], nodes[1], nodes[3]]
+    end
+    
+    
+    it "should return all the leaves if asked" do
+      subject.leaves(false).should =~ nodes
+    end
+    
+  end
+
 end

data/spec/shared/class_stubs.rb

@@ -6,7 +6,7 @@ class Source
   attr_accessor :dependencies
   attr_accessor :content
   attr_accessor :filename
-
+  attr_accessor :replaces
   def initialize(options = {})
     options.each do |attr, value|
       send("#{attr}=", value)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsus
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,113 +15,149 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 -05:00
+date: 2011-03-04 00:00:00 -05:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
+  prerelease: false
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   name: json_pure
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: rgl
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  prerelease: false
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   name: murdoc
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: ruby-debug19
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: *id008
+  name: ruby-debug
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
 description: Javascript packager and dependency resolver
 email: markizko@gmail.com
 executables: 
@@ -299,7 +336,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1044450339509570766
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -308,6 +345,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"