jsus 0.3.6 → 0.4.0

data/.travis.yml

@@ -2,5 +2,7 @@ script: "bundle exec rake"
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
   - jruby
+  - rbx-2.0

data/CHANGELOG

@@ -1,4 +1,9 @@
 = Jsus Changelog
+== Version 0.4.0
+Other changes:
+* Redesigned class interaction API, trying to avoid cyclic dependencies at all
+  costs.
+
 == Version 0.3.6
 * Rebuilt with 1.8.7 ruby
 

data/Gemfile

@@ -15,12 +15,15 @@ group :development do
 
   gem "jeweler"
   gem "murdoc", "~> 0.1.11"
-  gem "ruby-debug19", :platforms => :ruby_19
 
-  # FIXME: linecache being ruby1.9+only
-  gem "linecache", "= 0.45", :platforms => :ruby_18
+  unless ENV["CI"]
+    gem "ruby-debug19", :platforms => :ruby_19
+
+    # FIXME: linecache being ruby1.9+only
+    gem "linecache", "= 0.45", :platforms => :mri_18
+    gem "ruby-debug",   :platforms => :mri_18
+  end
 
-  gem "ruby-debug",   :platforms => :ruby_18
   gem 'fssm'
 
   gem 'yuicompressor',    :require => false

data/VERSION

@@ -1 +1 @@
-0.3.6
+0.4.0

data/bin/jsus

@@ -68,7 +68,7 @@ cli = OptionParser.new do |opts|
     options[:validators] = (validators || []).map {|v| v.downcase }
   end
 
-  opts.on('--postproc [*PROCESSORS]', Array, 'performs postprocessing. Available postprocs:\n* moocompat12 -- removes mootools 1.2compat tags and their contents\n* mooltIE8 -- removes mootools ltIE8 compat tags and their contents') do |postprocs|
+  opts.on('--postproc [*PROCESSORS]', Array, 'performs postprocessing. Available postprocs:\n* moocompat12 -- removes mootools 1.2compat tags and their contents\n* mooltIE8 -- removes mootools ltIE8 compat tags and their contents\n* semicolon -- adds a semicolon in the beggining of every source file') do |postprocs|
     options[:postproc] = postprocs
   end
 
@@ -97,10 +97,6 @@ cli = OptionParser.new do |opts|
     options[:without_scripts_info] = true
   end
 
-  opts.on_tail('--without-tree-info', 'do not generate tree.json') do
-    options[:without_tree_info] = true
-  end
-
   opts.on_tail('--watch', 'watch file system events for *.js files in subdirectories and rerun jsus with the same parameters') do
     options[:watch] = true
   end

data/cucumber.yml

@@ -1 +1 @@
-default: --format pretty --color
+default: "--format pretty --color --tags ~@wip"

data/features/command-line/external_dependency_resolution.feature

@@ -1,7 +1,7 @@
 Feature: external dependencies
   In order to resolve dependencies, jsus should be able to preload them into
   pool.
-  
+
   Scenario: basic external dependency
     When I run "jsus ExternalDependency tmp -d ExternalDependency/Mootools"
     Then the following files should exist:
@@ -48,7 +48,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 ExternalDependencyWithExternalDependency tmp -d ExternalDependencyWithExternalDependency"
     Then the following files should exist:
@@ -67,7 +67,7 @@ Feature: external dependencies
       authors:
         - Mark Abramov
 
-      requires: 
+      requires:
         - Mootools/Core
 
       provides: [Core]
