jsus 0.1.5 → 0.1.6

data/CHANGELOG

@@ -1,4 +1,8 @@
 = Jsus Changelog
+== Version 0.1.6
+* Fixed an issue with jsus not including internal dependencies for external dependencies.
+  First robust solution handles this via Pool and eager dependency load.
+
 == Version 0.1.5
 * Introduced new concept, Tag, which is going to be used instead of 
   provides/requires strings

data/Manifest

@@ -5,6 +5,7 @@ README
 Rakefile
 TODO
 bin/jsus
+jsus.gemspec
 lib/jsus.rb
 lib/jsus/container.rb
 lib/jsus/package.rb
@@ -30,6 +31,18 @@ spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js
 spec/data/Extensions/app/javascripts/Orwik/package.yml
 spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js
 spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml
+spec/data/ExternalInternalDependencies/Core/Class/Source/Class.js
+spec/data/ExternalInternalDependencies/Core/Class/Source/Type.js
+spec/data/ExternalInternalDependencies/Core/Class/package.yml
+spec/data/ExternalInternalDependencies/Core/Hash/Source/Hash.js
+spec/data/ExternalInternalDependencies/Core/Hash/package.yml
+spec/data/ExternalInternalDependencies/Core/Mash/Source/Mash.js
+spec/data/ExternalInternalDependencies/Core/Mash/package.yml
+spec/data/ExternalInternalDependencies/Test/Source/Library/Color.js
+spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.Color.js
+spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.js
+spec/data/ExternalInternalDependencies/Test/Source/Widget/Widget.js
+spec/data/ExternalInternalDependencies/Test/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,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
-Echoe.new('jsus', '0.1.5') do |g|
+Echoe.new('jsus', '0.1.6') 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)"

data/jsus.gemspec

@@ -2,29 +2,29 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   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-15}
+  s.date = %q{2010-08-25}
   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/tag.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/tag.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/Extensions/app/javascripts/Core/Source/Class.js", "spec/data/Extensions/app/javascripts/Core/package.yml", "spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js", "spec/data/Extensions/app/javascripts/Orwik/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/tag_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/tag.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/Extensions/app/javascripts/Core/Source/Class.js", "spec/data/Extensions/app/javascripts/Core/package.yml", "spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js", "spec/data/Extensions/app/javascripts/Orwik/package.yml", "spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js", "spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml", "spec/data/ExternalInternalDependencies/Core/Class/Source/Class.js", "spec/data/ExternalInternalDependencies/Core/Class/Source/Type.js", "spec/data/ExternalInternalDependencies/Core/Class/package.yml", "spec/data/ExternalInternalDependencies/Core/Hash/Source/Hash.js", "spec/data/ExternalInternalDependencies/Core/Hash/package.yml", "spec/data/ExternalInternalDependencies/Core/Mash/Source/Mash.js", "spec/data/ExternalInternalDependencies/Core/Mash/package.yml", "spec/data/ExternalInternalDependencies/Test/Source/Library/Color.js", "spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.Color.js", "spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.js", "spec/data/ExternalInternalDependencies/Test/Source/Widget/Widget.js", "spec/data/ExternalInternalDependencies/Test/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/tag_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"]
   s.rubyforge_project = %q{jsus}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])
       s.add_runtime_dependency(%q<rgl>, [">= 0"])

data/lib/jsus.rb

@@ -7,6 +7,8 @@ require 'active_support/core_ext/module/delegation'
 require 'rgl/adjacency'
 require 'rgl/topsort'
 
+require 'fileutils'
+
 require 'jsus/source_file'
 require 'jsus/package'
 require 'jsus/tag'

data/lib/jsus/pool.rb

@@ -132,7 +132,7 @@ module Jsus
     #
     def lookup_direct_dependencies(source_or_source_key)      
       source = lookup(source_or_source_key)
-      result = source ? source.external_dependencies.map {|d| lookup(d)} : []
+      result = source ? (source.dependencies + source.external_dependencies).map {|d| lookup(d)} : []
       Container.new(*result)
     end
 

data/spec/data/ExternalInternalDependencies/Core/Class/Source/Class.js

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

data/spec/data/ExternalInternalDependencies/Core/Class/Source/Type.js

@@ -0,0 +1,13 @@
+/*
+---
+ 
+script: Type.js
+ 
+description: Something
+ 
+license: MIT-style license.
+
+provides: [Type]
+ 
+...
+*/

data/spec/data/ExternalInternalDependencies/Core/Class/package.yml

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

data/spec/data/ExternalInternalDependencies/Core/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/ExternalInternalDependencies/Core/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/ExternalInternalDependencies/Core/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/ExternalInternalDependencies/Core/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/ExternalInternalDependencies/Test/Source/Library/Color.js

