rhodes 3.3.2.beta.5 → 3.3.2.beta.6

data/platform/shared/net/AsyncHttp.h

@@ -138,8 +138,9 @@ public:
     unsigned long addHttpCommand(IQueueCommand* pCmd);
 
 private:
-    CAsyncHttp();
-    ~CAsyncHttp();
+	CAsyncHttp();
+
+	~CAsyncHttp();
 
     virtual void processCommand(IQueueCommand* pCmd);
 };

data/platform/wm/build/wm.rake

@@ -88,7 +88,7 @@ namespace "config" do
     $rhobundledir =  $app_path + "/RhoBundle"
     $log_file = $app_config["applog"].nil? ? "applog.txt" : $app_config["applog"]
     $srcdir =  $bindir + "/RhoBundle"
-    $buildcfg = $app_config["buildcfg"]
+    $buildcfg = $app_config["buildcfg"] unless $buildcfg
     $buildcfg = "Release" unless $buildcfg
 
     if $sdk == "Windows Mobile 6 Professional SDK (ARMV4I)"
@@ -428,6 +428,10 @@ namespace "clean" do
 end
 
 namespace "run" do
+    task :mylogserver => ["config:wm"] do
+        Jake.run_rho_log_server($app_path)
+    end
+
   def gelLogPath
     log_file_path =  File.join($app_path, $log_file)
     return log_file_path
@@ -444,7 +448,17 @@ namespace "run" do
     puts "\nStarting application on the WM6 emulator\n\n"
     log_file = gelLogPath
 