@@ -117,4 +117,4 @@ Feature: external dependencies
       */
       """
     And file "tmp/package.js" should have "Mootools fake core" before "Leonardo fake core"
-    And file "tmp/package.js" should have "Leonardo fake core" before "script: Color.js"
+    And file "tmp/package.js" should have "Leonardo fake core" before "script: Color.js"

data/features/command-line/generate_includes.feature

@@ -0,0 +1,34 @@
+Feature: generate includes.js
+  In order to be able to quickly iterate over js files, I need to be able to generate
+  includes.js files with load instructions for browser in correct order.
+
+  Scenario: using -g option
+    When I run "jsus Basic tmp -g"
+    Then the following files should exist:
+      | tmp/includes.js    |
+    And file "tmp/includes.js" should contain
+    """
+    Library/Color.js
+    """
+    And file "tmp/includes.js" should contain
+    """
+    Widget/Input/Input.Color.js
+    """
+
+  Scenario: using --generate-include option to override includes root
+    When I run "jsus Basic tmp --generate-includes=Basic/Source/Library"
+    Then the following files should exist:
+      | tmp/includes.js    |
+    And file "tmp/includes.js" should contain
+    """
+    Color.js
+    """
+    And file "tmp/includes.js" should not contain
+    """
+    Library/Color.js
+    """
+    And file "tmp/includes.js" should contain
+    """
+    ../Widget/Input/Input.Color.js
+    """
+    And file "tmp/includes.js" should have "Color.js" before "Input.Color.js"

data/features/command-line/mooforge_compatibility_layer.feature

@@ -72,4 +72,4 @@ Feature: MooForge compatibility layer
       ...
       */
       """
-    And file "tmp/plugin.js" should have "script: plugin-support.js" before "script: plugin.js"
+    And file "tmp/plugin.js" should have "script: plugin-support.js" before "script: plugin.js"

data/features/command-line/postproc.feature

@@ -1,7 +1,7 @@
 Feature: postprocessing
-  In order to leave unneccessary compatibility code out, I should be able to 
+  In order to leave unneccessary compatibility code out, I should be able to
   use postprocessing feature.
-  
+
   Scenario: compat12
     When I run "jsus Postprocessing/MootoolsCompat12 tmp --postproc moocompat12"
     Then the following files should exist:
@@ -37,7 +37,7 @@ Feature: postprocessing
       """
       var incompatible = true;
       """
-  
+
   Scenario: mooltIE8
     When I run "jsus Postprocessing/MootoolsLtIE8 tmp --postproc mooltIE8"
     Then the following files should exist:
@@ -73,3 +73,12 @@ Feature: postprocessing
       """
       var incompatible = true;
       """
+
+  Scenario: semicolon
+    When I run "jsus Postprocessing/MootoolsLtIE8 tmp --postproc semicolon"
+    Then the following files should exist:
+      | tmp/package.js |
+    And file "tmp/package.js" should begin with
+      """
+      ;
+      """

data/features/command-line/structure_json.feature

@@ -1,42 +1,9 @@
 Feature: structure json files
   In order to have programmatic ability to introspect resulting packages, we
   generate some extra files.
-  
-  Scenario: auto-generation of tree.json and scripts.json
-    When I run "jsus Basic tmp"
-    Then the following files should exist:
-      | tmp/tree.json    |
-      | tmp/scripts.json |
-    And file "tmp/tree.json" should contain valid JSON
-    And file "tmp/tree.json" should contain JSON equivalent to
-      """
-      {
-        "Library": {
-          "Color": {
-            "desc": "A library to work with colors",
-            "requires": [
 
-            ],
-            "provides": [
-              "Color"
-            ]
-          }
-        },
-        "Widget": {
-          "Input": {
-            "Input.Color": {
-              "desc": "Cool colorpicker for everyone to enjoy",
-              "requires": [
-                "Color"
-              ],
-              "provides": [
-                "Input.Color"
-              ]
-            }
-          }
-        }
-      }
-      """
+  Scenario: auto-generation scripts.json
+    When I run "jsus Basic tmp"
     And file "tmp/scripts.json" should contain valid JSON
     And file "tmp/scripts.json" should contain JSON equivalent to
       """
@@ -44,13 +11,11 @@ Feature: structure json files
         "Package": {
           "desc": "Jsus package with correct order set",
           "provides": [
-            "Color",
-            "Input.Color"
+            "Package/Color",
+            "Package/Input.Color"
           ],
           "requires": [
-
           ]
         }
-      }      
+      }
       """
-    

data/features/data/ExternalDependencyWithExternalDependency/Leonardo/Source/Core.js

@@ -10,10 +10,10 @@ license: Public Domain, http://unlicense.org/UNLICENSE
 authors:
   - Mark Abramov
 
-requires: 
+requires:
   - Mootools/Core
 
 provides: [Core]
 
 ...
-*/
+*/

data/features/step_definitions/cli_steps.rb