@@ -0,0 +1,16 @@
+/*
+---
+ 
+script: Color.js
+ 
+description: A library to work with colors
+ 
+license: MIT-style license
+ 
+authors:
+- Valerio Proietti
+ 
+provides: [Color]
+ 
+...
+*/

data/spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.Color.js

@@ -0,0 +1,20 @@
+/*
+---
+ 
+script: Input.Color.js
+ 
+description: Cool colorpicker for everyone to enjoy
+ 
+license: MIT-style license
+ 
+authors:
+- Yaroslaff Fedin
+ 
+requires:
+- Input
+- Color
+ 
+provides: [Input.Color]
+ 
+...
+*/

data/spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.js

@@ -0,0 +1,19 @@
+/*
+---
+ 
+script: Input.js
+ 
+description: Basic input class
+ 
+license: MIT-style license
+ 
+authors:
+- Yaroslaff Fedin
+ 
+requires:
+- Widget
+ 
+provides: [Input]
+ 
+...
+*/

data/spec/data/ExternalInternalDependencies/Test/Source/Widget/Widget.js

@@ -0,0 +1,20 @@
+/*
+---
+ 
+script: Widget.js
+ 
+description: An abstract class for all your widgets out there.
+ 
+license: MIT-style license
+ 
+authors:
+- Yaroslaff Fedin
+ 
+requires: 
+- Class/Class
+- Mash/Mash
+ 
+provides: [Widget]
+ 
+...
+*/

data/spec/data/ExternalInternalDependencies/Test/package.yml

@@ -0,0 +1,12 @@
+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
+files:
+  - "Source/Widget/Widget.js" 
+  - "Source/Widget/Input/Input.js"
+  - "Source/Widget/Input/Input.Color.js" #Files are unsorted. Figure out the order please
+  - "Source/Library/Color.js"

data/spec/lib/jsus/container_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 
 describe Jsus::Container do

data/spec/lib/jsus/package_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 require 'json'
 
 describe Jsus::Package do

data/spec/lib/jsus/packager_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 
 describe Jsus::Packager do 

data/spec/lib/jsus/pool_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 describe Jsus::Pool do
   let(:input_dir) { "spec/data/ChainDependencies/app/javascripts" }
   let(:packages) {
@@ -97,8 +97,18 @@ describe Jsus::Pool do
     end
   end
 
+
+  context "when external dependencies have internal dependencies" do
+    let(:input_dir) { "spec/data/ExternalInternalDependencies" }
+    subject { Jsus::Pool.new(input_dir) }
+    it "#lookup_dependencies should include them" do
+      subject.lookup_dependencies("Class/Class").should have_exactly(1).element
+    end
+  end
+
+
   describe "#lookup_extensions" do
-    let(:input_dir) { "spec/Data/Extensions/app/javascripts" }
+    let(:input_dir) { "spec/data/Extensions/app/javascripts" }
     subject { Jsus::Pool.new(input_dir) }
 
     it "should return empty array if there's not a single extension for given tag" do

data/spec/lib/jsus/source_file_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Jsus::SourceFile do
   before(:each) { cleanup }

data/spec/lib/jsus/tag_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Jsus::Tag do
   subject { Jsus::Tag.new("Wtf") }

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+require 'rubygems'
+require 'spec'
+# require 'ruby-debug'
+
+$LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
 require 'lib/jsus'
 Dir["spec/shared/*.rb"].each {|f| require f}
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsus
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Markiz, idea by Inviz (http://github.com/Inviz)
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-15 00:00:00 +04:00
-default_executable: jsus
+date: 2010-08-25 00:00:00 +04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: rgl
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -57,9 +64,11 @@ dependencies:
   name: choice
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -69,9 +78,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -130,6 +141,18 @@ files:
 - spec/data/Extensions/app/javascripts/Orwik/package.yml
 - spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js
 - spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml
+- spec/data/ExternalInternalDependencies/Core/Class/Source/Class.js
+- spec/data/ExternalInternalDependencies/Core/Class/Source/Type.js
+- spec/data/ExternalInternalDependencies/Core/Class/package.yml
+- spec/data/ExternalInternalDependencies/Core/Hash/Source/Hash.js
+- spec/data/ExternalInternalDependencies/Core/Hash/package.yml
+- spec/data/ExternalInternalDependencies/Core/Mash/Source/Mash.js
+- spec/data/ExternalInternalDependencies/Core/Mash/package.yml
+- spec/data/ExternalInternalDependencies/Test/Source/Library/Color.js
+- spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.Color.js
+- spec/data/ExternalInternalDependencies/Test/Source/Widget/Input/Input.js
+- spec/data/ExternalInternalDependencies/Test/Source/Widget/Widget.js
+- spec/data/ExternalInternalDependencies/Test/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
@@ -167,16 +190,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 11
       segments: 
       - 1
       - 2
@@ -184,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jsus
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.