-    Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+    #Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
+
+	File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+	Jake.run_rho_log_server($app_path)
+	puts "RhoLogServer is starting"
+	while true do
+		if File.exists?($app_path + "/started")
+			break
+		end
+		sleep(1)
+	end
 
     if $webkit_capability
       wk_args   = [ 'wk-emu', "\"#{$wm_emulator}\"", '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
@@ -485,6 +499,17 @@ namespace "run" do
       # temporary disable log from device (caused enormous delays)
       # Jake.run2( detool, ['log', log_file, $port], {:nowait => true})
 
+	  File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+	  
+      Jake.run_rho_log_server($app_path)
+	  puts "RhoLogServer is starting"
+	  while true do
+	    if File.exists?($app_path + "/started")
+		    break
+	    end
+	    sleep(1)
+	  end    
+
       if $webkit_capability
         wk_args   = [ 'wk-dev', '"'+ $wk_data_dir.gsub(/"/,'\\"') + '"', '"'+ $appname + '"']
         Jake.run2( detool, wk_args, {:nowait => false})

data/platform/wm/tools/detool/detool.cpp

@@ -1112,10 +1112,8 @@ int _tmain(int argc, _TCHAR* argv[])
 		_tprintf( TEXT("%s\n"), params_buf);
 
 		TCHAR params[128];
-		// temporary disable log from device (caused enormous delays)
-		params[0] = 0;
-		//_tcscpy(params, _T("-log="));
-		//_tcscat(params, log_port);
+		_tcscpy(params, _T("-log="));
+		_tcscat(params, log_port);
 
 		if(!wceRunProcess(T2A(params_buf), T2A(params))) {
 			_tprintf( TEXT("FAILED\n"));
@@ -1192,10 +1190,8 @@ int _tmain(int argc, _TCHAR* argv[])
 			_tcscat(params_buf, _T(".exe"));
 
             TCHAR params[128];
-			// temporary disable log from device (caused enormous delays)
-			params[0] = 0;
-            //_tcscpy(params, _T("-log="));
-			//_tcscat(params, log_port);
+            _tcscpy(params, _T("-log="));
+			_tcscat(params, log_port);
 
 			if(!wceRunProcess (T2A(params_buf), T2A(params))) {
 				_tprintf( TEXT("FAILED\n"));

data/platform/wp7/build/wp.rake

@@ -339,7 +339,7 @@ namespace "run" do
 			    #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
 
 			    File.delete($app_path + "/started") if File.exists?($app_path + "/started")
-			    run_rho_log_server()
+			    Jake.run_rho_log_server($app_path)
 			    puts "RhoLogServer is starting"
 			    while(1)
 			        if File.exists?($app_path + "/started")
@@ -376,38 +376,6 @@ namespace "run" do
 				puts "log_file=" + getLogPath
 			end
 
-			task :rhologserver, :app_path  do |t, args|
-			    puts "Args were: #{args}"
-			    $app_path = args[:app_path]
-			    
-			    Rake::Task["config:wp"].invoke
-			    
-				$rhologhostaddr = Jake.localip()
-				$rhologhostport = 0
-				$rhologserver = WEBrick::HTTPServer.new :BindAddress => $rhologhostaddr, :Port => $rhologhostport
-				$rhologhostport = $rhologserver.config[:Port]
-				confpath_content = File.read($srcdir + "/apps/rhoconfig.txt") if File.exists?($srcdir + "/apps/rhoconfig.txt")
-				confpath_content += "\r\n" + "rhologhost=" + $rhologhostaddr
-				confpath_content += "\r\n" + "rhologport=" + $rhologhostport.to_s()
-				File.open($srcdir + "/apps/rhoconfig.txt", "w") { |f| f.write(confpath_content) }  if confpath_content && confpath_content.length()>0
-				puts "LOCAL SERVER STARTED ON #{$rhologhostaddr}:#{$rhologhostport}"
-				started = File.open($app_path + "/started", "w+")
-				started.close
-				Thread.new { $rhologserver.start }
-				#write host and port 4 log server     
-				$rhologfile = File.open(getLogPath, "w+")
-				$rhologserver.mount_proc '/' do |req,res|
-					$rhologfile.puts req.body
-					$rhologfile.flush
-					res.status = 200
-					res.chunked = true
-					res.body = ""
-				end
-				while(1)
-					sleep(1000)
-				end
-			end
-
             task :rhosimulator => ["config:set_wp_platform", "config:common"] do    
                 $rhosim_config = "platform='wp'\r\n"
                 Rake::Task["run:rhosimulator"].invoke            
@@ -483,7 +451,7 @@ namespace "run" do
 			    if $app_config["wp"] && $app_config["wp"]["productid"] != nil
 			        #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
 				    File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
-				    run_rho_log_server()
+				    Jake.run_rho_log_server($app_path)
 				    puts "RhoLogServer is starting"
 				    while(1)
 				        if File.exists?($app_path + "/started")

data/rakefile.rb

@@ -303,6 +303,10 @@ namespace "config" do
       make_application_build_capabilities_header_file
     end
 
+    $rhologhostport = $config["log_host_port"] 
+    $rhologhostport = 52363 unless $rhologhostport
+	$rhologhostaddr = Jake.localip()
+
   end
 
   task :qt do

data/res/generators/templates/spec/app/spec_runner.rb

@@ -12,10 +12,16 @@ class SpecRunner < MSpecScript
     app_folder = Rho::RhoFSConnector.get_app_path('app')
     app_folder.gsub!(/\\/, '/')
 
-    specs = app_folder + "**/*_spec.iseq"
+    specs = app_folder + "**/*_spec" + RHO_RB_EXT
     Dir.glob(specs) { |file|
       file.gsub!(app_folder,"")
-      file.gsub!(/\.iseq/,"")
+      
+      if RHO_RB_EXT == '.rb'
+        file.gsub!(/\.rb/,"")
+      else
+        file.gsub!(/\.iseq/,"")
+      end
+      
       config[:files] << file
     }
 

data/spec/framework_spec/app/spec_runner.rb

@@ -14,11 +14,16 @@ class SpecRunner < MSpecScript
     app_folder = Rho::RhoFSConnector.get_app_path('app')
     app_folder.gsub!(/\\/, '/')
     
-    specs =  app_folder + "spec/language/**/*_spec.iseq"
+    specs =  app_folder + "spec/language/**/*_spec" + RHO_RB_EXT
     
     Dir.glob(specs) do |file|
       file.gsub!(app_folder,"")
-      file.gsub!(/\.iseq/,"")
+      if RHO_RB_EXT == '.rb'
+        file.gsub!(/\.rb/,"")
+      else
+        file.gsub!(/\.iseq/,"")
+      end
+
       
       if ( System.get_property('platform') == 'WINDOWS' )
         next if file =~ /\/execution_spec$/           
@@ -87,22 +92,33 @@ class SpecRunner < MSpecScript
     core << 'fiber'
     
     core.each do |folder|
-      specs =  app_folder + "spec/core/#{folder}/**/*_spec.iseq"
+      specs =  app_folder + "spec/core/#{folder}/**/*_spec" + RHO_RB_EXT
       Dir.glob(specs) do |file|
         file.gsub!(app_folder,"")
-        file.gsub!(/\.iseq/,"")
+        
+        if RHO_RB_EXT == '.rb'
+          file.gsub!(/\.rb/,"")
+        else
+          file.gsub!(/\.iseq/,"")
+        end
+
  
         config[:files] << file
       end
     end
     
     # LIBRARIES
-    specs = app_folder + "spec/library/**/*_spec.iseq"
+    specs = app_folder + "spec/library/**/*_spec" + RHO_RB_EXT
     Dir.glob(specs) do |file|
       #next if file =~ /sha1/      
     
       file.gsub!(app_folder,"")
-      file.gsub!(/\.iseq/,"")
+      if RHO_RB_EXT == '.rb'
+        file.gsub!(/\.rb/,"")
+      else
+        file.gsub!(/\.iseq/,"")
+      end
+
       config[:files] << file
     end
     

data/version

@@ -1 +1 @@
-3.3.2.beta.5
+3.3.2.beta.6

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhodes
 version: !ruby/object:Gem::Version 
-  hash: 62196457
+  hash: 62196463
   prerelease: true
   segments: 
   - 3
   - 3
   - 2
   - beta
-  - 5
-  version: 3.3.2.beta.5
+  - 6
+  version: 3.3.2.beta.6
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-31 00:00:00 -08:00
+date: 2012-02-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency