jsus 0.1.2 → 0.1.3

data/CHANGELOG

@@ -1,5 +1,14 @@
 = Jsus Changelog
 
+== Version 0.1.3
+* Updated Pool class with dependency resolvers
+* Added Package#include_external_dependencies!
+  * Included external dependencies won't show in its Package#dependencies
+  * Same for external provides
+
+* Revamped command-line interface for jsus utility
+  * Added dependencies compilation
+
 == Version 0.1.2
 * Removed Bundler class which seemed like totally unneccessary
 * jsus command-line utility now works in single-project mode

data/Manifest

@@ -19,6 +19,14 @@ spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js
 spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js
 spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js
 spec/data/Basic/app/javascripts/Orwik/package.yml
+spec/data/ChainDependencies/app/javascripts/Class/Source/Class.js
+spec/data/ChainDependencies/app/javascripts/Class/package.yml
+spec/data/ChainDependencies/app/javascripts/Hash/Source/Hash.js
+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/ExternalDependencies/app/javascripts/Orwik/Source/Test.js
+spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml
 spec/data/OutsideDependencies/README
 spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js
 spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js

data/Rakefile

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
-Echoe.new('jsus', '0.1.2') do |g|
+Echoe.new('jsus', '0.1.3') do |g|
   g.description    = "Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info."
   g.url            = "http://github.com/markiz/jsus"
   g.author         = "Markiz, idea by Inviz (http://github.com/Inviz)"
   g.email          = "markizko@gmail.com"
   g.ignore_pattern = ["nbproject/**/*", 'spec/*/public/**/*']
-  g.runtime_dependencies   = ["activesupport", "json_pure", "rgl"]
+  g.runtime_dependencies   = ["activesupport", "json_pure", "rgl", "optiflag"]
   g.development_dependencies = ["rake"]
   g.use_sudo       = false
 end

data/bin/jsus

@@ -1,13 +1,47 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'jsus'
+require 'optiflag'
 
-unless ARGV.length == 2
-  puts "SYNOPSYS: jsus <input_directory_with_package> <output_directory_for_package>"
-  exit
-else
-  package = Jsus::Package.new(ARGV[0])
-  package.compile(ARGV[1])
-  package.generate_scripts_info(ARGV[1])
-  package.generate_tree(ARGV[1])
+module JsusCL
+  extend OptiFlagSet
+
+  flag "input_directory" do
+    alternate_forms "i"
+    description "Path to directory containing your package to compile."
+  end
+
+  flag "output_directory" do
+    alternate_forms "o"
+    description "Path to directory to output the compiled package."
+  end
+
+  optional_flag "dependencies" do
+    alternate_forms "d"
+    description "Path to directory containing packages this package relies on. " <<
+                "If set, all the packages will be compiled into a single file"
+  end
+
+  optional_flag "scripts_info" do
+    default "yes"
+    description "Generates scripts.json file with general info about your package"
+    value_in_set ["yes", "no"]
+  end
+
+  optional_flag "tree_info" do
+    default "yes"
+    description "Generates scripts.json file with tree structure of your package"
+    value_in_set ["yes", "no"]
+  end
+
+  and_process!
+end
+
+pool = if JsusCL.flags.dependencies?
+  Jsus::Pool.new(JsusCL.flags.dependencies)
 end
+package = Jsus::Package.new(JsusCL.flags.input_directory, :pool => pool)
+package.include_dependencies! if JsusCL.flags.dependencies?
+package.compile(JsusCL.flags.output_directory)
+package.generate_scripts_info(JsusCL.flags.output_directory) if JsusCL.flags.scripts_info == "yes"
+package.generate_tree(JsusCL.flags.output_directory) if JsusCL.flags.scripts_info == "yes"

data/jsus.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markiz, idea by Inviz (http://github.com/Inviz)"]
-  s.date = %q{2010-06-04}
+  s.date = %q{2010-06-06}
   s.default_executable = %q{jsus}
   s.description = %q{Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.}
   s.email = %q{markizko@gmail.com}
   s.executables = ["jsus"]
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "jsus.gemspec", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml", "spec/data/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/container_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/packager_spec.rb", "spec/lib/jsus/pool_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/lib/jsus/topsortable_spec.rb", "spec/shared/class_stubs.rb", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "jsus.gemspec", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/ChainDependencies/app/javascripts/Class/Source/Class.js", "spec/data/ChainDependencies/app/javascripts/Class/package.yml", "spec/data/ChainDependencies/app/javascripts/Hash/Source/Hash.js", "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/ExternalDependencies/app/javascripts/Orwik/Source/Test.js", "spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml", "spec/data/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/container_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/packager_spec.rb", "spec/lib/jsus/pool_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/lib/jsus/topsortable_spec.rb", "spec/shared/class_stubs.rb", "spec/spec.opts", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/markiz/jsus}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jsus", "--main", "README"]
   s.require_paths = ["lib"]