@@ -1,7 +1,7 @@
 When /^I run "jsus (.*?)"$/ do |args|
   Dir.chdir DATA_DIR do
     `#{JSUS_CLI_PATH} #{args}`
-  end  
+  end
 end
 
 Then /^the following files should exist:$/ do |table|
@@ -14,16 +14,22 @@ Then /^the following files should exist:$/ do |table|
 end
 
 Then /^file "(.*?)" should contain$/ do |filename, content|
-  Dir.chdir DATA_DIR do    
+  Dir.chdir DATA_DIR do
     File.read(filename).should include(content)
-  end    
+  end
+end
+
+Then /^file "(.*?)" should begin with$/ do |filename, content|
+  Dir.chdir DATA_DIR do
+    File.read(filename).index(content).should == 0
+  end
 end
 
 
 Then /^file "(.*?)" should not contain$/ do |filename, content|
-  Dir.chdir DATA_DIR do    
+  Dir.chdir DATA_DIR do
     File.read(filename).should_not include(content)
-  end    
+  end
 end
 
 Then /^file "(.*?)" should contain valid JSON$/i do |filename|
@@ -31,7 +37,7 @@ Then /^file "(.*?)" should contain valid JSON$/i do |filename|
     json = nil
     lambda { json = JSON.load(File.read(filename)) }.should_not raise_error
     json.should_not be_nil
-  end    
+  end
 end
 
 Then /^file "(.*?)" should contain JSON equivalent to$/i do |filename, expected_json|
@@ -39,7 +45,7 @@ Then /^file "(.*?)" should contain JSON equivalent to$/i do |filename, expected_
     json = JSON.load(File.read(filename))
     expected = JSON.load(expected_json)
     json.should == expected
-  end    
+  end
 end
 
 
@@ -49,7 +55,7 @@ Then /^file "(.*?)" should have "(.*?)" (before|after) "(.*?)"$/ do |filename, w
     contents = File.read(filename)
     position << contents.index(what)
     position << contents.index(other)
-    
+
     case position
     when "before"
       position[0].should < position[1]
@@ -57,4 +63,4 @@ Then /^file "(.*?)" should have "(.*?)" (before|after) "(.*?)"$/ do |filename, w
       position[1].should < position[0]
     end
   end
-end
+end

data/features/support/env.rb

@@ -6,4 +6,4 @@ require 'rspec/expectations'
 require 'fileutils'
 After do
   FileUtils.rm_rf(TMP_DIR)
-end
+end

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.3.6"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-09-18}
+  s.date = %q{2011-11-01}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "features/command-line/compression.feature",
     "features/command-line/extensions.feature",
     "features/command-line/external_dependency_resolution.feature",
+    "features/command-line/generate_includes.feature",
     "features/command-line/json_package.feature",
     "features/command-line/mooforge_compatibility_layer.feature",
     "features/command-line/postproc.feature",
@@ -88,16 +89,12 @@ Gem::Specification.new do |s|
     "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",
     "features/step_definitions/cli_steps.rb",
     "features/support/env.rb",
     "jsus.gemspec",
     "lib/extensions/rgl.rb",
     "lib/jsus.rb",
     "lib/jsus/cli.rb",
-    "lib/jsus/compiler.rb",
     "lib/jsus/container.rb",
     "lib/jsus/middleware.rb",
     "lib/jsus/package.rb",
@@ -112,6 +109,13 @@ Gem::Specification.new do |s|
     "lib/jsus/util/file_cache.rb",
     "lib/jsus/util/inflection.rb",
     "lib/jsus/util/logger.rb",
+    "lib/jsus/util/mixins.rb",
+    "lib/jsus/util/mixins/operates_on_sources.rb",
+    "lib/jsus/util/post_processor.rb",
+    "lib/jsus/util/post_processor/base.rb",
+    "lib/jsus/util/post_processor/moocompat12.rb",
+    "lib/jsus/util/post_processor/mooltie8.rb",
+    "lib/jsus/util/post_processor/semicolon.rb",
     "lib/jsus/util/tree.rb",
     "lib/jsus/util/validator.rb",
     "lib/jsus/util/validator/base.rb",
