uki 1.0.2 → 1.1.0

data/Readme.rdoc

@@ -3,7 +3,11 @@
 Project creation, dev server, testing, building for uki apps
 
 == Get started
+1. Install ruby and rubygems (on Windows go to http://rubyinstaller.org/)
+2. Install uki
     [sudo] gem install uki
+3. Use uki command
+    uki --help
     uki new project myapp +jspec
     cd myapp
-    uki runserver
+    uki run

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/bin/uki

@@ -115,22 +115,30 @@ command :run do |c|
 end
 
 command :build do |c|
-  c.syntax = 'uki build [target]'
+  c.syntax = 'uki build [file1 [, file2]]'
   c.summary = 'Build current project'
-  c.description = 'Process all javascripts included in the index.html file.
-    Merges all include() in them and then runs them through
-    Google Closure Compiler.
+  c.description = 'Merges and compresses javascript files.
+    Merges all include() and include_css() in js files. Merged output
+    is processed through google clousure compiler. Supports .js and .html 
+    files as parameters. 
     
-    You can disable the Compiler with --nocompiler option.
+    By default builds index.html file in current directory and puts them into
+    build dir.
     
-    By default resulting files will be put into build directory. You may
-    override it with [target] option'
-  c.option '-C', '--nocompiler', 'Disable Google Closure Compiler'
+    Note that output dir will be cleared before merging'
+  c.option '-C', '--nocompress', 'Disable Google Closure Compiler/Yahoo Compressor'
+  c.option '-o output', '--output output', 'Directory to output to'
   c.when_called do |args, option|
-    target = args.shift || 'build'
+    files = args.empty? ? ['index.html'] : args
+    output = option.output || 'build'
     project = Uki::Project.new('.')
-    project.build target, :compile => !option.nocompiler
-    say "Build complete at '#{target}'"
+    project.build files, 
+      :compress => !option.nocompress, 
+      :output => output,
+      :images => args.empty?,
+      :clean_output => args.empty?
+      
+    say "Build complete at '#{output}'"
   end
 end
 

data/lib/uki/builder.rb

@@ -0,0 +1,67 @@
+require 'fileutils'
+require 'tempfile'
+require 'uki/include_js'
+
+module Uki
+  
+  class Builder
+
+    attr_accessor :path
+    attr_accessor :options
+
+    def initialize(path, options = {})
+      @path = path
+      @options = options
+    end
+
+    def code
+      options[:compress] ? compressed_code : plain_code
+    end
+
+  protected
+    def compressed_code
+      unless @compressed_code
+        code = Uki.include_js(path) do |path|
+          if path.match(/.css$/)
+            compiled_css path
+          else
+            File.read(path)
+          end
+        end
+        Tempfile.open('w') { |file|
+          file.write(code)
+          file.flush
+          @compressed_code = compiled_js(file.path)
+        }
+      end
+      @compressed_code
+    end
+
+    def plain_code
+      @plain_code ||= Uki.include_js path
+    end
+
+    def compiled_css path
+      system "java -jar #{path_to_yui_compressor} #{path} > #{path}.tmp"
+      code = File.read("#{path}.tmp")
+      FileUtils.rm "#{path}.tmp"
+      code
+    end
+
+    def compiled_js path
+      system "java -jar #{path_to_google_compiler} --js #{path} > #{path}.tmp" 
+      code = File.read("#{path}.tmp")
+      FileUtils.rm "#{path}.tmp"
+      code
+    end
+
+    def path_to_google_compiler
+      File.join(UKI_ROOT, 'java', 'compiler.jar')
+    end
+
+    def path_to_yui_compressor
+      File.join(UKI_ROOT, 'java', 'yuicompressor.jar')
+    end
+  end  
+  
+end

data/lib/uki/include_js.rb

@@ -1,13 +1,21 @@
+require 'json'
+
 module Uki
   
-  INCLUDE_REGEXP = %r{((?:^|\n)[^\n]\W|^|\n)include\s*\(\s*['"]([^"']+)["']\s*\)(?:\s*;)?(.*?\r?\n|$)}
+  INCLUDE_REGEXP = %r{((?:^|\n)[^\n]\W|^|\n)\s*include\s*\(\s*['"]([^"']+)["']\s*\)(?:\s*;)?(.*?\r?\n|$)}
+  INCLUDE_CSS_REGEXP = %r{include_css\s*\(\s*['"]([^"']+)["']\s*\)}
   
   #
   # Preprocesses include() calls in js files
-  def self.include_js path, included = {}, stack = []
+  def self.include_js path, included = {}, stack = [], &block
     raise Exception.new("File #{path} not found.\nStack: #{stack.join(' -> ')}") unless File.exists?(path)
     path = File.expand_path path
-    code, base = File.read(path), File.dirname(path)
+    base = File.dirname(path)
+    code = if block_given? 
+      yield path 
+    else 
+      File.read(path) 
+    end
     
     included[path] = true
     code.gsub(INCLUDE_REGEXP) do |match|
@@ -21,7 +29,18 @@ module Uki
           $1 + $3
         end
       end
+    end.gsub(INCLUDE_CSS_REGEXP) do |match|
+      include_css File.join(base, $1), &block
+    end
+  end
+  
+  def self.include_css path, &block
+    code = if block_given? 
+      yield path 
+    else 
+      File.read(path) 
     end
+    JSON.dump code
   end
   
   def self.extract_includes path

data/lib/uki/project.rb

@@ -2,11 +2,13 @@ require 'fileutils'
 require 'commander/import'
 require 'erb'
 require 'pathname'
-require 'uki/include_js'
+require 'uki/builder'
 require 'base64'
 require 'digest/md5'
 
 class Uki::Project
+  CJS_REGEXP = %r{=\s*["']?(([^"' ]+).cjs)}
+  
   attr_accessor :dest
   
   def initialize dest
@@ -26,14 +28,34 @@ class Uki::Project
     init_jspec if options[:jspec]
   end
   
-  def build target, options = {}
-    target = File.join(dest, target) unless Pathname.new(target).absolute?
-    init_target target
-    containers = find_containers
-    cjs = extract_cjs(containers)
-    build_js cjs, target, options
-    build_containers containers, target, options
-    build_images target, options
+  def build files, options = {}
+    cjs = []
+    containers = []
+    files.each do |file|
+      path = to_path(file)
+      next unless File.exists?(path) 
+      if file.match(/.html$/)
+        cjs += extract_cjs(path)
+        containers << path
+      else
+        cjs << path
+      end
+    end
+    cjs.uniq!
+    containers.uniq!
+    
+    output = to_path(options[:output])
+    FileUtils.rm_rf output if options[:clean_output]
+    FileUtils.mkdir_p output
+    
+    cjs.each do |path|
+      File.open(File.join(output, File.basename(path)), 'w') do |f|
+        f.write( Uki::Builder.new(path, :compress => options[:compress]).code )
+      end
+    end
+    
+    build_containers containers, output
+    build_images output if options[:images]
   end
   
   def create_class template, fullName
@@ -65,12 +87,16 @@ class Uki::Project
   end
   
   protected
+    def to_path file
+      Pathname.new(file).absolute? ? file : File.join(dest, file)
+    end
+  
     def write_class template, path
       package_name = path[0..-2].join('.')
       class_name   = path[-1]
       class_name   = class_name[0,1].upcase + class_name[1..-1]
       file_name    = class_name[0,1].downcase + class_name[1..-1]
-      target       = File.join *(path[0..-2] + [file_name])
+      target       = File.join( *(path[0..-2] + [file_name]) )
       target += '.js'
       File.open(File.join(dest, target), 'w') do |f|
         f.write template(template).result(binding)
@@ -81,9 +107,9 @@ class Uki::Project
     def write_function template, path
       package_name  = path[0..-2].join('.')
       function_name = path[-1]
-      function_name = function_name[0,1].downcase   + function_name[1..-1]
+      function_name = function_name[0,1].downcase + function_name[1..-1]
       file_name     = function_name
-      target        = File.join *(path[0..-2] + [file_name])
+      target        = File.join( *(path[0..-2] + [file_name]) )
       target += '.js'
       File.open(File.join(dest, target), 'w') do |f|
         f.write template(template).result(binding)
@@ -114,56 +140,26 @@ class Uki::Project
       end
     end
   
-    def build_js cjs, target, options
-      cjs.each do |c|
-        c = c.sub('.cjs', '.js')
-        code = Uki.include_js File.join(dest, c)
-        FileUtils.mkdir_p File.dirname(c)
-        filename = File.join(target, c)
-        File.open(filename, 'w') do |f|
-          f.write code
-        end
-        compile_js filename if options[:compile]
-      end
-    end
-    
-    def compile_js file
-      system "java -jar #{path_to_google_compiler} --js #{file} > #{file}.tmp" 
-      FileUtils.rm file
-      FileUtils.mv "#{file}.tmp", file
-    end
-  
-    def build_containers containers, target, options
+    def build_containers containers, output
       containers.each do |c|
-        code = File.read(c).gsub(%r{=\s*["']?(([^"' ]+).cjs)}) do |match|
-          md5 = Digest::MD5.file(File.join(target, "#{$2}.js")).hexdigest
+        code = File.read(c).gsub(CJS_REGEXP) do |match|
+          md5 = Digest::MD5.file(File.join(output, "#{$2}.js")).hexdigest
           match.sub('.cjs', ".js?#{md5}")
         end
-        File.open(File.join(target, File.basename(c)), 'w') do |f|
+        File.open(File.join(output, File.basename(c)), 'w') do |f|
           f.write code
         end
       end
     end
     
-    def build_images target, options
-      FileUtils.cp_r File.join(dest, 'i'), File.join(target, 'i')
+    def build_images output
+      FileUtils.cp_r File.join(dest, 'i'), File.join(output, 'i')
     end
   
-    def extract_cjs containers
-      containers.map do |c|
-        File.read(c).scan(%r{=\s*["']?([^"' ]+.cjs)})
-      end.flatten.uniq
+    def extract_cjs container
+      File.read(container).scan(CJS_REGEXP).map { |match| match[0].sub('.cjs', '.js') }
     end
     
-    def find_containers
-      Dir.glob File.join(dest, '*.html')
-    end
-    
-    def init_target target
-      FileUtils.rm_rf target
-      FileUtils.mkdir_p target
-    end
-  
     def init_dest
       FileUtils.mkdir_p File.join(dest, project_name)
       ['view', 'model', 'layout', 'controller'].each do |name| 
@@ -240,8 +236,4 @@ class Uki::Project
       FileUtils.cp_r images_path, File.join(dest, 'i')
     end
     
-    def path_to_google_compiler
-      File.join(UKI_ROOT, 'frameworks', 'uki', 'compiler.jar')
-    end
-  
 end

data/lib/uki/routes.rb

@@ -1,10 +1,12 @@
+require 'uki/builder'
+
 get %r{\.cjs$} do
   path = request.path.sub(/\.cjs$/, '.js').sub(%r{^/}, './')
   pass unless File.exists? path
   
   response.header['Content-type'] = 'application/x-javascript; charset=UTF-8'
   begin
-    Uki.include_js(path)
+    Uki::Builder.new(path, :optimize => false).code
   rescue Exception => e
     message = e.message.sub(/\n/, '\\n')
     "alert('#{message}')"

data/lib/uki/server.rb

@@ -1,5 +1,4 @@
 require 'sinatra'
-require 'uki/include_js'
 require 'uki/routes'
 
 module Uki

data/uki.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{uki}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Vladimir Kolesnikov"]
-  s.date = %q{2010-04-05}
+  s.date = %q{2010-05-04}
   s.default_executable = %q{uki}
   s.description = %q{Project creation, dev server, testing, building for uki apps}
   s.email = %q{voloko@gmail.com}
@@ -240,7 +240,10 @@ Gem::Specification.new do |s|
      "frameworks/uki/thin.yaml",
      "frameworks/uki/uki.rb",
      "frameworks/uki/uki.ru",
+     "java/compiler.jar",
+     "java/yuicompressor.jar",
      "lib/uki.rb",
+     "lib/uki/builder.rb",
      "lib/uki/include_js.rb",
      "lib/uki/project.rb",
      "lib/uki/routes.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - Vladimir Kolesnikov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +04:00
+date: 2010-05-04 00:00:00 +04:00
 default_executable: uki
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -288,7 +288,10 @@ files:
 - frameworks/uki/thin.yaml
 - frameworks/uki/uki.rb
 - frameworks/uki/uki.ru
+- java/compiler.jar
+- java/yuicompressor.jar
 - lib/uki.rb
+- lib/uki/builder.rb
 - lib/uki/include_js.rb
 - lib/uki/project.rb
 - lib/uki/routes.rb