jsus 0.1.17 → 0.1.18

data/VERSION

@@ -1 +1 @@
-0.1.17
+0.1.18

data/bin/jsus

@@ -58,10 +58,19 @@ Choice.options do
 
   end
 
+  option "verbose", :required => false do
+    default false
+    short "-v"
+    long "--verbose"
+    desc "When verbose mode is enabled, some debug information is displayed. Defaults to false."
+  end
+
 end
 
 compile_start_time = Time.now
 
+Jsus.verbose = Choice.choices[:verbose]
+
 pool_load_start_time = Time.now
 pool = if Choice.choices[:dependencies]
   Jsus::Pool.new(Choice.choices[:dependencies])

data/jsus.gemspec

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

data/lib/jsus.rb

@@ -26,4 +26,11 @@ require 'jsus/pool'
 
 
 module Jsus
+  def self.verbose?
+    !!@verbose
+  end
+
+  def self.verbose=(verbose)
+    @verbose = verbose
+  end
 end

data/lib/jsus/pool.rb

@@ -51,17 +51,19 @@ module Jsus
     # If given a source file, returns the input.
     #
     def lookup(source_or_key)
-      case source_or_key
-      when String
-        provides_map[Tag[source_or_key]]
-      when Tag
-        provides_map[source_or_key]
-      when SourceFile
-        source_or_key
-      else
-        raise "Illegal lookup query. Expected String, Tag or SourceFile, " <<
-              "given #{source_or_key.inspect}, an instance of #{source_or_key.class.name}."
+      result = case source_or_key
+        when String
+          provides_map[Tag[source_or_key]]
+        when Tag
+          provides_map[source_or_key]
+        when SourceFile
+          source_or_key
+        else
+          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
   
 
@@ -73,10 +75,11 @@ module Jsus
     def lookup_dependencies(source_or_source_key)      
       source = lookup(source_or_source_key)
       result = Container.new
+      looked_up = []
       if source
         dependencies = lookup_direct_dependencies(source)
-        while !dependencies.empty?
-          dependencies.each { |d| result.push(d) }
+        while !((dependencies - looked_up).empty?)
+          dependencies.each { |d| result.push(d); looked_up << d }
           dependencies = dependencies.map {|d| lookup_direct_dependencies(d).to_a }.flatten.uniq
         end
         result.sort!

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 17
-  version: 0.1.17
+  - 18
+  version: 0.1.18
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +03:00
+date: 2010-11-26 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: -666369529496465647
+      hash: 111448912275714831
       segments: 
       - 0
       version: "0"