@@ -28,17 +28,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_runtime_dependency(%q<rgl>, [">= 0"])
+      s.add_runtime_dependency(%q<optiflag>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
       s.add_dependency(%q<rgl>, [">= 0"])
+      s.add_dependency(%q<optiflag>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<json_pure>, [">= 0"])
     s.add_dependency(%q<rgl>, [">= 0"])
+    s.add_dependency(%q<optiflag>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/lib/jsus.rb

@@ -11,13 +11,8 @@ require 'jsus/topsortable'
 require 'jsus/source_file'
 require 'jsus/container'
 require 'jsus/packager'
-require 'jsus/pool'
 require 'jsus/package'
+require 'jsus/pool'
 
 module Jsus
-  # Shortcut for Bundler.new
-  def self.new(*args, &block)
-    Bundler.new(*args, &block)
-  end
-
 end

data/lib/jsus/container.rb

@@ -8,18 +8,33 @@ module Jsus
       end
     end
 
+
+    # PRO TIP: #<< sorts upon every invokation
+    # #push doesn't
     def <<(source)
+      push(source)
+      sort!
+    end
+
+    def push(source)
       if source
         if source.kind_of?(Array) || source.kind_of?(Container)
-          source.each {|s| self << s }
+          source.each {|s| self.push(s) }
         else
-          sources << source
-          sort!
+          sources.push(source)
         end
       end
       self
     end
 
+    def flatten      
+      map {|item| item.respond_to?(:flatten) ? item.flatten : item }.flatten
+    end
+
+    def to_a
+      sources
+    end
+
     def sources
       @sources ||= []
     end
@@ -30,6 +45,7 @@ module Jsus
 
     def sort!
       self.sources = topsort(:sources)
+      self
     end
 
     def inspect
@@ -37,6 +53,11 @@ module Jsus
     end
 
     # delegate undefined methods to #sources
-    (Array.instance_methods - self.instance_methods).each {|m| delegate m, :to => :sources }
+    DELEGATED_METHODS = [
+                          "==", "map", "map!", "each", "inject", "reject",
+                          "detect", "size", "length", "[]", "empty?",
+                          "index", "include?"
+                        ]
+    (DELEGATED_METHODS).each {|m| delegate m, :to => :sources }
   end
 end

data/lib/jsus/package.rb

@@ -5,15 +5,18 @@ module Jsus
     attr_accessor :pool
      # Constructors
     def initialize(directory, options = {})
-      self.relative_directory = directory #Pathname.new(directory).relative_path_from(Pathname.new(".")).to_s
+      self.relative_directory = directory
       self.directory = File.expand_path(directory)
       self.header = YAML.load_file(File.join(directory, 'package.yml'))
-      self.pool = options[:pool]
       Dir.chdir(directory) do
         files.each do |source|
           source_files << SourceFile.from_file(source, :package => self)
         end
       end
+      if options[:pool]
+        self.pool = options[:pool]
+        self.pool << self
+      end
     end
 
 
@@ -35,11 +38,8 @@ module Jsus
     end
 
     def provides
-      @provides ||= provides!
-    end
-
-    def provides!
-      source_files.map {|source| source.provides }.flatten
+      source_files.map {|source| source.provides(:short => true) }.flatten +
+        external_dependencies.map {|d| d.provides }.flatten
     end
 
     def files
@@ -49,11 +49,15 @@ module Jsus
     alias_method :sources, :files
 
     def dependencies
-      @dependencies ||= dependencies!
+      source_files.map {|source| source.dependencies(:short => true) }.flatten.compact.uniq - provides
+    end
+
+    def external_dependencies
+      @external_dependencies ||= Container.new
     end
 
-    def dependencies!
-      source_files.map {|source| source.dependencies }.flatten.compact.uniq - provides!
+    def external_dependencies=(new_value)
+      @external_dependencies = new_value
     end
 
     def description
@@ -61,7 +65,7 @@ module Jsus
     end    
 
     def compile(directory = ".")
-      Packager.new(*source_files).pack(File.join(directory, filename))
+      Packager.new(*(source_files.to_a + external_dependencies.to_a)).pack(File.join(directory, filename))
     end
 
     def generate_tree(directory = ".", filename = "tree.json")
@@ -88,6 +92,12 @@ module Jsus
       self.to_hash
     end
 
+    def include_dependencies!
+      source_files.each do |source|
+        self.external_dependencies << pool.lookup_dependencies(source)
+      end
+    end
+
 
     def required_files
       source_files.map {|s| s.filename }

data/lib/jsus/pool.rb

@@ -1,22 +1,75 @@
 module Jsus
   class Pool
+
+    def initialize(dir = nil)
+      if dir
+        Dir[File.join(dir, '**', 'package.yml')].each do |package_path|
+          Package.new(Pathname.new(package_path).parent.to_s, :pool => self)
+        end
+      end
+    end
+
+    def packages
+      @packages ||= []
+      @packages.uniq!
+      @packages
+    end
+
     def sources
       @sources ||= Container.new
     end
 
-    def lookup(key)
-      @provides_map[key]
+    def lookup(source_or_key)
+      case source_or_key
+      when String
+        provides_map[source_or_key]
+      when Jsus::SourceFile
+        source_or_key
+      else
+        raise "Illegal lookup query. Expected String or SourceFile, given #{source_or_key.class.name}."
+      end
     end
 
-    def <<(source)
-      sources << source
-      @provides_map = sources.inject({}) do |result, source|
-        source.provides(:full => true).each {|p| result[p] = source }
-        result
+    def lookup_direct_dependencies(source_or_source_key)
+      source = lookup(source_or_source_key)
+      result = source.dependencies(:short => true).select {|d| d =~ %r(/)}.map {|d| lookup(d)}
+      Container.new(*result)
+    end
+
+    def lookup_dependencies(source_or_source_key)
+      source = lookup(source_or_source_key)
+      result = Container.new
+      dependencies = lookup_direct_dependencies(source).to_a
+      while !dependencies.empty?
+        dependencies.each { |d| result.push(d) }
+        dependencies = dependencies.map {|d| lookup_direct_dependencies(d).to_a }.flatten.compact.uniq
+      end
+      result.sort!
+    end
+
+    def <<(source_or_sources_or_package)
+      case 
+      when source_or_sources_or_package.kind_of?(SourceFile)
+        source = source_or_sources_or_package
+        sources << source
+        source.provides.each {|p| provides_map[p] = source }
+      when source_or_sources_or_package.kind_of?(Package)
+        package = source_or_sources_or_package
+        packages << package
+        package.source_files.each {|s| self << s}
+      when source_or_sources_or_package.kind_of?(Array) || source_or_sources_or_package.kind_of?(Container)
+        sources = source_or_sources_or_package
+        sources.each {|s| self << s}
       end
       self
     end
 
     (Array.instance_methods - self.instance_methods).each {|m| delegate m, :to => :sources }
+
+    protected
+
+    def provides_map
+      @provides_map ||= {}
+    end
   end
 end

data/lib/jsus/source_file.rb

@@ -38,8 +38,8 @@ module Jsus
     def dependencies(options = {})
       header["requires"] = [header["requires"] || []].flatten
       header["requires"].map! {|r| r.gsub(/^\//, "") }
-      if options[:full] && package
-        header["requires"].map {|r| "#{package.name}/#{r}"}
+      if !options[:short] && package
+        header["requires"].map {|r| r.index("/") ? r : "#{package.name}/#{r}"}
       else
         header["requires"]
       end
@@ -48,7 +48,7 @@ module Jsus
 
     def provides(options = {})
       header["provides"] = [header["provides"] || []].flatten
-      if options[:full] && package
+      if !options[:short] && package
         header["provides"].map {|p| "#{package.name}/#{p}"}
       else
         header["provides"]
@@ -62,8 +62,8 @@ module Jsus
     def to_hash
       {
         "desc"     => description,
-        "requires" => dependencies,
-        "provides" => provides
+        "requires" => dependencies(:short => true),
+        "provides" => provides(:short => true)
       }
     end
 

data/spec/data/ChainDependencies/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/ChainDependencies/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/ChainDependencies/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/ChainDependencies/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/ChainDependencies/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/Hash
+ 
+provides: [Mash]
+ 
+...
+*/

data/spec/data/ChainDependencies/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/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js

@@ -0,0 +1,17 @@
+/*
+---
+ 
+script: Test.js
+ 
+description: A library to work with tests
+ 
+license: MIT-style license
+ 
+authors:
+- Valerio Proietti
+requires:
+  - Mash/Mash
+provides: [Test]
+ 
+...
+*/

data/spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml

@@ -0,0 +1,9 @@
+name: orwik
+filename: orwik.js
+web: http://orwik.com
+description: Orwik widgets and essensial things
+license: MIT-Style License, http://mootools.net/license
+copyright: 2008-2010 Yaroslaff Fedin http://orwik.com/people/inviz
+authors: Orwik team, http://developers.orwik.com
+sources:
+  - "Source/Test.js"

data/spec/lib/jsus/package_spec.rb

@@ -16,9 +16,11 @@ describe Jsus::Package do
         subject.filename.should == "orwik.js"
       end
 
-      it "should pass pool in options" do
-        pool = Object.new
-        Jsus::Package.new(input_dir, :pool => pool).pool.should == pool
+      it "should pass pool in options and register itself in the pool" do
+        pool = Jsus::Pool.new
+        package = Jsus::Package.new(input_dir, :pool => pool)
+        package.pool.should == pool
+        pool.packages.should include(package)
       end
 
       it "should set provided modules from source files" do
@@ -56,6 +58,29 @@ describe Jsus::Package do
       info["provides"].should have_exactly(4).items
       info["provides"].should include("Color", "Widget", "Input", "Input.Color")
     end
+    
+    context "when external dependencies are included" do
+      let(:lib_dir) { "spec/data/ChainDependencies/app/javascripts" }
+      let(:pool) { Jsus::Pool.new(lib_dir) }
+      subject { Jsus::Package.new("spec/data/ExternalDependencies/app/javascripts/Orwik", :pool => pool) }
+
+      it "should show included external dependencies as provided" do
+        subject.include_dependencies!
+        subject.generate_scripts_info(output_dir)
+        info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
+        info = info["orwik"]
+        info["provides"].should have_exactly(4).items
+        info["provides"].should include("Test", "Hash/Hash", "Class/Class", 'Mash/Mash')
+      end
+
+      it "should not show included external dependencies as required" do
+        subject.include_dependencies!
+        subject.generate_scripts_info(output_dir)
+        info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
+        info = info["orwik"]
+        info["requires"].should == []
+      end
+    end
   end
 
   describe "#generate_tree" do
@@ -90,4 +115,19 @@ describe Jsus::Package do
      color_index.should < input_color_index
    end
   end
+
+  describe "#include_dependencies!" do
+    let(:lib_dir) { "spec/data/ChainDependencies/app/javascripts" }
+    let(:pool) { Jsus::Pool.new(lib_dir) }
+    subject { Jsus::Package.new("spec/data/ExternalDependencies/app/javascripts/Orwik", :pool => pool) }
+
+    it "should include external dependencies into self" do
+      subject.include_dependencies!
+      subject.should have(3).external_dependencies
+      compiled = subject.compile
+      ["Class", "Hash", "Mash"].each do |name|
+        compiled.should include(IO.read("#{lib_dir}/#{name}/Source/#{name}.js"))
+      end
+    end
+  end
 end

data/spec/lib/jsus/pool_spec.rb

@@ -1,19 +1,77 @@
 require 'spec/spec_helper'
 describe Jsus::Pool do
-  let(:package) { Jsus::Package.new("spec/data/OutsideDependencies/app/javascripts/Core") }
+  let(:input_dir) { "spec/data/ChainDependencies/app/javascripts" }
+  let(:packages) {
+    [
+      Jsus::Package.new("#{input_dir}/Mash",  :pool => subject),
+      Jsus::Package.new("#{input_dir}/Class", :pool => subject),
+      Jsus::Package.new("#{input_dir}/Hash",  :pool => subject)
+    ]
+  }
+
+  let(:sources) {
+    packages.map {|p| p.source_files[0] }    
+  }
+
   subject { Jsus::Pool.new }
 
-  before(:each) do
-    subject << package.source_files
+  context "initialization" do
+    context "without any arguments" do
+      subject { Jsus::Pool.new }
+      it "should be available" do
+        lambda {
+          subject
+        }.should_not raise_error
+      end
+    end
+
+    context "from directory" do
+      subject { Jsus::Pool.new(input_dir)}
+      it "should search for packages recursively and add them to itself" do
+        subject.should have_exactly(3).packages
+        subject.packages.map {|p| p.name }.should include("Mash", "Hash", "Class")
+      end
+
+      it "should add all the source files to pool" do
+        subject.should have_exactly(3).sources
+        subject.sources.map {|s| s.provides }.flatten.should include("Mash/Mash", "Hash/Hash", "Class/Class")
+      end
+    end
   end
 
+
   describe "#lookup" do
+    before(:each) do
+      packages.each {|package| subject << package.source_files }
+    end
+
     it "should find a source file providing given full name" do
-      subject.lookup("Core/Hash").should be_kind_of(Jsus::SourceFile)
+      subject.lookup("Class/Class").should == sources[1]
     end
 
     it "should return nil if nothing could be found" do
       subject.lookup("Core/WTF").should be_nil
     end
   end
+
+  describe "#lookup_direct_dependencies" do
+    before(:each) 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)
+      subject.lookup_direct_dependencies("Mash/Mash").should == [sources[2]]
+    end
+  end
+
+  describe "#lookup_dependencies" do
+    before(:each) do
+      packages.each {|package| subject << package.source_files }
+    end
+
+    it "should return a container with files and dependencies" do
+      subject.lookup_dependencies("Mash/Mash").should == [sources[1], sources[2]]
+    end
+  end
 end

data/spec/lib/jsus/source_file_spec.rb

@@ -52,32 +52,42 @@ describe Jsus::SourceFile do
   end
 
   describe "#provides" do
-    it "should return the stuff it provides" do
-      subject.provides.should == ["Chain", "Events", "Options"]
+    it "should return the stuff it provides in full form" do
+      subject.provides.should == ["Core/Chain", "Core/Events", "Core/Options"]
     end
 
-    it "should prepend package prefix if asked for fully formed provides" do
-      subject.provides(:full => true).should == ["Core/Chain", "Core/Events", "Core/Options"]
+    it "should cut package prefix if asked for short-formed provides" do
+      subject.provides(:short => true).should == ["Chain", "Events", "Options"]
     end
 
     it "should work well when given single string instead of array" do
       subject.header["provides"] = "Mash"
-      subject.provides.should == ["Mash"]
+      subject.provides.should == ["Core/Mash"]
     end
   end
 
   describe "#dependencies" do
     it "should truncate leading slash" do
-      subject.dependencies.should == ["Class"]
+      subject.dependencies.should == ["Core/Class"]
     end
 
-    it "should prepend package prefix if asked for fully formed dependencies" do
-      subject.dependencies(:full => true).should == ["Core/Class"]
+    it "should cut package prefix if asked for short-formed dependencies" do
+      subject.dependencies(:short => true).should == ["Class"]
     end
 
     it "should work well when given single string instead of array" do
       subject.header["requires"] = "Class"
-      subject.dependencies.should == ["Class"]
+      subject.dependencies.should == ["Core/Class"]
+    end
+
+    it "should not truncate package name in short form for external dependencies" do
+      subject.header["requires"] = "Mash/Mash"
+      subject.dependencies(:short => true).should == ["Mash/Mash"]
+    end
+
+    it "should not prepend package name in full form for external dependencies" do
+      subject.header["requires"] = "Mash/Mash"
+      subject.dependencies.should == ["Mash/Mash"]
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Markiz, idea by Inviz (http://github.com/Inviz)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 +04:00
+date: 2010-06-06 00:00:00 +04:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: optiflag
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,8 +63,20 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.
 email: markizko@gmail.com
 executables: 
@@ -106,6 +118,14 @@ files:
 - spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js
 - spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js
 - spec/data/Basic/app/javascripts/Orwik/package.yml
+- spec/data/ChainDependencies/app/javascripts/Class/Source/Class.js
+- spec/data/ChainDependencies/app/javascripts/Class/package.yml
+- spec/data/ChainDependencies/app/javascripts/Hash/Source/Hash.js
+- 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/ExternalDependencies/app/javascripts/Orwik/Source/Test.js
+- spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml
 - spec/data/OutsideDependencies/README
 - spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js
 - spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js