@@ -151,8 +155,11 @@ Gem::Specification.new do |s|
     "spec/data/DependenciesWildcards/app/javascripts/Mash/Source/Mash.js",
     "spec/data/DependenciesWildcards/app/javascripts/Mash/package.yml",
     "spec/data/Extensions/app/javascripts/Core/Source/Class.js",
+    "spec/data/Extensions/app/javascripts/Core/Source/Hash.js",
+    "spec/data/Extensions/app/javascripts/Core/Source/Mash.js",
     "spec/data/Extensions/app/javascripts/Core/package.yml",
     "spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js",
+    "spec/data/Extensions/app/javascripts/Orwik/Extensions/Mash.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",
@@ -193,9 +200,16 @@ Gem::Specification.new do |s|
     "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/SimpleSources/dependent_source_one.js",
+    "spec/data/SimpleSources/replacement_source_one.js",
+    "spec/data/SimpleSources/simple_source_one.js",
+    "spec/data/SimpleSources/simple_source_two.js",
     "spec/data/bad_test_source_one.js",
     "spec/data/bad_test_source_two.js",
+    "spec/data/extension_1.js",
+    "spec/data/extension_2.js",
     "spec/data/mooforge_quirky_source.js",
+    "spec/data/replacement.js",
     "spec/data/test_source_one.js",
     "spec/data/unicode_source.js",
     "spec/data/unicode_source_with_bom.js",
@@ -212,12 +226,16 @@ Gem::Specification.new do |s|
     "spec/jsus/util/file_cache_spec.rb",
     "spec/jsus/util/inflection_spec.rb",
     "spec/jsus/util/logger_spec.rb",
+    "spec/jsus/util/post_processor/moocompat12_spec.rb",
+    "spec/jsus/util/post_processor/mooltie8_spec.rb",
+    "spec/jsus/util/post_processor/semicolon_spec.rb",
+    "spec/jsus/util/post_processors/base_spec.rb",
     "spec/jsus/util/tree_spec.rb",
     "spec/jsus/util/validator/base_spec.rb",
     "spec/jsus/util/validator/mooforge_spec.rb",
     "spec/jsus/util/watcher_spec.rb",
     "spec/jsus/util_spec.rb",
-    "spec/shared/class_stubs.rb",
+    "spec/shared/mixins_segs.rb",
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jsus/jsus}

data/lib/extensions/rgl.rb

@@ -1,3 +1,4 @@
+# Extensions for Ruby Graph Library
 module RGL
   class TopsortedGraphHasCycles < Exception; end
   class DirectedAdjacencyGraph
@@ -5,7 +6,7 @@ module RGL
     # cycles.
     #
     # @note Default implementation of topsort iterator is a bit faster, but it doesn't
-    # check for that condition.
+    #       check for cycles.
     # @return [Array] sorted vertices list
     # @raise [TopsortedGraphHasCycles] if graph has cycles
     # @api public

data/lib/jsus/cli.rb

@@ -10,8 +10,9 @@ module Jsus
 
         if options[:watch]
           input_dirs = [ options[:input_dir], options[:deps_dir] ].compact
+          output_dir = options[:output_dir]
           Jsus.logger.info "Jsus enters watch mode, it will watch your files for changes and relaunch itself"
-          Jsus::Util::Watcher.watch(input_dirs) do |filename|
+          Jsus::Util::Watcher.watch(input_dirs, output_dir) do |filename|
             Jsus.logger.info "#{filename} changed, recompiling..."
             new.launch
             Jsus.logger.info "... done"
@@ -27,29 +28,31 @@ module Jsus
     end
 
     def setup_output_directory
-      output_dir = Pathname.new(options[:output_dir])
-      output_dir.mkpath
+      output_dir = File.expand_path(options[:output_dir])
+      FileUtils.mkdir_p(output_dir)
       output_dir
     end
 
     def launch
       checkpoint(:start)
       @output_dir = setup_output_directory
-      @pool = preload_pool
-      @package = load_package
+      @pool       = preload_pool
+      @package    = load_package
+      @pool       << @package
       display_pool_stats(@pool) if options[:display_pool_stats]
-      @package_content = compile_package(@package)
-      post_process!(@package_content, options[:postproc]) if options[:postproc]
 
