distil 0.10.4 → 0.11.0

data/lib/file-types/javascript-file.rb

@@ -1,24 +0,0 @@
-$jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
-$include_regex= /NIB\.asset\(['"]([^)]+)['"]\)/
-
-class JavascriptFile < SourceFile
-
-  def self.extension
-    ".js"
-  end
-
-  def can_embed_as_content(file)
-    [".css", ".html", ".json"].include?(file.extension)
-  end
-
-  def escape_embeded_content(content)
-    content.gsub("\\", "\\\\").gsub("\n", "\\n").gsub("\"", "\\\"").gsub("'", "\\\\'")
-  end
-
-  def debug_content(options)
-    destination= File.expand_path(options.remove_prefix||"")
-    path= @file_path ? @file_path : self.relative_to_folder(destination)
-    "loadScript(\"#{path}\");\n"
-  end
-
-end

data/lib/file-types/json-file.rb

@@ -1,17 +0,0 @@
-require "#{$script_dir}/file-types/javascript-file.rb"
-
-class JsonFile < JavascriptFile
-
-  def self.extension
-    ".json"
-  end
-
-  def content_type
-    "js"
-  end
-  
-  def minify_content(source)
-    super("(#{source})")[1..-3]
-  end
-  
-end

data/lib/filter.rb

@@ -1,41 +0,0 @@
-# require "#{$script_dir}/configurable"
-
-class Filter
-  
-  @@filters= []
-  def self.inherited(subclass)
-    @@filters << subclass.new
-  end
-
-  def self.abstract
-    false
-  end
-  
-  def self.each
-    @@filters.each { |f|
-      yield f
-    }
-  end
-  
-  def self.defined
-    @@filters
-  end
-  
-  def handles_file(file)
-    false
-  end
-
-  def preprocess_content(file, content)
-    content
-  end
-  
-  def filter_content(file, content, options={})
-    content
-  end
-  
-end
-
-# load all the other file types
-Dir.glob("#{$script_dir}/filters/*-filter.rb") { |file|
-  require file
-}

data/lib/filters/css-filter.rb

@@ -1,58 +0,0 @@
-require "#{$script_dir}/filters/file-reference-filter"
-
-$jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
-
-class CssDependencyFilter < FileReferenceFilter
-  
-  def handles_file(file)
-    return ["css"].include?(file.content_type)
-  end
-  
-  def preprocess_content(file, content)
-    # Replace all ' (single quotes) with " (double quotes) in
-    # order to fix a problem with the background url regexp
-    content.gsub!(/\'/,'"')
-    # Force a newline after a rule terminating ; (semi-colon) 
-    # in order to fix a problem with the background url regexp
-    content.gsub!(/;(\n|\r)*/, ";\n")
-
-    # Rewrites the 'url("...")' rules to a relative path 
-    # based on the location of the new concatenated CSS file.
-    line_num=0
-
-    lines= content.split("\n")
-    
-    lines.each { |line|
-    
-      line_num+=1
-
-      line.gsub!(/@import\s+url\("?(.*\.css)"?\)/) { |match|
-        css_file= File.join(file.parent_folder, $1)
-        
-        if (!File.exists?(css_file))
-          file.error "imported CSS file not found: #{$1}", line_num
-          # leave the @import rule in place
-          match
-        else
-          file.add_dependency(SourceFile.from_path(css_file))
-        end
-      }
-      
-      line.gsub!(/url\("?(.*\.(jpg|png|gif))"?\)/) { |match|
-        image_file= File.join(file.parent_folder, $1)
-
-        if (!File.exists?(image_file))
-          file.warning "resource not found: #{$1} (#{image_file})", line_num
-          "url(\"#{$1}\")"
-        else
-          asset= SourceFile.from_path(image_file)
-          file.add_asset(asset)
-          "url(\"#{file_reference(asset)}\")"
-        end
-      }
-    }
-    
-    lines.join("\n")
-  end
-  
-end

data/lib/filters/file-reference-filter.rb

@@ -1,30 +0,0 @@
-class FileReferenceFilter < Filter
-
-  def file_reference(file)
-    "{{FILEREF(#{file})}}"
-  end
-  
-  def content_reference(file)
-    "{{CONTENTREF(#{file})}}"
-  end
-
-  def filter_content(file, content, options)
-    destination= File.expand_path(options.remove_prefix||"")
-    
-    content.gsub!(/\{\{FILEREF\(([^)]*)\)\}\}/) { |match|
-      include_file= SourceFile.from_path($1)
-      include_file.relative_to_folder(destination)
-    }
-
-    content.gsub!(/\{\{CONTENTREF\(([^)]*)\)\}\}/) { |match|
-      include_file= SourceFile.from_path($1)
-      included_content= include_file.filtered_content(options)
-      included_content= include_file.minify_content(included_content)
-      file.escape_embeded_content(included_content)
-    }
-
-    content
-  end
-
-  
-end

data/lib/filters/jsl-dependency-filter.rb

@@ -1,44 +0,0 @@
-$jsl_import_regex= /\/\*jsl:import\s+([^\*]*)\*\//
-
-class JslDependencyFilter < Filter
-  
-  def handles_file(file)
-    return ["js"].include?(file.content_type)
-  end
-  
-  def preprocess_content(file, content)
-
-    content= content.split("\n")
-    
-    line_num=0
-    
-    content.each { |line|
-      
-      line_num+=1
-      
-      # handle dependencies
-      line.gsub!($jsl_import_regex) { |match|
-
-        import_file= File.expand_path(File.join(file.parent_folder, $1))
-        if (File.exists?(import_file))
-          file.add_dependency SourceFile.from_path(import_file)
-        else
-          dependency= Project.current.find_file($1)
-          if (dependency)
-            file.add_dependency dependency
-          else
-            file.error "Missing import file: #{$1}", line_num
-          end
-        end
-        
-        # replace jsl import with empty string
-        ""
-
-      }
-      
-    }
-    
-    content.join("\n")
-  end
-  
-end

data/lib/project.rb

@@ -1,174 +0,0 @@
-require "#{$script_dir}/target"
-
-require 'yaml'
-
-class Project < Configurable
-  attr_reader :project_file
-  
-  option :tasks, Array
-  option_alias :tasks, :task
-  
-  option :version, String
-  option :project_name, String
-  option_alias :project_name, :name
-  
-  option :targets, Array
-  option_alias :targets, :target
-  
-  option :mode
-  option :ignore_warnings, false
-
-  option :external_projects
-
-  option :distileries, Array
-  option_alias :distileries, :distilleries
-  option_alias :distileries, :distilery
-  option_alias :distileries, :distillery
-  
-  
-  def initialize(project_file, settings)
-    @@current= self
-    @project_file= File.expand_path(project_file)
-    Dir.chdir(File.dirname(@project_file))
-    
-    project_info= YAML.load_file(@project_file)
-    settings.merge!(project_info)    
-    super(settings)
-  end
-
-  @@current=nil
-  def self.current
-    @@current
-  end
-
-  def find_file(file)
-    return nil if external_projects.nil?
-    
-    external_projects.each { |project|
-      path= File.expand_path(File.join(project["include"], file))
-      if (File.exists?(path))
-        source_file= SourceFile.from_path(path)
-        source_file.file_path= file
-        return source_file
-      end
-    }
-    nil
-  end
-
-  def build
-    load_distileries
-    build_external_projects
-    build_targets
-  end
-  
-  def load_distileries
-    return if distileries.nil?
-    
-    distileries.each { |d|
-      if (File.exists?(d))
-        require d
-        next
-      end
-      path= Gem.required_location(d, 'distilery.rb')
-      if (path.nil?)
-        puts "Missing distilery: #{d}"
-      end
-      next if path.nil?
-      require path
-    }
-  end
-  
-  def build_external_projects
-    projects= external_projects
-    if (projects.nil?)
-      @options.external_projects= []
-      return
-    end
-    
-    # Handle external projects
-    if (projects.is_a?(String))
-      projects= projects.split(/\s*,\s*/)
-    end
-    
-    if (projects.is_a?(Array))
-      projects= projects.map { |folder|
-        {
-          "folder"=>folder
-        }
-      }
-    else
-      projects= projects.map { |folder, project|
-        
-        if project.is_a?(String)
-          project= {
-            "url"=>project
-          }
-        end
-      
-        defaults= {
-          "folder"=>folder,
-          "build"=>"distil",
-          "include"=>File.join(folder, "build")
-        }
-
-        defaults.merge(project)
-      }
-    end
-    
-    # build or get each project
-    projects.each { |project|
-      
-      if (project.key?("folder") && !File.directory?(project["folder"]) && !File.symlink?(project["folder"]))
-        if (project["url"])
-          url= project["url"]
-          system "svn co #{url} #{project["folder"]}"
-        else
-          puts "#{@project_file}: external project folder missing: #{project["folder"]}"
-          exit
-        end
-      end
-  
-      if (!project.key?("include"))
-        project["include"]= File.join(project["folder"], "build")
-      end
-  
-      build= project["build"] || "distil"
-      wd= Dir.pwd
-      Dir.chdir(project["folder"]||project["include"])
-      # pass along mode flag to sub-projects
-      if (mode)
-        build= "#{build} -mode=#{mode}"
-      end
-      system(build)
-      Dir.chdir(wd)
-    }
-    
-    @options.external_projects= projects
-  end
-  
-  def build_targets
-    
-    @extras.each { |section, value|
-      
-      next if (options.targets && !options.targets.include?(section))
-      next if ((!options.targets || !options.targets.include?(section)) &&
-           value.is_a?(Hash) && value.has_key?("enabled") && !value["enabled"])
-
-      puts
-      puts "#{project_name}/#{section}:"
-      puts
-
-      task= Task.by_name(section) || Task.by_product_name(section)
-      if (task)
-        new_value= Hash.new
-        new_value[section]= value
-        value= new_value
-        section= "all"
-      end
-      
-      target= Target.new(section, value, self)
-      target.process_files
-      target.finish
-    }
-  end
-end

data/lib/source-file.rb

@@ -1,197 +0,0 @@
-require 'fileutils'
-
-$compressor = "#{$script_dir}/yuicompressor-2.4.2.jar"
-
-class SourceFile
-  attr_accessor :parent_folder, :full_path
-
-  def initialize(filepath)
-    @full_path= File.expand_path(filepath)
-
-    @parent_folder= File.dirname(@full_path)
-    @dependencies= []
-    @assets= []
-    
-    @@file_cache[@full_path]= self
-  end
-
-  def self.extension
-  end
-  
-  def extension
-    self.class.extension
-  end
-  
-  def can_embed_as_content(file)
-    false
-  end
-  
-  def content_type
-    ext= self.extension
-    return if !ext
-    ext[1..-1]
-  end
-  
-  @@file_types= []
-  def self.inherited(subclass)
-    @@file_types << subclass
-  end
-
-  def self.file_types
-    @@file_types
-  end
-
-  @@file_cache= Hash.new
-  def self.from_path(filepath)
-    full_path= File.expand_path(filepath)
-    file= @@file_cache[full_path]
-    return file if file
-    
-    extension= File.extname(filepath)
-    
-    @@file_types.each { |handler|
-      next if (handler.extension != extension)
-
-      return handler.new(filepath)
-    }
-    
-    return SourceFile.new(filepath)
-  end
-
-  def to_s
-    @full_path
-  end
-  
-  def to_str
-    @full_path
-  end
-
-  def error(message, line_number=0)
-    Target.current.error(message, self, line_number)
-  end
-
-  def warning(message, line_number=0)
-    Target.current.warning(message, self, line_number)
-  end
-
-  def basename(suffix="")
-    File.basename(@full_path, suffix)
-  end
-  
-  def file_path
-    @file_path
-  end
-
-  def file_path=(path)
-    @file_path=path
-  end
-  
-  def load_content
-    content= File.read(@full_path)
-    Filter.each { |f|
-      next if !f.handles_file(self)
-      content= f.preprocess_content(self, content)
-    }
-    content
-  end
-
-  def escape_embeded_content(content)
-    content
-  end
-  
-  def content
-    @content ||= load_content
-  end
-
-  def filtered_content(options)
-    c= content || ""
-    Filter.each { |f|
-      next if !f.handles_file(self)
-      c= f.filter_content(self, c, options)
-    }
-    c
-  end
-    
-  def debug_content(options)
-    self.filtered_content(options)
-  end
-  
-  def minify_content(source)
-  	# Run the Y!UI Compressor
-    return source if !content_type
-  	buffer= ""
-    
-  	IO.popen("java -jar #{$compressor} --type #{content_type}", "r+") { |pipe|
-  	  pipe.puts(source)
-  	  pipe.close_write
-  	  buffer= pipe.read
-	  }
-	  
-    # buffer = `java -jar #{$compressor} --type #{type} #{working_file}`
-  	if ('css'==content_type)
-  		# puts each rule on its own line, and deletes @import statements
-  		return buffer.gsub(/\}/,"}\n").gsub(/.*@import url\(\".*\"\);/,'')
-  	else
-  		return buffer
-  	end
-  end
-  
-  def self.path_relative_to_folder(path, folder)
-    outputFolder= File.expand_path(folder).to_s
-  
-    # Remove leading slash and split into parts
-    file_parts= path.slice(1..-1).split('/');
-    output_parts= outputFolder.slice(1..-1).split('/');
-
-    common_prefix_length= 0
-
-    file_parts.each_index { |i|
-      common_prefix_length= i
-      break if file_parts[i]!=output_parts[i]
-    }
-
-    return '../'*(output_parts.length-common_prefix_length) + file_parts[common_prefix_length..-1].join('/')
-  end
-  
-  def relative_to_folder(output_folder)
-    self.class.path_relative_to_folder(@full_path, output_folder)
-  end
-
-  def relative_to_file(source_file)
-    folder= File.dirname(File.expand_path(source_file))
-    self.relative_to_folder(folder)
-  end
-  
-  def dependencies
-    content
-    @dependencies
-  end
-
-  def add_dependency(file)
-    return if @dependencies.include?(file)
-    @dependencies << file
-  end
-  
-  def assets
-    content
-    @assets
-  end
-  
-  def add_asset(file)
-    @assets << file
-  end
-  
-  def copy_to(folder, prefix)
-    file_path= self.file_path || relative_to_folder(prefix||"")
-    final_target_folder= File.join(folder, File.dirname(file_path))
-    FileUtils.mkdir_p final_target_folder
-    FileUtils.cp self.full_path, final_target_folder
-    File.join(final_target_folder, File.basename(file_path))
-  end
-  
-end
-
-# load all the other file types
-Dir.glob("#{$script_dir}/file-types/*-file.rb") { |file|
-  require file
-}

data/lib/target.rb

@@ -1,102 +0,0 @@
-require "#{$script_dir}/task"
-require "set"
-
-class Target < Configurable
-  attr_accessor :target_name, :warning_count, :error_count
-
-  option :tasks, Array
-  
-  def initialize(name, settings, project)
-    super(settings, project)
-
-    @@current= self
-    @project= project
-    @target_name= name
-
-    @warning_count=0
-    @error_count=0
-    
-    @tasks= []
-
-    @extras.each { |task_name, task_settings|
-      next if (tasks && !tasks.include?(task_name))
-
-      if (task_settings.is_a?(Array) || task_settings.is_a?(String))
-        task_settings= { "include"=>task_settings }
-      end
-      
-      t= Task.by_name(task_name)
-      if (!t.nil?)
-        @tasks << t.new(self, task_settings)
-        next
-      end
-      
-      t= Task.by_product_name(task_name)
-      if (!t.nil?)
-        task_settings["output_name"]= task_name[/(.*)\.#{t.output_type}$/,1]
-        @tasks << t.new(self, task_settings)
-        next
-      end
-
-      error("Unknown task: #{task_name}")
-    }
-  end
-
-  @@current=nil
-  def self.current
-    @@current
-  end
-
-  def error(message, file="", line_number=0)
-    @error_count+=1
-    if (file && line_number)
-      printf("%s:%d: error: %s\n", file, line_number, message)
-    else
-      printf("error: %s\n", message)
-    end
-  end
-  
-  def warning(message, file="", line_number=0)
-    @warning_count+=1
-    return if (ignore_warnings)
-    if (file && line_number)
-      printf("%s:%d: warning: %s\n", file, line_number, message)
-    else
-      printf("warning: %s\n", message)
-    end
-  end
-  
-  def products
-    products= []
-    @tasks.each { |task|
-      products.concat(task.products)
-    }
-    products
-  end
-  
-  def process_files
-    @tasks.each { |t|
-      t.find_files
-
-      next if !t.need_to_build
-
-      t.validate_files
-      t.document_files
-      t.process_files
-    }
-  end
-
-  def finish
-    @tasks.each { |t|
-      t.finish if t.need_to_build
-      t.build_assets
-    }
-
-    @tasks.each { |t|
-      t.cleanup
-    }
-    
-    puts "#{@error_count} error(s), #{@warning_count} warning(s)#{ignore_warnings ? " ignored" : ""}"
-  end
-  
-end