jsus 0.2.7 → 0.3.0

data/.travis.yml

@@ -0,0 +1,6 @@
+script: "rake"
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - jruby

data/CHANGELOG

@@ -1,4 +1,7 @@
 = Jsus Changelog
+== Version 0.3.0
+* Added Jsus::Middleware for rack middleware stuff. Yay!
+
 == Version 0.2.7
 * Brushed up CLI code
 * Added --watch option for cli (using fssm gem and fs backend for your operating system)
@@ -104,4 +107,4 @@ See jsus-examples repo or features dir for more information.
 * Moved out packing logic to brand new Packager and Container classes
 
 == Version 0.1.0
-* Initial release
+* Initial release

data/Gemfile

@@ -10,8 +10,11 @@ group :development do
   gem "rspec"
   gem "cucumber"
   gem "jeweler"
-  gem "murdoc"
+  gem "murdoc", "~> 0.1.11"
   gem "ruby-debug19", :platforms => :ruby_19
   gem "ruby-debug",   :platforms => :ruby_18
   gem 'fssm'
+  gem 'yui-compressor'
+  gem 'sinatra'
+  gem 'rack-test'
 end

data/VERSION

@@ -1 +1 @@
-0.2.7
+0.3.0

data/bin/jsus

@@ -122,18 +122,23 @@ module Jsus
 
       def run!
         parse_command_line!
+        launch!
         if watch?
           watch do |base, match|
             full_path = File.join(base, match)
             unless full_path.include?(cli_options[:output_dir])
               puts "#{match} has changed, relaunching jsus..."
-              launch!
-              puts "... done"
+              begin
+                launch!
+                puts "... done"
+              rescue Exception => e
+                puts "Exception happened: #{e}, #{e.inspect}"
+                puts "\t#{e.backtrace.join("\n\t")}" if Jsus.verbose?
+                puts "Compilation FAILED."
+              end
               puts ""
             end
           end
-        else
-          launch!
         end
       end
 
@@ -143,6 +148,20 @@ module Jsus
         puts ""
         start_directory = Dir.pwd
         watched_dirs = [cli_options[:input_dir], cli_options[:deps_dir]].compact.map {|path| File.expand_path(path)}
+
+        watched_dirs.reject! do |dir|
+          # This is a work around for rb-fsevent quirk
+          # Apparently, when your dependency dir is a child directory for your input dir,
+          # You get problems.
+          result = false
+          pathname_traversal = Pathname.new(dir).descend do |parent|
+            parent = parent.to_s
+            result ||= watched_dirs.include?(parent) && parent != dir
+          end
+          result
+        end
+
+        puts "Watching directories: " + watched_dirs.inspect if Jsus.verbose?
         FSSM.monitor do
           watched_dirs.each do |dir|
             path dir do
@@ -231,14 +250,14 @@ module Jsus
       compressor = YUI::JavaScriptCompressor.new(:munge => true)
       compressed_content = compressor.compress(@package_content)
       if compressed_content != ""
-        compression_ratio = compressed_content.size.to_f / @package_content.size.to_f
-        @package_content = compressed_content
+        @compression_ratio = compressed_content.size.to_f / @package_content.size.to_f
+        compressed_file_name = @package.filename.sub(/.js$/, ".min.js")
+        File.open(File.join(@output_dir, compressed_file_name), "w") {|f| f.write(compressed_content) }
       else
-        compression_ratio = 1.00
-        puts "ERROR: YUI compressor could not parse input. Falling back to uncompressed version"
+        @compression_ratio = 1.00
+        puts "ERROR: YUI compressor could not parse input. "
         puts "Compressor command used: #{compressor.command.join(' ')}"
       end
-      puts "Compression ratio: #{sprintf("%.2f%%", compression_ratio * 100)}" if Jsus.verbose?
       checkpoint(:compress)
     rescue LoadError
       puts 'ERROR: You need "yui-compressor" gem in order to use --compress option'
@@ -302,6 +321,8 @@ module Jsus
         puts "Total compilation time: #{formatted_time_for(:compilation)}"
         puts "Post-processing time:   #{formatted_time_for(:postproc)}" if options[:postproc]
         puts "Compression time:       #{formatted_time_for(:compress)}" if options[:compress]
