jsus 0.1.18 → 0.1.19

data/VERSION

@@ -1 +1 @@
-0.1.18
+0.1.19

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.18"
+  s.version = "0.1.19"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2010-11-26}
+  s.date = %q{2010-11-27}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}

data/lib/jsus/pool.rb

@@ -51,7 +51,7 @@ module Jsus
     # If given a source file, returns the input.
     #
     def lookup(source_or_key)
-      result = case source_or_key
+      case source_or_key
         when String
           provides_map[Tag[source_or_key]]
         when Tag
@@ -62,8 +62,6 @@ module Jsus
           raise "Illegal lookup query. Expected String, Tag or SourceFile, " <<
                 "given #{source_or_key.inspect}, an instance of #{source_or_key.class.name}."
       end
-      puts "Couldn't find #{source_or_key}" if !result && Jsus.verbose?
-      result
     end
   
 
@@ -72,7 +70,7 @@ module Jsus
     #
     # Returns an instance of Container which contains needed files sorted.
     #
-    def lookup_dependencies(source_or_source_key)      
+    def lookup_dependencies(source_or_source_key)
       source = lookup(source_or_source_key)
       result = Container.new
       looked_up = []
@@ -113,7 +111,12 @@ module Jsus
           extensions_map[source.extends] ||= []
           extensions_map[source.extends] << source
         else
-          source.provides.each {|p| provides_map[p] = source }
+          source.provides.each do |p|
+            if provides_map[p] && provides_map[p] != source && provides_map[p].filename != source.filename && Jsus.verbose?
+              puts "Redeclared #{p.to_s} in #{source.filename} (previously declared in #{provides_map[p].filename})"
+            end
+            provides_map[p] = source
+          end
         end
       when source_or_sources_or_package.kind_of?(Package)
         package = source_or_sources_or_package
@@ -151,7 +154,15 @@ module Jsus
     # Performs the actual lookup for #lookup_direct_dependencies
     #
     def lookup_direct_dependencies!(source)
-      result = source ? (source.dependencies + source.external_dependencies).map {|d| lookup(d)} : []
+      result = if source
+        (source.dependencies + source.external_dependencies).map do |dependency|
+          result = lookup(dependency)
+          puts "#{source.filename} is missing #{dependency.is_a?(SourceFile) ? dependency.filename : dependency.to_s}" if !result && Jsus.verbose?
+          result
+        end
+      else
+        []
+      end
       Container.new(*result)
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 18
-  version: 0.1.18
+  - 19
+  version: 0.1.19
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +03:00
+date: 2010-11-27 00:00:00 +03:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -278,7 +278,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 111448912275714831
+      hash: -125126051440542470
       segments: 
       - 0
       version: "0"