jsus 0.3.4 → 0.3.5

data/features/command-line/compression.feature

@@ -21,4 +21,27 @@ Feature: compression
     And file "tmp/compression.min.js" should contain
       """
       var Color
-      """
+      """
+
+  # It's more a sanity check than a real test.
+  Scenario: using the --compression-method option
+    When I run "jsus Compression tmp --compress --compression-method uglifier"
+    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
+      """
+      Input
+      """
+    And file "tmp/compression.min.js" should contain
+      """
+      Color
+      """

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2011-08-30}
+  s.date = %q{2011-09-15}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -94,7 +94,10 @@ Gem::Specification.new do |s|
     "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",
@@ -113,9 +116,11 @@ Gem::Specification.new do |s|
     "lib/jsus/util/validator.rb",
     "lib/jsus/util/validator/base.rb",
     "lib/jsus/util/validator/mooforge.rb",
+    "lib/jsus/util/watcher.rb",
     "markup/index_template.haml",
     "markup/stylesheet.css",
     "markup/template.haml",
+    "spec/benchmarks/topsort.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",
@@ -194,6 +199,7 @@ Gem::Specification.new do |s|
     "spec/data/test_source_one.js",
     "spec/data/unicode_source.js",
     "spec/data/unicode_source_with_bom.js",
+    "spec/extensions/rgl_spec.rb",
     "spec/jsus/container_spec.rb",
     "spec/jsus/middleware_spec.rb",
     "spec/jsus/package_spec.rb",
@@ -201,6 +207,7 @@ Gem::Specification.new do |s|
     "spec/jsus/pool_spec.rb",
     "spec/jsus/source_file_spec.rb",
     "spec/jsus/tag_spec.rb",
+    "spec/jsus/util/compressor_spec.rb",
     "spec/jsus/util/documenter_spec.rb",
     "spec/jsus/util/file_cache_spec.rb",
     "spec/jsus/util/inflection_spec.rb",
@@ -208,10 +215,12 @@ Gem::Specification.new do |s|
     "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/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/markiz/jsus}
+  s.homepage = %q{http://github.com/jsus/jsus}
   s.licenses = ["Public Domain"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.6.2}
@@ -226,13 +235,17 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rgl>, [">= 0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
+      s.add_development_dependency(%q<cucumber>, ["= 1.0.3"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<murdoc>, ["~> 0.1.11"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_development_dependency(%q<linecache>, ["= 0.45"])
       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<yuicompressor>, [">= 0"])
+      s.add_development_dependency(%q<uglifier>, [">= 0"])
+      s.add_development_dependency(%q<front-compiler>, [">= 0"])
+      s.add_development_dependency(%q<closure-compiler>, [">= 0"])
       s.add_development_dependency(%q<sinatra>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<yard>, [">= 0"])
@@ -242,13 +255,17 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rgl>, [">= 0"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
+      s.add_dependency(%q<cucumber>, ["= 1.0.3"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<murdoc>, ["~> 0.1.11"])
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
+      s.add_dependency(%q<linecache>, ["= 0.45"])
       s.add_dependency(%q<ruby-debug>, [">= 0"])
       s.add_dependency(%q<fssm>, [">= 0"])
-      s.add_dependency(%q<yui-compressor>, [">= 0"])
+      s.add_dependency(%q<yuicompressor>, [">= 0"])
+      s.add_dependency(%q<uglifier>, [">= 0"])
+      s.add_dependency(%q<front-compiler>, [">= 0"])
+      s.add_dependency(%q<closure-compiler>, [">= 0"])
       s.add_dependency(%q<sinatra>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<yard>, [">= 0"])
@@ -259,13 +276,17 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rgl>, [">= 0"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
+    s.add_dependency(%q<cucumber>, ["= 1.0.3"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<murdoc>, ["~> 0.1.11"])
     s.add_dependency(%q<ruby-debug19>, [">= 0"])
+    s.add_dependency(%q<linecache>, ["= 0.45"])
     s.add_dependency(%q<ruby-debug>, [">= 0"])
     s.add_dependency(%q<fssm>, [">= 0"])
-    s.add_dependency(%q<yui-compressor>, [">= 0"])
+    s.add_dependency(%q<yuicompressor>, [">= 0"])
+    s.add_dependency(%q<uglifier>, [">= 0"])
+    s.add_dependency(%q<front-compiler>, [">= 0"])
+    s.add_dependency(%q<closure-compiler>, [">= 0"])
     s.add_dependency(%q<sinatra>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<yard>, [">= 0"])

data/lib/extensions/rgl.rb

@@ -0,0 +1,37 @@
+module RGL
+  class TopsortedGraphHasCycles < Exception; end
+  class DirectedAdjacencyGraph
+    # Returns array of topologically sorted vertices. Also checks if there are
+    # cycles.
+    #
+    # @note Default implementation of topsort iterator is a bit faster, but it doesn't
+    # check for that condition.
+    # @return [Array] sorted vertices list
+    # @raise [TopsortedGraphHasCycles] if graph has cycles
+    # @api public
+    def topsorted_vertices
+      result = []
+      available_vertices = []
+      reversed_graph = reverse
+      out_degrees = {}
+
+      vertices.each do |v|
+        out_degrees[v] = reversed_graph.out_degree(v)
+        available_vertices.push(v) if out_degrees[v] == 0
+      end
+
+      while available_vertices.size > 0
+        vertice = available_vertices.pop
+        result.push(vertice)
+        each_adjacent(vertice) do |dependent|
+          reversed_graph.remove_edge(dependent, vertice)
+          out_degrees[dependent] -= 1
+          available_vertices.push(dependent) if out_degrees[dependent] == 0
+        end
+      end
+
+      raise TopsortedGraphHasCycles unless result.size == vertices.size
+      result
+    end # topsorted_vertices
+  end # class DirectedAdjacencyGraph
+end # module RGL

data/lib/jsus.rb

@@ -6,9 +6,9 @@ require 'active_support/ordered_hash'
 require 'active_support/core_ext/module/delegation'
 require 'rgl/adjacency'
 require 'rgl/topsort'
+require 'extensions/rgl'
 
 require 'fileutils'
-require 'pathname'
 
 #
 # Jsus -- your better javascript packager.
@@ -22,7 +22,8 @@ module Jsus
   autoload :Pool,       'jsus/pool'
   autoload :Util,       'jsus/util'
   autoload :Middleware, 'jsus/middleware'
-  autoload :Compressor, 'jsus/compressor'
+  autoload :CLI,        'jsus/cli'
+  autoload :Compiler,   'jsus/compiler'
 
   # In verbose mode jsus shows a lot of warnings like missing dependencies.
   # Default: false
@@ -71,7 +72,7 @@ module Jsus
   #
   # @return [Jsus::Util::Logger]
   def self.logger
-    Thread.current[:jsus_logger] ||= Jsus::Util::Logger.new(STDOUT).tap do |logger|
+    @@logger ||= Jsus::Util::Logger.new($stdout).tap do |logger|
       logger.level = Logger::ERROR
       logger.formatter = lambda {|severity, time, progname, msg|
         "[#{time.strftime("%Y-%m-%d %H:%M:%S")}] [JSUS:#{severity}] #{msg}\n"
@@ -86,6 +87,6 @@ module Jsus
   # @note In case you use non-jsus logger, you might want to extend it with
   #       Jsus::Util::Logger::Buffering module.
   def self.logger=(value)
-    Thread.current[:jsus_logger] = value
+    @@logger = value
   end # self.logger=
 end

data/lib/jsus/cli.rb

@@ -0,0 +1,206 @@
+# TODO: document Cli class
+module Jsus
+  class CLI
+    class << self
+      attr_accessor :cli_options
+
+      def run!(options)
+        self.cli_options = options
+        new.launch
+
+        if options[:watch]
+          input_dirs = [ options[:input_dir], options[:deps_dir] ].compact
+          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.logger.info "#{filename} changed, recompiling..."
+            new.launch
+            Jsus.logger.info "... done"
+          end
+        end
+      end
+    end
+
+    attr_accessor :options
+
+    def initialize(options = Jsus::CLI.cli_options)
+      @options = options
+    end
+
+    def setup_output_directory
+      output_dir = Pathname.new(options[:output_dir])
+      output_dir.mkpath
+      output_dir
+    end
+
+    def launch
+      checkpoint(:start)
+      @output_dir = setup_output_directory
+      @pool = preload_pool
+      @package = load_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
+
+      if options[:compress]
+        File.open(package_filename.to_s.chomp(".js") + ".min.js", 'w') do |f|
+          f.write compress_package(@package_content)
+        end
+      end
+
+      package_filename.open('w') {|f| f << @package_content  }
+
+      generate_supplemental_files
+      validate_sources
+      generate_includes if options[:generate_includes]
+      generate_docs if options[:documented_classes] && !options[:documented_classes].empty?
+      output_benchmarks
+    rescue Exception => e
+      output_benchmarks
+    end
+
+    def preload_pool
+      if options[:deps_dir]
+        Jsus::Pool.new(options[:deps_dir])
+      else
+        Jsus::Pool.new
+      end.tap { checkpoint(:pool) }
+    end
+
+    def load_package
+      package = Jsus::Package.new(Pathname.new(options[:input_dir]), :pool => @pool)
+      package.include_dependencies!
+      checkpoint(:dependencies)
+      package
+    end
+
+    def display_pool_stats(pool)
+      checkpoint(:pool_stats)
+      message = <<-EOF
+Pool stats:
+Main package:
+#{display_package @package}
+
+Supplementary packages:
+#{pool.packages.map {|package| display_package package}.join }
+
+EOF
+      Jsus.logger.info message
+    end
+
+    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"
+      end
+      result << "\n"
+    end
+
+    def compile_package(package)
+      package.compile(nil).tap { checkpoint(:compilation) }
+    end
+
+    # Modificate content string
+    def post_process!(content, postproc)
+      Compiler.post_process!(content, postproc)
+      checkpoint(:postproc)
+    end
+
+    def compress_package(content)
+      compression_method = options.fetch(:compression_method, :yui)
+      compressed_content = Jsus::Util::Compressor.compress(content, :method => compression_method)
+      if compressed_content != ""
+        @compression_ratio = compressed_content.size.to_f / content.size.to_f
+      else
+        @compression_ratio = 1.00
+        Jsus.logger.error "YUI compressor could not parse input. \n" <<
+                          "Compressor command used: #{compressor.command.join(' ')}"
+      end
+      checkpoint(:compress)
+
+      compressed_content
+    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]
+      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")
+      checkpoint(:includes)
+    end
+
+    def generate_docs
+      documenter = Jsus::Util::Documenter.new(:highlight_source => !options[:no_syntax_highlight])
+      @package.source_files.each {|source| documenter << source }
+      @pool.sources.each {|source| documenter << source }
+      documenter.only(options[:documented_classes]).generate(@output_dir + "/docs")
+      checkpoint(:documentation)
+    end
+
+    def validate_sources
+      validators_map = {"mooforge" => Jsus::Util::Validator::Mooforge}
+      (options[:validators] || []).each do |validator_name|
+        if validator = validators_map[validator_name]
+          errors = validator.new(@pool.sources.to_a & @package.source_files.to_a).validation_errors
+          unless errors.empty?
+            Jsus.logger.info "Validator #{validator_name} found errors: " <<
+                             errors.map {|e| Jsus.logger.info "  * #{e}"}.join("\n")
+          end
+        else
+          Jsus.logger.info "No such validator: #{validator_name}"
+        end
+      end
+      checkpoint(:validators)
+    end
+
+    def output_benchmarks
+      if options[:benchmark]
+        message = "Benchmarking results:\n"
+        message << "Total execution time:   #{formatted_time_for(:all)}\n"
+        message << "\n"
+        message << "Of them:\n"
+        message << "Pool preloading time:   #{formatted_time_for(:pool)}\n" if checkpoint?(:pool)
+        message << "Docs generation time:   #{formatted_time_for(:documentation)}\n" if checkpoint?(:documentation)
+        message << "Total compilation time: #{formatted_time_for(:compilation)}\n" if checkpoint?(:compilation)
+        message << "Post-processing time:   #{formatted_time_for(:postproc)}\n" if checkpoint?(:postproc)
+        message << "Compression time:       #{formatted_time_for(:compress)}\n" if checkpoint?(:compress)
+        message << "\n"
+        message << "Compression ratio: #{sprintf("%.2f%%", @compression_ratio * 100)}\n" if Jsus.verbose? && @compression_ratio
+        Jsus.logger.info message
+      end
+    end
+
+    def checkpoint(checkpoint_name)
+      @checkpoints ||= {}
+      @time_for    ||= {}
+      @checkpoints[checkpoint_name] = Time.now
+      if @last_checkpoint
+        @time_for[checkpoint_name] = @checkpoints[checkpoint_name] - @last_checkpoint
+      end
+      @last_checkpoint = Time.now
+    end
+
+    def checkpoint?(checkpoint_name)
+      @checkpoints[checkpoint_name]
+    end
+
+    def time_for(checkpoint_name)
+      if checkpoint_name == :all
+        @last_checkpoint - @checkpoints[:start]
+      else
+        @time_for[checkpoint_name]
+      end
+    end
+
+    def formatted_time_for(checkpoint_name)
+      "#{format("%.3f", time_for(checkpoint_name))}s"
+    end
+  end
+end

data/lib/jsus/compiler.rb

@@ -0,0 +1,28 @@
+module Jsus::Compiler
+  # Handles main features of jsus
+  extend self
+
+  def post_process!(content, postproc)
+    postproc.each do |processor|
+      case processor.strip
+      when /^moocompat12$/i
+        content.gsub!(/\/\/<1.2compat>.*?\/\/<\/1.2compat>/m, '')
+        content.gsub!(/\/\*<1.2compat>\*\/.*?\/\*<\/1.2compat>\*\//m, '')
+      when /^mooltie8$/i
+        content.gsub!(/\/\/<ltIE8>.*?\/\/<\/ltIE8>/m, '')
+        content.gsub!(/\/\*<ltIE8>\*\/.*?\/\*<\/ltIE8>\*\//m, '')
+      else
+        Jsus.logger.error "Unknown post-processor: #{processor}"
+      end
+    end
+  end
+
+  def generate_includes(package, includes_root, output_file)
+    File.open(output_file, "w") do |f|
+      c = Jsus::Container.new(*(package.source_files.to_a + package.linked_external_dependencies.to_a))
+      paths = c.required_files(includes_root)
+      f.puts Jsus::Util::CodeGenerator.generate_includes(paths)
+    end
+  end
+
+end