-      package_filename = @output_dir + @package.filename
+      @resulting_sources = @resulting_sources_container = @pool.compile_package(@package)
+      @resulting_sources = post_process(@resulting_sources, options[:postproc]) if options[:postproc]
+      @package_content = compile_package(@resulting_sources)
+      package_filename = File.join(@output_dir, @package.filename)
 
       if options[:compress]
-        File.open(package_filename.to_s.chomp(".js") + ".min.js", 'w') do |f|
+        File.open(package_filename.chomp(".js") + ".min.js", 'w') do |f|
           f.write compress_package(@package_content)
         end
       end
 
-      package_filename.open('w') {|f| f << @package_content  }
+      File.open(package_filename, 'w') {|f| f << @package_content  }
 
       generate_supplemental_files
       validate_sources
@@ -57,21 +60,21 @@ module Jsus
       generate_docs if options[:documented_classes] && !options[:documented_classes].empty?
       output_benchmarks
     rescue Exception => e
-      output_benchmarks
+      $stderr.puts "Exception was raised: #{e.inspect}\n\nBacktrace: #{e.backtrace.join("\n")}"
     end
 
     def preload_pool
-      if options[:deps_dir]
+      result = if options[:deps_dir]
         Jsus::Pool.new(options[:deps_dir])
       else
         Jsus::Pool.new
-      end.tap { checkpoint(:pool) }
+      end
+      checkpoint(:pool)
+      result
     end
 
     def load_package
-      package = Jsus::Package.new(Pathname.new(options[:input_dir]), :pool => @pool)
-      package.include_dependencies!
-      checkpoint(:dependencies)
+      package = Jsus::Package.new(Pathname.new(options[:input_dir]))
       package
     end
 
@@ -92,21 +95,24 @@ EOF
     def display_package(package)
       result = "Package: #{package.name}\n"
       package.source_files.to_a.sort_by {|sf| sf.filename}.each do |sf|
-        result << "    [#{sf.relative_filename}]\n"
-        result << "        Provides: [#{sf.provides_names.join(", ")}]\n"
-        result << "        Requires: [#{sf.requires_names.join(", ")}]\n"
+        result << "    [#{sf.filename}]\n"
+        result << "        Provides: [#{sf.provides.map {|tag| tag.full_name }.join(", ")}]\n"
+        result << "        Requires: [#{sf.requires.map {|tag| tag.full_name }.join(", ")}]\n"
       end
       result << "\n"
     end
 
-    def compile_package(package)
-      package.compile(nil).tap { checkpoint(:compilation) }
+    def compile_package(sources)
+      result = Packager.new(sources).pack(nil)
+      checkpoint(:compilation)
+      result
     end
 
     # Modificate content string
-    def post_process!(content, postproc)
-      Compiler.post_process!(content, postproc)
+    def post_process(source_files, processors)
+      result = Util::PostProcessor.process(source_files, processors)
       checkpoint(:postproc)
+      result
     end
 
     def compress_package(content)
@@ -125,14 +131,24 @@ EOF
     end
 
     def generate_supplemental_files
-      @package.generate_scripts_info(@output_dir) unless options[:without_scripts_info]
-      @package.generate_tree(@output_dir) unless options[:without_tree_info]
+      unless options[:without_scripts_info]
+        File.open(options[:output_dir] + "/scripts.json", "w+") do |f|
+          scripts_hash = {
+            @package.name => {
+              :desc     => @package.description,
+              :provides => @resulting_sources_container.provides.map {|tag| tag.to_s},
+              :requires => @resulting_sources_container.requires.map {|tag| tag.to_s}
+            }
+          }
+          f.puts JSON.pretty_generate(scripts_hash)
+        end
+      end
       checkpoint(:supplemental_files)
     end
 
     def generate_includes
-      includes_root = Pathname.new(options[:includes_root] || @output_dir)
-      Compiler.generate_includes(@package, includes_root, @output_dir + "includes.js")
+      includes_root = Pathname.new(options[:includes_root] || @output_dir).to_s
+      File.open(File.join(@output_dir, "includes.js"), "w+") {|f| f.puts Util::CodeGenerator.generate_includes(@resulting_sources.required_files(includes_root)) }
       checkpoint(:includes)
     end