cova 0.2.0 → 0.2.1

data/bin/cova

@@ -9,6 +9,7 @@ require 'cocoapods'
 require 'chunky_png'
 require 'fssm'
 require 'sqlite3'
+require 'socket'
 
 require 'covaconfig'
 require 'covalog'

data/lib/cova.rb

@@ -7,6 +7,7 @@ require 'cocoapods'
 require 'chunky_png'
 require 'fssm'
 require 'sqlite3'
+require 'socket'
     
 require 'covaconfig'
 require 'covalog'

data/lib/covaio.rb

@@ -22,6 +22,27 @@ module CovaIO
 			end
 		end
 
+		def _io_findport(port)
+			ok = false
+			times = 100
+			until ok
+				begin
+					if times <= 0
+						port = -1
+						ok = true
+					else
+				    	socket = TCPSocket.new "localhost", port
+						socket.close
+						port = port + 1
+						times = times - 1
+					end
+		        rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
+		        	ok = true
+		        end
+	        end
+	        return port
+		end
+
 		def _io_exec_xctool(cmd="build", config="Debug", sdk="iphonesimulator")
 			_io_exec @dir_xctool_home + "/xctool.sh -workspace cova.xcworkspace -scheme Cova -configuration #{config} -sdk #{sdk} #{cmd}"
 		end

data/lib/covamain.rb

@@ -269,8 +269,7 @@ class Cova < Thor
 			return false
 		end
 
-		pid = File.read(pid_file)
-		Process.kill("TERM", pid.to_i)
+		File.open(pid_file).each_line {|pid| Process.kill("TERM", pid.to_i)}
 		`rm -rf #{pid_file}`
 
 		if not _io_isfile pid_file, false
@@ -327,24 +326,39 @@ class Cova < Thor
 			return true
 		end
 
-		db_file = @dir_cova_apps_home + "/" + name + "/store/log.db"
-		
+    	port = _io_findport 10080
+		if port < 0
+			_log_info "Too many handshakes. Try saying hi again."
+			return false
+		end
+	
+		db_file = @dir_cova_apps_home + "/" + name + "/store/log.db"		
+		if not File.exist?(db_file)
+ 			db = SQLite3::Database.new db_file
+		    db.execute("CREATE TABLE changelog(file, event, date)")
+		end
+
+		if not File.exist?(db_file)
+			_log_info "Cannot start logging. Try saying hi again."
+			return false
+		end
+
 		monitor = FSSM::Monitor.new
 		monitor.path @dir_cova_apps_home + "/" + name do
 			create do |b, r, t| 
-				if File.exist?(db_file) and not r == "store/log.db"
+				if File.exist?(db_file) and not r == "store/log.db" and not r == "store/hi.lock"
 		 			db = SQLite3::Database.new db_file
 					db.execute "insert into changelog values ('#{r}', 'created', '" + Time.new.strftime("%Y-%m-%d %H:%M:%S") + "')"
 				end
 			end	
 			update do |b, r, t|
-				if File.exist?(db_file) and not r == "store/log.db"
+				if File.exist?(db_file) and not r == "store/log.db" and not r == "store/hi.lock"
 		 			db = SQLite3::Database.new db_file
 					db.execute "insert into changelog values ('#{r}', 'updated', '" + Time.new.strftime("%Y-%m-%d %H:%M:%S") + "')"
 				end
 			end	
 			delete do |b, r, t|
-				if File.exist?(db_file) and not r == "store/log.db"
+				if File.exist?(db_file) and not r == "store/log.db" and not r == "store/hi.lock"
 		 			db = SQLite3::Database.new db_file
 					db.execute "insert into changelog values ('#{r}', 'deleted', '" + Time.new.strftime("%Y-%m-%d %H:%M:%S") + "')"
 				end
@@ -354,25 +368,65 @@ class Cova < Thor
 		pid = fork do
 			monitor.run
 		end
+		# Process.detach(pid)
+		File.open(pid_file, 'a') {|f| f.puts pid}
 			
-		File.open(@dir_cova_apps_home + "/" + name + "/store/hi.lock", 'w') {|f| f.write(pid)}
-		Process.detach(pid)
-
-		if _io_isfile pid_file 
-			if not File.exist?(db_file)
-	 			db = SQLite3::Database.new db_file
-			    db.execute("CREATE TABLE changelog(file, event, date)")
-	 			_log_info "Hi!"
-	 			return true
-			end
-
-			_log_info "Hi again!"
-			return true
-    	end
-
-		_log_line "Oops, something went wrong."
-		_log_line_error
-		return false
+		Dir.chdir(@dir_cova_apps_home + "/" + name) 
+		# Open3.popen3("php -S localhost:#{port} -t www &> store/server.log") {|stdin, stdout, stderr, wait_thr|
+		#   puts "@@@"
+		# }
+
+	    # pid_server = fork { 
+		   # `php -S localhost:10080 &> store/server.log`
+		   # IO.popen("php -S localhost:10080 -t www") do |stdout|
+		   # 	    puts "stdout = " + stdout.pid
+		   # end
+		   # Open3.popen3("php -S localhost:10080 -t www") do |stdin, stdout, stderr, wait_thr|
+		   #  	puts wait_thr
+		   #  	puts wait_thr.pid
+		   # #  while line = stdout.gets
+			  # #   puts line
+			  # # end
+		   #  end
+		    pid_server = fork {
+		    	[$stdout, $stderr].each {|fh| fh.reopen File.open("store/server.log", "a") }
+		    	exec "php -S localhost:10080 -t www"
+		    }
+			File.open(pid_file, 'a') {|f| f.puts pid_server}
+		    # cmd = 'ping google.com'
+			# Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+			#   while line = stdout.gets
+			# 	puts "@@@@@"
+			#     puts line
+			#   end
+			# end
+
+		   # pipe = IO.popen()
+		   # File.open(pid_file, 'a') {|f| f.puts pipe.pid}
+		# }
+		# Process.detach(pid_server)
+		# File.open(pid_file, 'a') {|f| f.puts pid_server}
+		# puts status
+
+		 # system "php", "-S", "localhost:10080", "-t", "www", "&>", "store/server.log"
+		 # fork {
+		  # IO.popen "php -S localhost:#{port} -t www &> store/server.log"  do |pipe|
+  	 		# puts "parent pid: #{$$}, popen return (child) pid: #{pipe.pid}"
+		  # end
+		 # }
+		 # File.open(pid_file, 'a') {|f| f.puts $?.pid}
+		 # `php -S localhost:#{port} -t www &> store/server.log; echo $$ > som.pid`
+		 # puts $?.pid
+		# puts pid_server
+		# pid_server = fork {
+		# 	IO.popen "php -S localhost:10080 -t www &> t.log" do |pipe|
+		# 		File.open(pid_file, 'a') {|f| f.puts pipe.pid}
+		# 	end
+		# }
+		# Process.detach(pid_server)		
+
+		_log_info "Hi! Checkout localhost:#{port}"
+		return true
     end
 
     desc 'deploy NAME', 'Builds an app'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cova
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Dan Calinescu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-06 00:00:00 Z
+date: 2013-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: logger
@@ -129,6 +129,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: socket
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
 description: Cova removes a lot of the complexity that comes with designing, coding, testing, prototyping and publishing mobile applications.
 email: dan@cova.io
 executables: