entityjs 0.4.1 → 0.4.2

data/.gitignore

@@ -7,3 +7,4 @@ pkg/*
 ._redcar
 mygame
 *.min.js
+.rspec

data/bin/entityjs

@@ -19,6 +19,6 @@ case code
     puts "EntityJS game not found"
     puts "Move inside the root directory"
   when 3
-    puts "File/Directory exists"
+    puts "File/Directory already exists"
     
 end

data/entityjs.gemspec

@@ -20,13 +20,14 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
   s.add_development_dependency "jasmine"
   
-  s.add_dependency "sinatra", ">= 1.3.0"
+  s.add_dependency "sinatra", ">= 1.0"
   s.add_dependency "coffee-script"
   s.add_dependency 'uglifier'
   s.add_dependency 'json'
   s.add_dependency 'cobravsmongoose'
+  s.add_dependency 'cssmin'
+  
 end

data/lib/entityjs.rb

@@ -38,6 +38,14 @@ rescue LoadError
   exit
 end
 
+begin
+  require "cssmin" 
+rescue LoadError
+  puts "Could not load 'cssmin'"
+  puts "run 'gem install cssmin'"
+  exit
+end
+
 module Entityjs
   
   def self.root
@@ -67,7 +75,11 @@ module Entityjs
         return nil
     end
   end
-  
+
+  def self.public_path
+    return "#{Entityjs::root}/public"
+  end
+
 end
 
 require 'entityjs/command'

data/lib/entityjs/command.rb

@@ -1,5 +1,4 @@
-Dir.glob("#{Entityjs::root}/lib/entityjs/*.rb").each {|f| require f }
-Dir.glob("#{Entityjs::root}/lib/entityjs/*/*.rb").each {|f| require f }
+Dir.glob("#{Entityjs::root}/lib/entityjs//**/*.rb").each {|f| require f }
 
 # 0 - ok
 # 1 - command not found
@@ -23,11 +22,15 @@ module Entityjs
         when /^(test|t)$/
           return Entityjs::Test.generate(args)
         
-        when 'release'
+        when '/^(release|r)$/'
           return Entityjs::Release.generate(args)
+
         when 'eunit'
           return Entityjs::Eunit.generate(args)
           
+        when 'min'
+          return Entityjs::Min.generate(args)
+
         when /^(comp|c)$/
           return Entityjs::Comp.generate(args)
           
@@ -37,6 +40,9 @@ module Entityjs
         when /^(font|f)$/
           return Entityjs::Font.generate(args)
           
+        when /^(html)$/
+          return Entityjs::Html.generate(args)
+
         when /^(version|v|-v)$/
           puts 'EntityJS V'+Entityjs::VERSION
           return 0
@@ -44,19 +50,19 @@ module Entityjs
         when /^(help|h|-h)$/
           puts ""
           puts '---- Commands ----'
-          puts 'entityjs new [name]'
-          puts 'entityjs new [name] [template]'
-          puts 'entityjs templates'
-          puts 'entityjs comp [name]'
-          puts 'entityjs test [name]'
-          puts 'entityjs test [name] [tests]+'
-          puts 'entityjs font [name] (soon...)'
-          puts 'entityjs release'
-          puts 'entityjs build'
-          puts 'entityjs build [name]'
-          puts 'entityjs server'
-          puts 'entityjs help'
-          puts 'entityjs version'
+          puts 'new [name]'
+          puts 'new [name] [template]'
+          puts 'templates'
+          puts 'comp [name]'
+          puts 'test [name]'
+          puts 'test [name] [tests]+'
+          puts 'font [name] (soon...)'
+          puts 'release'
+          puts 'html'
+          puts 'build'
+          puts 'server'
+          puts 'help'
+          puts 'version'
           return 0
           
       end

data/lib/entityjs/commands/build.rb

@@ -6,7 +6,7 @@ module Entityjs
   
   class Build
     
-    def self.generate(name=nil)
+    def self.generate(args=nil)
       
       if !Dirc.game?
         return 2
@@ -14,63 +14,63 @@ module Entityjs
       
       Config.instance.reload
       