+        puts ""
+        puts "Compression ratio: #{sprintf("%.2f%%", @compression_ratio * 100)}" if Jsus.verbose? && @compression_ratio
       end
     end
 

data/features/command-line/compression.feature

@@ -0,0 +1,24 @@
+Feature: compression
+  In order to minimize resulting file size, I should be able to use YUI
+  compressor.
+  Scenario: using the --compress option
+    When I run "jsus Compression tmp --compress"
+    Then the following files should exist:
+      | tmp/compression.js |
+      | tmp/compression.min.js |
+    And file "tmp/compression.min.js" should not contain
+      """
+      /*
+      """
+    And file "tmp/compression.min.js" should not contain
+      """
+      */
+      """
+    And file "tmp/compression.min.js" should contain
+      """
+      var Input
+      """
+    And file "tmp/compression.min.js" should contain
+      """
+      var Color
+      """

data/features/command-line/mooforge_compatibility_layer.feature

@@ -0,0 +1,75 @@
+Feature: MooForge compatibility layer
+  In order to be compliant with mooforge packages, we should accept
+  various quirky source files.
+
+  Scenario: Compiling a mooforge package that uses mooforge tag dependency notation
+    When I run "jsus MooforgePlugin/Plugin tmp -d MooforgePlugin/Core"
+    Then the following files should exist:
+      | tmp/plugin.js |
+    And file "tmp/plugin.js" should contain
+      """
+      /*
+      ---
+
+      script: Core.js
+
+      description: Mootools fake core
+
+      license: MIT-style license
+
+      authors:
+      - Valerio Proietti
+
+      provides: [Core]
+
+      ...
+      */
+      """
+    And file "tmp/plugin.js" should contain
+      """
+      /*
+      ---
+
+      script: plugin.js
+
+      description: plugin main file
+
+      license: UNLICENSE
+
+      authors:
+      - Mark Abramov
+
+      provides:
+        - Base
+
+      requires:
+        - /Support
+        - mootools_core/1.3.0: Core
+
+      ...
+      */
+      """
+    And file "tmp/plugin.js" should contain
+      """
+      /*
+      ---
+
+      script: plugin-support.js
+
+      description: plugin support file
+
+      license: UNLICENSE
+
+      authors:
+      - Mark Abramov
+
+      provides:
+        - Support
+
+      requires:
+        - mootools_core/1.3.0: Core
+
+      ...
+      */
+      """
+    And file "tmp/plugin.js" should have "script: plugin-support.js" before "script: plugin.js"

data/features/data/Compression/Source/Library/Color.js

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

data/features/data/Compression/Source/Widget/Input/Input.Color.js

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

data/features/data/Compression/package.yml

