dyntask-ruby 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 002b62cb26d3be08a52f4ca611374c3bffe77516
-  data.tar.gz: e7604dc0fd14ac038678972c0cdcb7e4a7c86d2c
+  metadata.gz: f38c086b8f9f06b0bdd5785efd1dc7ce0b1252bb
+  data.tar.gz: 1365c87f14249dccf8ff9dfc4e9d04d84ff55689
 SHA512:
-  metadata.gz: 25f1f5031438b090a6e06d6485bc6791cad03b890f02eb0e2fc1555c22dce484fa12b9c2ea16e1a2cf3c1fc85e456170f062f6457efbbfd85d9ed4ee3dc281f3
-  data.tar.gz: d49d5e9f344fc0589fb8bc151a953a9a942632beb5e1945bfabda1d3173e2290bf478c5636854aeb9d2a185b2a4db440c4fd70901cfbadb4777091e8cb62c3f4
+  metadata.gz: ca43457a5174ccc982c00c1e5b6ccb8532bcc4ed32084e412784bf480a4b793d903f304754b856bab3736141d289bb4a6984cd0135ecf7f3aa20099e07a3a9cb
+  data.tar.gz: c1feef5c9d7492c12a018a317350771976f8b7a730b49cc9cfdd5828b7383a5cb959e7c0f188a39290bf650bf088fee24c5e57a00a32f4b443246d4fed5b261f

data/bin/dyntask-init

@@ -31,30 +31,53 @@ when "first"
 when "rundir","run"
   rundirs=[]
   etc_rundirs=File.join( DynTask.cfg_dir[:etc],"rundirs")
-  rundirs += File.read(etc_rundirs).strip.split(",").map{|d| d.strip} if File.exists? etc_rundirs
+  rundirs += File.read(etc_rundirs).strip.split(";").map{|d| d.strip} if File.exists? etc_rundirs
   etc_rundirs_to_update=false
   case ARGV[1]
   when "ls"
     puts "Additional directories watched: #{rundirs.empty? ? 'none' : rundirs.join(',')}"
   when "add"
-    subdir = ARGV[2][-1,1] == File::Separator
-    newdir = File.expand_path ARGV[2]
-    newrundir=subdir ? File.join(newdir,"") : newdir
-    if File.directory? newdir  and !rundirs.include? newrundir
-      rundirs << newrundir
+    ## ex: dyn,pdflatex,pandoc:
+    watchdir,tasks_to_watch=ARGV[2],""
+    tasks_to_watch,watchdir=watchdir.split(":") if watchdir.include? ":"
+    tasks_to_watch=(tasks_to_watch.split(",") & DynTask::TaskMngr::TASKS).sort
+    subdir = watchdir[-1,1] == File::Separator
+    watchdir = File.expand_path watchdir
+    rundir=subdir ? File.join(watchdir,"") : watchdir
+    if File.directory? watchdir  and !rundirs.include? rundir
+      rundirs << (tasks_to_watch.empty? ? rundir : tasks_to_watch.join(",")+":"+rundir)
       puts "DynTask Server needs to be restarted to apply this change!"
       etc_rundirs_to_update=true
     else
       "Nothing to do!"
     end
   when "rm"
-    subdir = ARGV[2][-1,1] == File::Separator
-    newdir = File.expand_path ARGV[2]
-    newrundir=subdir ? File.join(newdir,"") : newdir
-    if File.directory? newdir  and rundirs.include? newrundir
-      rundirs -= [newrundir]
-      puts "DynTask Server needs to be restarted to apply this change!"
-      etc_rundirs_to_update=true
+    watchdir,tasks_to_watch=ARGV[2],""
+    tasks_to_watch,watchdir=watchdir.split(":") if watchdir.include? ":"
+    tasks_to_watch=(tasks_to_watch.split(",") & DynTask::TaskMngr::TASKS).sort
+    subdir = watchdir[-1,1] == File::Separator
+    watchdir = File.expand_path watchdir
+    rundir=subdir ? File.join(watchdir,"") : watchdir
+    if File.directory? watchdir
+      rundirs2=rundirs.map do |e|
+        t,r=((e.include? ":") ? e.split(":") : ["",e])
+        ##p [t,r,rundir]
+        if r==rundir
+          puts "DynTask Server needs to be restarted to apply this change!"
+          etc_rundirs_to_update=true
+          t=t.split(",").sort - (tasks_to_watch.empty? ? DynTask::TaskMngr::TASKS : tasks_to_watch)
+          ##p [:t,t]
+          if t.empty?
+            nil # to remove
+          else
+            t.sort.join(",")+":"+r
+          end
+        else
+          r
+        end
+      end
+      ##p rundirs2
+      rundirs=rundirs2.compact
     else
       "Nothing to do!"
     end
@@ -64,7 +87,7 @@ when "rundir","run"
       File.unlink etc_rundirs
     else
       File.open(etc_rundirs,"w") do |f|
-        f << rundirs.join(",")
+        f << rundirs.join(";")
       end
     end
   end

data/bin/dyntask-server

@@ -25,16 +25,21 @@ end
 
 rundirs=[DynTask.cfg_dir[:run]]
 etc_rundirs=File.join( DynTask.cfg_dir[:etc],"rundirs")
-rundirs += File.read(etc_rundirs).strip.split(",").map{|d| d.strip} if File.exists? etc_rundirs
-
-##tasks_to_watch = DynTask::TaskMngr::TASKS
+rundirs += File.read(etc_rundirs).strip.split(";").map{|d| d.strip} if File.exists? etc_rundirs
 
 files_to_watch=[]
 rundirs.each do |rundir|
-  ##tasks_to_watch.each do |e|
-  watchdir = rundir[-1,1] == File::Separator ? [rundir[0...-1],"**"] : rundir
-  files_to_watch << File.join(watchdir,"*" +DynTask::TaskMngr::TASK_EXT+"*" ) ##+e) #if DynTask::TaskMngr::TASKS.include? file
-  ##end
+  tasks_to_watch,watchdir=["*"],rundir #default
+  # watchdir of the form dyn,pdflatex:~/tmp or dyn,pdflatex:~/tmp/
+  # when / at the end, be careful that it could be watching too much files => TOO SLOW!
+  if watchdir.include? ":"
+    tasks_to_watch,watchdir=rundir.split(":")
+    tasks_to_watch=tasks_to_watch.split(",") & DynTask::TaskMngr::TASKS
+  end
+  watchdir = watchdir[-1,1] == File::Separator ? [watchdir[0...-1],"**"] : watchdir
+  tasks_to_watch.each do |e|
+    files_to_watch << File.join(watchdir,"*" +DynTask::TaskMngr::TASK_EXT+e )
+  end
 end
 
 files_to_watch.uniq!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dyntask-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - CQLS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop