jsus 0.2.2 → 0.2.3

data/Rakefile

@@ -33,6 +33,12 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
+require 'cucumber'
+require 'cucumber/rake/task'
+
+Cucumber::Rake::Task.new(:features) do |t|
+end
+
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/jsus

@@ -31,8 +31,9 @@ cli = OptionParser.new do |opts|
     options[:deps_dir] = dir
   end
   
-  opts.on('-g', '--generate-includes', 'generates includes.js file that you may use for ad-hoc requiring of dependencies') do
+  opts.on('-g', '--generate-includes [ROOT]', 'generates includes.js file that you may use for ad-hoc requiring of dependencies, defaults to output directory') do |dir|
     options[:generate_includes] = true
+    options[:includes_root] = dir
   end
   
   opts.on('--generate-docs [*CLASSES]', Array, "generate docs for some of the sources. When given empty array, defaults to /**/*") do |docs|
@@ -117,14 +118,19 @@ validators_map = {"mooforge" => Jsus::Validator::Mooforge}
   end
 end
 
-# Hack, hack, hack :[
+# Hack, hack, hack >:E
 if options[:generate_includes]
+  includes_root = options[:includes_root] || output_dir
   File.open(File.join(output_dir, "includes.js"), "w") do |f|
     c = Jsus::Container.new(*(package.source_files.to_a + package.linked_external_dependencies.to_a))
-    script = %{(function(prefix) {
+    script = %{
+    (function(prefix, loader) {
       var sources = %sources%;
-      for (var i = 0, j = sources.length; i < j; i++) document.write('<scr' + 'ipt src="' + (prefix || '') + sources[i] + '"></script>');
-    })(window.prefix);}.sub("%sources%", JSON.pretty_generate(c.required_files(output_dir)))
+      if (!loader) loader = function(path) {
+        document.write('<scr' + 'ipt src="' + (prefix || '') + path + '"></script>');
+      }
+      for (var i = 0, j = sources.length; i < j; i++) loader(sources[i]);
+    })(window.prefix, window.loader);}.sub("%sources%", JSON.pretty_generate(c.required_files(includes_root)))
     f.puts script
   end
 end

data/features/command-line/basic_dependency_resolution.feature

@@ -3,7 +3,7 @@ Feature: resolve dependencies
   dependency list.
 
   Scenario: internal dependencies in correct order
-    When I run "jsus -i Basic -o tmp"
+    When I run "jsus Basic tmp"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain
@@ -52,7 +52,7 @@ Feature: resolve dependencies
   
   
   Scenario: internal dependencies in wrong order
-    When I run "jsus -i BasicWrongOrder -o tmp"
+    When I run "jsus BasicWrongOrder tmp"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain

data/features/command-line/extensions.feature

@@ -3,7 +3,7 @@ Feature: extensions
   extensions.
   
   Scenario: monkeypatch for external dependency
-    When I run "jsus -i Extensions -o tmp -d Extensions/Mootools"
+    When I run "jsus Extensions tmp -d Extensions/Mootools"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain

data/features/command-line/external_dependency_resolution.feature

@@ -3,7 +3,7 @@ Feature: external dependencies
   pool.
   
   Scenario: basic external dependency
-    When I run "jsus -i ExternalDependency -o tmp -d ExternalDependency/Mootools"
+    When I run "jsus ExternalDependency tmp -d ExternalDependency/Mootools"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain
@@ -50,7 +50,7 @@ Feature: external dependencies
     And file "tmp/package.js" should have "script: Core.js" before "script: Color.js"
   
   Scenario: external dependency with external dependency
-    When I run "jsus -i ExternalDependencyWithExternalDependency -o tmp -d ExternalDependencyWithExternalDependency"
+    When I run "jsus ExternalDependencyWithExternalDependency tmp -d ExternalDependencyWithExternalDependency"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain

data/features/command-line/json_package.feature

@@ -3,7 +3,7 @@ Feature: json package files
   package.json 
 
   Scenario: package with package.json file
-    When I run "jsus -i JsonPackage -o tmp"
+    When I run "jsus JsonPackage tmp"
     Then the following files should exist:
       | tmp/package.js |
     And file "tmp/package.js" should contain

data/features/command-line/structure_json.feature

@@ -3,7 +3,7 @@ Feature: structure json files
   generate some extra files.
   
   Scenario: auto-generation of tree.json and scripts.json
-    When I run "jsus -i Basic -o tmp"
+    When I run "jsus Basic tmp"
     Then the following files should exist:
       | tmp/tree.json    |
       | tmp/scripts.json |

data/jsus.gemspec

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-17 00:00:00 +03:00
+date: 2011-02-11 00:00:00 +03:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1177677951338357144
+      hash: -1946463697476242454
       segments: 
       - 0
       version: "0"