@@ -0,0 +1,9 @@
+name: Compression
+filename: compression.js
+web: http://github.com/markiz/jsus
+description: Jsus package with correct order set
+license: Public Domain, http://unlicense.org/UNLICENSE
+authors: Mark Abramov (http://github.com/markiz)
+sources:
+  - "Source/Library/Color.js"
+  - "Source/Widget/Input/Input.Color.js"

data/features/data/MooforgePlugin/Core/Source/Core.js

@@ -0,0 +1,16 @@
+/*
+---
+
+script: Core.js
+
+description: Mootools fake core
+
+license: MIT-style license
+
+authors:
+- Valerio Proietti
+
+provides: [Core]
+
+...
+*/

data/features/data/MooforgePlugin/Core/package.yml

@@ -0,0 +1,8 @@
+name: Mootools Core
+filename: mootools.js
+web: http://mootools.net
+description: Fake mootools package
+license: Public Domain, http://unlicense.org/UNLICENSE
+authors: mootools authors
+sources:
+  - "Source/Core.js"

data/features/data/MooforgePlugin/Plugin/Source/plugin-support.js

@@ -0,0 +1,20 @@
+/*
+---
+
+script: plugin-support.js
+
+description: plugin support file
+
+license: UNLICENSE
+
+authors:
+- Mark Abramov
+
+provides:
+  - Support
+
+requires:
+  - mootools_core/1.3.0: Core
+
+...
+*/

data/features/data/MooforgePlugin/Plugin/Source/plugin.js

@@ -0,0 +1,21 @@
+/*
+---
+
+script: plugin.js
+
+description: plugin main file
+
+license: UNLICENSE
+
+authors:
+- Mark Abramov
+
+provides:
+  - Base
+
+requires:
+  - /Support
+  - mootools_core/1.3.0: Core
+
+...
+*/

data/features/data/MooforgePlugin/Plugin/package.yml

@@ -0,0 +1,9 @@
+name: Plugin Package
+filename: plugin.js
+web: http://github.com/markiz/jsus
+description: Mooforge plugin using various mooforge-specific conventions
+license: 'Public Domain, http://unlicense.org/UNLICENSE'
+authors: Mark Abramov (http://github.com/markiz)
+sources:
+  - "Source/plugin-support.js"
+  - "Source/plugin.js"

data/features/data/compression.min.js

@@ -0,0 +1 @@
+var Color={};var Input={};Input.Color=Color;

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.2.7"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-03-10}
+  s.date = %q{2011-05-17}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "CHANGELOG",
     "Gemfile",
-    "Gemfile.lock",
     "Manifest",
     "README",
     "Rakefile",
@@ -34,9 +34,11 @@ Gem::Specification.new do |s|
     "bin/jsus",
     "cucumber.yml",
     "features/command-line/basic_dependency_resolution.feature",
+    "features/command-line/compression.feature",
     "features/command-line/extensions.feature",
     "features/command-line/external_dependency_resolution.feature",
     "features/command-line/json_package.feature",
+    "features/command-line/mooforge_compatibility_layer.feature",
     "features/command-line/postproc.feature",
     "features/command-line/replacements.feature",
     "features/command-line/structure_json.feature",
@@ -46,6 +48,9 @@ Gem::Specification.new do |s|
     "features/data/BasicWrongOrder/Source/Library/Color.js",
     "features/data/BasicWrongOrder/Source/Widget/Input/Input.Color.js",
     "features/data/BasicWrongOrder/package.yml",
+    "features/data/Compression/Source/Library/Color.js",
+    "features/data/Compression/Source/Widget/Input/Input.Color.js",
+    "features/data/Compression/package.yml",
     "features/data/Extensions/Mootools/Source/Core.js",
     "features/data/Extensions/Mootools/package.yml",
     "features/data/Extensions/Source/Extensions/MootoolsCore.js",
@@ -66,6 +71,11 @@ Gem::Specification.new do |s|
     "features/data/JsonPackage/Source/Library/Color.js",
     "features/data/JsonPackage/Source/Widget/Input/Input.Color.js",
     "features/data/JsonPackage/package.json",
+    "features/data/MooforgePlugin/Core/Source/Core.js",
+    "features/data/MooforgePlugin/Core/package.yml",
+    "features/data/MooforgePlugin/Plugin/Source/plugin-support.js",
+    "features/data/MooforgePlugin/Plugin/Source/plugin.js",
+    "features/data/MooforgePlugin/Plugin/package.yml",
     "features/data/Postprocessing/MootoolsCompat12/Source/Core.js",
     "features/data/Postprocessing/MootoolsCompat12/package.yml",
     "features/data/Postprocessing/MootoolsLtIE8/Source/Core.js",
@@ -76,6 +86,7 @@ Gem::Specification.new do |s|
     "features/data/Replacements/MootoolsFork/package.yml",
     "features/data/Replacements/Source/Library/Color.js",
     "features/data/Replacements/package.yml",
+    "features/data/compression.min.js",
     "features/data/tmp2/package.js",
     "features/data/tmp2/scripts.json",
     "features/data/tmp2/tree.json",
@@ -84,6 +95,7 @@ Gem::Specification.new do |s|
     "jsus.gemspec",
     "lib/jsus.rb",
     "lib/jsus/container.rb",
+    "lib/jsus/middleware.rb",
     "lib/jsus/package.rb",
     "lib/jsus/packager.rb",
     "lib/jsus/pool.rb",
@@ -91,6 +103,8 @@ Gem::Specification.new do |s|
     "lib/jsus/tag.rb",
     "lib/jsus/util.rb",
     "lib/jsus/util/documenter.rb",
+    "lib/jsus/util/file_cache.rb",
+    "lib/jsus/util/inflection.rb",
     "lib/jsus/util/tree.rb",
     "lib/jsus/util/validator.rb",
     "lib/jsus/util/validator/base.rb",
@@ -112,6 +126,15 @@ Gem::Specification.new do |s|
     "spec/data/ChainDependencies/app/javascripts/Mash/package.yml",
     "spec/data/ClassReplacement/Source/Class.js",
     "spec/data/ClassReplacement/package.yml",
+    "spec/data/ComplexDependencies/Mootools/Source/Core.js",
+    "spec/data/ComplexDependencies/Mootools/package.yml",
+    "spec/data/ComplexDependencies/Output/package.js",
+    "spec/data/ComplexDependencies/Output/scripts.json",
+    "spec/data/ComplexDependencies/Output/tree.json",
+    "spec/data/ComplexDependencies/Source/Library/Color.js",
+    "spec/data/ComplexDependencies/Source/Widget/Input.js",
+    "spec/data/ComplexDependencies/Source/Widget/Input/Input.Color.js",
+    "spec/data/ComplexDependencies/package.yml",
     "spec/data/DependenciesWildcards/app/javascripts/Class/Source/Class.js",
     "spec/data/DependenciesWildcards/app/javascripts/Class/package.yml",
     "spec/data/DependenciesWildcards/app/javascripts/Hash/Source/Hash.js",
@@ -161,14 +184,20 @@ Gem::Specification.new do |s|
     "spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml",
     "spec/data/bad_test_source_one.js",
     "spec/data/bad_test_source_two.js",
+    "spec/data/mooforge_quirky_source.js",
     "spec/data/test_source_one.js",
+    "spec/data/unicode_source.js",
+    "spec/data/unicode_source_with_bom.js",
     "spec/jsus/container_spec.rb",
+    "spec/jsus/middleware_spec.rb",
     "spec/jsus/package_spec.rb",
     "spec/jsus/packager_spec.rb",
     "spec/jsus/pool_spec.rb",
     "spec/jsus/source_file_spec.rb",
     "spec/jsus/tag_spec.rb",
     "spec/jsus/util/documenter_spec.rb",
+    "spec/jsus/util/file_cache_spec.rb",
+    "spec/jsus/util/inflection_spec.rb",
     "spec/jsus/util/tree_spec.rb",
     "spec/jsus/util/validator/base_spec.rb",
     "spec/jsus/util/validator/mooforge_spec.rb",
@@ -178,25 +207,10 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/markiz/jsus}
   s.licenses = ["Public Domain"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Javascript packager and dependency resolver}
-  s.test_files = [
-    "spec/jsus/container_spec.rb",
-    "spec/jsus/package_spec.rb",
-    "spec/jsus/packager_spec.rb",
-    "spec/jsus/pool_spec.rb",
-    "spec/jsus/source_file_spec.rb",
-    "spec/jsus/tag_spec.rb",
-    "spec/jsus/util/documenter_spec.rb",
-    "spec/jsus/util/tree_spec.rb",
-    "spec/jsus/util/validator/base_spec.rb",
-    "spec/jsus/util/validator/mooforge_spec.rb",
-    "spec/shared/class_stubs.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -207,10 +221,13 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<murdoc>, [">= 0"])
+      s.add_development_dependency(%q<murdoc>, ["~> 0.1.11"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug>, [">= 0"])
       s.add_development_dependency(%q<fssm>, [">= 0"])
+      s.add_development_dependency(%q<yui-compressor>, [">= 0"])
+      s.add_development_dependency(%q<sinatra>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<json_pure>, [">= 0"])
@@ -219,10 +236,13 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<murdoc>, [">= 0"])
+      s.add_dependency(%q<murdoc>, ["~> 0.1.11"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<fssm>, [">= 0"])
+      s.add_dependency(%q<yui-compressor>, [">= 0"])
+      s.add_dependency(%q<sinatra>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
@@ -232,10 +252,13 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<murdoc>, [">= 0"])
+    s.add_dependency(%q<murdoc>, ["~> 0.1.11"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<fssm>, [">= 0"])
+    s.add_dependency(%q<yui-compressor>, [">= 0"])
+    s.add_dependency(%q<sinatra>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end