-      if name.nil? || name.empty?
-        date = Time.now.strftime('%s')
-        name = "build-#{date}"
-      else
-        name = name.first
-      end
-      
-      builds_folder = Config.builds_folder
-      assets_folder = Config.assets_folder
+      build_folder = Config.instance.build_path
+      assets_folder = Config.instance.build_assets_path
       images_folder = Config.images_folder
       sounds_folder = Config.sounds_folder
       scripts_folder = Config.scripts_folder
       
-      final_name = 'game.min.js'
+      final_name = Config.instance.build_name+'.js'
       html_name = 'play.html'
       
+      puts "Building to #{build_folder}"
+
       #build if it doesn't exist
-      Dirc.create_dir('builds', true)
-      
-      #create new directory
-      if File.directory?(name)
-        return 3
-      end
+      Dirc.create_dir(build_folder, true)
       
-      assets_root = Dirc.game_root+'/'+assets_folder
+      #clear directory
+      #FileUtils.rm_rf("#{build_folder}/.", :secure=> true)
       
-      Dir.mkdir(name)
-      Dir.chdir(name)
+      assets_root = Dirc.game_root+'/'+Config.assets_folder
       
       #copy everything inside the assets folder
-      puts "Copying assets folder"
-      FileUtils.cp_r assets_root, assets_folder
+      puts "Copying assets folder to #{assets_folder}"
+      FileUtils.cp_r assets_root+'/.', assets_folder
       
       #append all files into one big file
-      puts "Compiling code"
-      
-      entity_src = self.compile_entity(Config.instance.entity_ignore)
-      scripts = self.compile_scripts(Config.instance.scripts_ignore, Config.instance.scripts_order)
-      
-      out = entity_src+scripts
+      puts "Compiling scripts"
+
+      out = self.compile_game
       
+      puts "Minifying scripts"
+
+      out = self.minify(out)
+
+      puts "Minifying styles"
+
+      css = self.minify_styles(self.compile_styles(Config.instance.build_styles_ignore))
+
       #minify
       puts "Almost done..."
-      
+
       #save
       File.open(final_name, 'w') do |f|
         
-        f.write(self.minify(out))
-        
-        f.close
+        f.write(out)
       end
       
-      #create play.html
-      puts "Creating play page"
+      #save css
+      File.open(Config.instance.build_styles_path+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
+        f.write(css)
+      end
+      
+
+      if Config.instance.build_ignore_play.nil?
+        #create play.html
+        puts "Creating play page"
       
-      File.open(html_name, 'w') do |f|
-        f.write(%Q(<!DOCTYPE html>
+      #create play.html code
+      play_code = %Q(<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
@@ -80,13 +80,25 @@ module Entityjs
     <canvas id='#{Config.instance.canvas_id}' width='#{Config.instance.width}' height='#{Config.instance.height}'>Error browser does not support canvas element.</canvas>
   </body>
 </html>
-))
-        f.close
+)
+      
+        #check if local play.html exists
+        if Dirc::exists?('play.html')
+          #create js for html
+          js = "<script src='#{final_name}' type='text/javascript'></script>"
+          play_code = Page::render_play_page(:js=>js)
+        end
+
+        File.open(html_name, 'w') do |f|
+          f.write(play_code)
+        end
+      else
+        puts "Ignoring play.html"
       end
       
-      puts "Successfully built!"
+      puts "Build Complete!"
       puts "Build is at"
-      puts "  #{builds_folder}/#{name}"
+      puts "  #{File.expand_path(build_folder)}"
       
       Dirc.to_game_root
       
@@ -104,7 +116,7 @@ module Entityjs
       end
       
       #add version
-      out = out.gsub(/\$VERSION/, Entityjs::VERSION)
+      out = out.gsub(/RE_VERSION/, Entityjs::VERSION)
       
       return out
     end
@@ -123,7 +135,23 @@ module Entityjs
       
       return out
     end
-    
+
+    def self.compile_styles(ignore = nil)
+      styles = Dirc.find_styles(ignore)
+
+      out = ''
+
+      styles.each do |i|
+        out += IO.read(i)
+      end
+
+      return Config.preprocess(out)
+    end
+
+    def self.minify_styles(styles)
+      return CSSMin.minify(styles)
+    end
+
     #compiles all game source and returns it
     def self.compile_scripts(ignore = nil, order=nil)
       #find with short urls for proper data processing
@@ -137,21 +165,41 @@ module Entityjs
         out += "\n"
       end
       
+      out = Config.preprocess(out)
+
       #add js config
       out += self.js_config
       
       return out
     end
     
+    def self.compile_game
+
+      entity_src = self.compile_entity(Config.instance.build_entity_ignore+Config.instance.entity_ignore)
+      scripts = self.compile_scripts(Config.instance.build_scripts_ignore+Config.instance.scripts_ignore, Config.instance.scripts_order)
+      
+      self.build_wrap(entity_src+scripts)
+    end
+
+    def self.build_wrap(code)
+
+      head = Config.instance.build_head
+      foot = Config.instance.build_foot
+
+      return head+code+foot
+    end
+
     #minifies source and returns it
-    def self.minify(code, license=true)
+    def self.minify(code, ops={})
+      ops[:copyright] ||= false
+      ops[:license] ||= true
       
-      code = Uglifier.compile(code, :copyright=>false)
+      code = Uglifier.compile(code, :copyright=>ops[:copyright])
       
       #add entity license statement
-      if license.is_a? String
-        code = license + code
-      elsif license
+      if ops[:license].is_a? String
+        code = ops[:license] + code
+      elsif !ops[:license].nil?
         code = Config.instance.license + code
       end
       
@@ -159,7 +207,7 @@ module Entityjs
     end
     
     def self.js_config(path = nil, images = nil, sounds = nil, canvas = nil)
-      path ||= 'assets/'
+      path ||= Config.assets_folder+'/'
       images ||= self.images_to_js
       sounds ||= self.sounds_to_js
       canvas ||= Config.instance.canvas_id

data/lib/entityjs/commands/eunit.rb

@@ -19,7 +19,7 @@ module Entityjs
       
       license = "/* QUnit V1.5.0pre with EntityJS Entensions | http://docs.jquery.com/QUnit */\n"
       
-      min = Entityjs::Build.minify(min, license)
+      min = Entityjs::Build.minify(min, :license=>license)
       
       File.open(name, 'w') do |f|
         

data/lib/entityjs/commands/html.rb

@@ -0,0 +1,31 @@
+module Entityjs
+  
+  class Html
+    
+    def self.generate(name='')
+      if !Dirc.game?
+        return 2
+      end
+      
+      puts "Creating HTML files"
+
+      play = 'play.html'
+      test = 'test.html'
+
+      if File.exists?(play) || File.exists?(test)
+        return 3
+      end
+      
+      FileUtils.cp Entityjs::public_path+'/'+play, play
+      FileUtils.cp Entityjs::public_path+'/'+test, test
+
+      
+      puts "Created #{play}"
+      puts "Created #{test}"
+      
+      return 0
+    end
+    
+  end
+  
+end

data/lib/entityjs/commands/min.rb

@@ -0,0 +1,37 @@
+module Entityjs
+  
+  class Min
+    
+    def self.generate(args=nil)
+
+    	if !Dirc.game?
+    		return 2
+    	end
+
+    	Config.instance.reload
+
+      final_name = Config.instance.build_name+'.js'
+      path = Config.instance.build_path+'/'+final_name
+
+      puts "Compiling code"
+
+      out = Build.compile_game
+
+      puts "Minifying"
+
+      out = Build.minify(out)
+
+      puts "Writing to #{path}"
+
+      File.open(path, 'w') do |f|
+      	f.write(out)
+      end
+
+      puts "Done"
+
+      return 0
+    end
+
+  end
+
+end

data/lib/entityjs/commands/new.rb

@@ -27,6 +27,9 @@ module Entityjs
       puts "Version: #{Entityjs::VERSION}"
       puts "Website: http://entityjs.com"
       puts ""
+      puts "Try it out:"
+      puts "  cd #{name}"
+      puts "  entityjs server"
       
       Dirc.change_dir(name)
       

data/lib/entityjs/commands/server.rb

@@ -22,16 +22,22 @@ module Entityjs
     
     get '/' do
       
-      Page.render_play()
+      Page.render_play_page()
       
     end
     
-    get '/tests' do
+    get '/test' do
       
-      Page.render_tests()
+      Page.render_test_page()
       
     end
     
+    get '/favicon.ico' do
+      content_type 'image/ico'
+
+      Page.render_favicon
+    end
+
     #entity source code
     get '/entityjs/*' do
       content_type 'text/javascript'