hotreload 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0bcb8cd4c6087a5219e9943663296ab79fd4c57476acf204656ab36a129dc72
-  data.tar.gz: 8ecd0f3292dddee4d3b1bf239fa174edaa9dad559971f6bb799f109d11be0bf7
+  metadata.gz: ae578210693f38228edf1551ef5d4b23ee8ec56d4d548782b2bf7ec16cd578b2
+  data.tar.gz: ac65c0fc2a8e06f57df1797eb84ec256abf698d4ba13f92d5fda0b816b1df8b2
 SHA512:
-  metadata.gz: 91a0e7d524d74791309ded5d64ecb3d45ebc6b8c11d470c052decf073b6a8f61063a303cf0e64f22d6df224509598b5e5689fcb0edc5e6101bfd3ac7ef5bdd53
-  data.tar.gz: 94fb0379f748f484b8931e780ec24033f735aa0a73b876d8cba47eb0ffd378bb07a7eb3f7b010a4d52b9bb3c21f56cefd67d5716ac2688d4a696731cbcdced33
+  metadata.gz: d658e01b6472ab3e877ed5f959b238a329fbd752657527c992eed8af9cc3011dd0148a64e6048b7255342e7665b4a6727184a156dc874b3618761a20279e2296
+  data.tar.gz: 9ae111e6aec259559e7bd547ed28564b34e853391a486df92caa5e89bf5ed93edc7b1a60113e1fb5c043ce8d6ff9ab502d57da8e1802a04dd5485d86f5ccfc97

data/lib/config.rb

@@ -31,11 +31,12 @@ module Command
 
   HRCommandComplete   = 0
   HRCommandBuilding   = 1
-  HRCommandSetProject = 2
-  HRCommandTransferFile = 3
-  HRCommandTransferFileNameFinished = 4
-  HRCommandTransferFileSizeFinished = 5
-  HRCommandTransferFileFinished = 6
+  HRCommandBuildFailed   = 2
+  HRCommandSetProject = 3
+  HRCommandTransferFile = 4
+  HRCommandTransferFileNameFinished = 5
+  HRCommandTransferFileSizeFinished = 6
+  HRCommandTransferFileFinished = 7
 
   InjectionEOF = ~0
 end

data/lib/hotreload.rb

@@ -26,6 +26,7 @@ class HotReload
     @hot_reload_tmp_path = ""
     @compile_class = Hash.new
     @xcode_dev_path = "/Applications/Xcode.app/Contents/Developer"
+    @task_queue = Queue.new
 
   end
 
@@ -42,11 +43,11 @@ class HotReload
 
     # tell client the project being watched
     @project_file = "#{@project_path}/*.xcworkspace"
-    files_sorted_by_time = Dir[@project_file].sort_by{ |f| File.mtime(f) }
+    files_sorted_by_time = Dir[@project_file].sort!{ |x,y| File.mtime(y) <=> File.mtime(x) }
     @project_file = files_sorted_by_time[0]
     if @project_file == nil
       @project_file = "#{@project_path}/*.xcodeproj"
-      files_sorted_by_time = Dir[@project_file].sort_by{ |f| File.mtime(f) }
+      files_sorted_by_time = Dir[@project_file].sort!{ |x,y| File.mtime(y) <=> File.mtime(x) }
       @project_file = files_sorted_by_time[0]
     end
 
@@ -67,6 +68,8 @@ class HotReload
 
     # listen_command
 
+    runTask
+
     set_project(@project_file)
 
     @watcher = nil
@@ -81,31 +84,38 @@ class HotReload
     @server.read_message
   end
 
-  def inject(source)
+  def runTask
     Thread.new do
       # rebuild
-      @server.send_command(Command::HRCommandBuilding, source)
-      dylib = build(source)
-      if !dylib
-        puts "build failed"
-        return
-      end
+      while true do
+        source = @task_queue.pop
+        @server.send_command(Command::HRCommandBuilding, source)
+        dylib = build(source)
+        if !dylib
+          puts "build failed"
+          @server.send_command(Command::HRCommandBuildFailed, source)
+          next
+        end
 
-      symbol_file = get_symbol_file
+        symbol_file = get_symbol_file
 
-      @server.send_command(Command::HRCommandTransferFile, nil)
+        @server.send_command(Command::HRCommandTransferFile, nil)
 
-      puts "start transfer file"
-      file_tmp = "#{@hot_reload_tmp_path}/hotreload#{@hot_reload_id}"
-      @server.send_file(dylib)
-      @server.send_file("#{file_tmp}.o")
-      @server.send_file(symbol_file)
+        puts "start transfer file"
+        file_tmp = "#{@hot_reload_tmp_path}/hotreload#{@hot_reload_id}"
+        @server.send_file(dylib)
+        @server.send_file("#{file_tmp}.o")
+        @server.send_file(symbol_file)
 
-      # @server.send_command(Command::HRCommandComplete, source)
-      puts "finish transfer file"
+        puts "finish transfer file"
+      end
     end
   end
 
+  def inject(source)
+    @task_queue << source
+  end
+
   def changeFiles(changeFiles)
     now = Time.now.to_i
     changeFiles.each do |file|
@@ -174,6 +184,7 @@ class HotReload
       if !compile_model
         puts
         "Could not locate compile command for #{file} (HotReload does not work with Whole Module Optimization. There are also restrictions on characters allowed in paths. All paths are also case sensitive is another thing to check.)"
+        return
       end
     end
 
@@ -184,7 +195,8 @@ class HotReload
     ret = system(command)
     if !ret
       @compile_class.delete(file)
-      puts "Re-compilation failed (#{project_dir_temp}/command.sh)\n#{File.read(log_file)})"
+      puts "Re-compilation failed (#{file_tmp}.sh)\n#{File.read(log_file)})"
+      return
     end
 
     # save in memory
@@ -218,6 +230,7 @@ class HotReload
     ret = system(link_command)
     if !ret
       puts "Link failed, check #{@hot_reload_tmp_path}/command.sh \n #{log_file}"
+      return
     end
 
     puts "codesign dylib"
@@ -268,7 +281,7 @@ class HotReload
       end
     end
 
-    log_sort = build_log_array.sort_by{ |f| File.mtime(f) }
+    log_sort = build_log_array.sort!{ |x,y| File.mtime(y) <=> File.mtime(x) }
     log_sort[0]
   end
 
@@ -284,6 +297,7 @@ class HotReload
     compile_command_file = "#{tmp_file}.sh"
     if !File.exist?(compile_command_file)
       puts "compile command parse error"
+      return
     end
 
     compile_command = File.read("#{tmp_file}.sh")

data/lib/main.rb

@@ -20,6 +20,5 @@ require_relative 'hotreload'
 
 
 
-# project_path = "/Users//Documents/workspace/third/HotReloadClient/Example/Pods"
-project_path = "/Users/shijishan/Documents/workspace/spring/gif/Pods"
-HotReload.new().startServer(project_path)
+project_path = "/Users/***/Documents/workspace/third/HotReloadClient/Example/Pods"
+# HotReload.new().startServer(project_path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hotreload
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - shantj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-25 00:00:00.000000000 Z
+date: 2019-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler