fusion 0.0.9 → 0.0.10

data/bin/fusion

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require 'optparse'
+require 'yaml'
+require_relative '../lib/fusion'
+
+bundlers = {
+  "quick" => Fusion::Quick,
+  "optimized" => Fusion::Optimized,
+  "advanced_optimized" => Fusion::AdvancedOptimized,
+  "pretty" => Fusion::Pretty
+}
+
+options = {
+  :mode => "quick" 
+}
+
+def usage
+  puts "Usage: fusion -m <mode> <bundle_file>"
+  puts "Modes: #{modes.join('|')} -- default: #{options[:mode]}"  
+  exit(1)
+end
+
+options_parser = OptionParser.new do |x|
+  x.on("-m", "--mode=MODE", "Specify compilation mode") do |value|
+    options[:mode] = value
+  end
+end
+
+options_parser.parse!
+
+puts "Options: #{options}"
+
+usage unless ARGV[0]
+
+bundle = File.absolute_path(ARGV[0])
+path = File.split(bundle)[0..-2].join("/")
+
+bundle_options = YAML.load( File.read(bundle) )
+
+puts "bundle options: #{bundle_options}"
+puts "project path: #{path}"
+
+bundle_options.each do |this_bundle|
+  bundler = bundlers[options[:mode]].new(this_bundle, path)
+  bundler.run
+end

data/lib/fusion.rb.orig

@@ -0,0 +1,159 @@
+require 'yaml'
+require 'open4'
+require 'uri'
+require 'cgi'
+require 'rubygems' #I'm getting an error loading mechanize ... do I need to load this?
+require 'mechanize'
+require 'logger'
+require 'cgi'
+
+module Fusion
+
+  def configure(options)
+    @options ||= {}
+    @options.update(options)
+
+    raise Exception("Configuration error -- must specify #{:bundle_file_path} when configuring Fusion javascript bundler") if @options[:bundle_file_path].nil?
+
+    @options[:project_path] = File.join(@options[:bundle_file_path].split("/")[0..-2])
+  end
+
+  # So that the bundler can be configured and run in two different places ... like Sass
+  module_function :configure
+
+  class Basic
+
+    def initialize
+      @bundle_options = Fusion.instance_variable_get('@options') 
+      @log = @bundle_options[:logger] || Logger.new(STDOUT)
+
+      @bundle_configs = YAML::load(File.open(@bundle_options[:bundle_file_path]))
+    end
+
+    def run
+      start = Time.now
+
+      @bundle_configs.each do |config|
+        bundle(config)
+      end
+
+      @log.debug "Javascript Reloaded #{@bundle_configs.size} bundle(s) (#{Time.now - start}s)"
+    end
+
+    def gather_files(config)
+      input_files = []
+
+      if(config[:input_files])
+        config[:input_files].each do |input_file|
+          if (input_file =~ URI::regexp).nil?
+            # Not a URL
+            input_files << File.join(@bundle_options[:project_path], input_file)
+          else
+            # This is a remote file, if we don't have it, get it
+            input_files << get_remote_file(input_file)
+          end          
+        end
+      end
+
+      if (config[:input_directory])
+        directory = File.join(@bundle_options[:project_path],config[:input_directory])
+
+        unless File.exists?(directory)
+          @log.debug "Path #{directory} does not exist"
+          FileUtils.mkpath(directory)
+          @log.debug "Created path: #{directory}"
+        end
+
+        file_names = Dir.open(directory).entries.sort.find_all {|filename| filename.end_with?(".js") }
+
+        input_files += file_names.collect do |file_name|
+          File.join(directory, file_name)
+        end
+      end
+
+      input_files.uniq
+    end
+
+    def get_output_file(config)
+      raise Exception.new("Undefined js bundler output file") if config[:output_file].nil?
+      File.join(@bundle_options[:project_path], config[:output_file])
+    end
+
+    def get_remote_file(url)
+<<<<<<< HEAD
+      filename = CGI.escape(url.split("/").last)
+=======
+      filename = CGI.escape(url)
+>>>>>>> 5fbc75b23e4a721aa6c7d051b72965a57b79ecde
+      local_directory = File.join(@bundle_options[:project_path], ".remote")
+      local_file_path = File.join(local_directory, filename)
+      
+      return local_file_path if File.exists?(local_file_path)
+      
+      @log.debug "Fetching remote file (#{url})"
+
+      m = Mechanize.new
+      response = m.get(url)
+
+      raise Exception.new("Error downloading file (#{url}) -- returned code #{repsonse.code}") unless response.code == "200"
+      
+      @log.debug "Got file (#{url})"
+
+      unless Dir.exists?(local_directory)
+        Dir.mkdir(local_directory)
+      end
+                  
+      File.open(local_file_path,"w") {|f| f << response.body}
+      
+      local_file_path
+    end
+    
+
+  end
+
+  class Quick < Basic
+
+    def bundle(config)
+      js = []
+
+      input_files = gather_files(config)      
+
+      input_files.each do |input_file|
+        js << File.open(input_file, "r").read
+      end
+      
+      js = js.join("\n")
+      
+      File.open(get_output_file(config), "w") { |f| f << js }
+    end
+
+  end
+
+  class Optimized < Basic
+    
+    def bundle(config)
+      options = []
+
+      options << ["js_output_file", get_output_file(config)]
+      options << ["compilation_level", "SIMPLE_OPTIMIZATIONS"]
+      options << ["language_in","ECMASCRIPT5"] # This will be compatible w all newer browsers, and helps us avoid old IE quirks
+
+      gather_files(config).each do |input_file|
+        options << ["js", input_file]
+      end
+
+      options.collect! do |option|
+        "--#{option[0]} #{option[1]}"
+      end
+
+      jar_file = File.join(__FILE__.split("/")[0..-3].join("/"), "/compiler/compiler.jar")
+      cmd = "java -jar #{jar_file} #{options.join(" ")}"
+      io = IO.popen(cmd, "w")
+      io.close
+
+      raise Exception.new("Error creating bundle: #{get_output_file(config)}") unless $?.exitstatus == 0
+    end
+    
+  end
+
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fusion
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 9
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Sean Jezewski
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 Z
+date: 2012-01-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: open4
@@ -25,9 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -39,17 +31,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
 description: Fusion bundles and re-bundles your javascript in two modes - quick (dumb concatenation) and optimized (google closure compiler's SIMPLE_OPTIMIZATIONS level
 email: 
 - sean@moovweb.com
-executables: []
-
+executables: 
+- fusion
 extensions: []
 
 extra_rdoc_files: []
@@ -58,12 +47,14 @@ files:
 - README.md
 - lib/basic.rb
 - lib/fusion.rb
+- lib/fusion.rb.orig
 - lib/optimized.rb
 - lib/pretty.rb
 - lib/quick.rb
 - compiler/compiler.jar
 - compiler/COPYING
 - compiler/README
+- bin/fusion
 homepage: http://github.com/moovweb/fusion
 licenses: []
 
@@ -77,18 +68,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   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: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []