Merge branch 'master' into develop

Author: Ben D'Angelo

lib/entityjs/commands/build.rb

@@ -19,6 +19,7 @@ def self.generate(args=nil)
       images_folder = Config.images_folder
       sounds_folder = Config.sounds_folder
       scripts_folder = Config.scripts_folder
+      styles_folder = Config.instance.build_styles_path
 
       final_name = Config.instance.build_name+'.js'
       html_name = 'play.html'
@@ -60,7 +61,9 @@ def self.generate(args=nil)
       end
 
       #save css
-      File.open(Config.instance.build_styles_path+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
+      Dirc.create_dir(styles_folder)
+
+      File.open(styles_folder+"/"+Config.instance.build_styles_name+'.css', 'w') do |f|
         f.write(css)
       end
 

spec/lib/entityjs/commands/new_spec.rb

@@ -13,7 +13,7 @@
     Entityjs::New.generate(['mygame', 'blank']).should == 0
     Dir.pwd.should match /\/EntityJS$/i
 
-    File.exists?('mygame/config.yml').should == true
+    File.exists?('mygame/game.json').should == true
     File.exists?('mygame/readme.txt').should == true
   end
 

spec/support/mygame.rb

@@ -12,5 +12,5 @@ def setup_mygame
 end
 
 def teardown_mygame
-  Dir.chdir('..')
+  Dir.chdir('..') if Entityjs::Dirc.game?
 end