dyntask-ruby 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32df473416ea671d565651d749ea83fdd43d8c8e
-  data.tar.gz: 7b5e1a9c43b19551ec35330e1e1f8a06ce735165
+  metadata.gz: 002b62cb26d3be08a52f4ca611374c3bffe77516
+  data.tar.gz: e7604dc0fd14ac038678972c0cdcb7e4a7c86d2c
 SHA512:
-  metadata.gz: 7a439e181630ca61a6be46cf0bbc27968405433499cca6fb05aade855db8f70394db6ba8a6f4c30f4edd216d541a27afcd3073f72d4d551408240e35886cb6d1
-  data.tar.gz: 576e6296fbf1ad0d393a7605d73e88bfba28dfb94514e4084819b54be52209cb8bbd95d39562b669e9c624c92710b246d15a1c110816fbe5a89d617c3914320d
+  metadata.gz: 25f1f5031438b090a6e06d6485bc6791cad03b890f02eb0e2fc1555c22dce484fa12b9c2ea16e1a2cf3c1fc85e456170f062f6457efbbfd85d9ed4ee3dc281f3
+  data.tar.gz: d49d5e9f344fc0589fb8bc151a953a9a942632beb5e1945bfabda1d3173e2290bf478c5636854aeb9d2a185b2a4db440c4fd70901cfbadb4777091e8cb62c3f4

data/bin/dyntask-init

@@ -37,18 +37,22 @@ when "rundir","run"
   when "ls"
     puts "Additional directories watched: #{rundirs.empty? ? 'none' : rundirs.join(',')}"
   when "add"
-    newdir=File.expand_path ARGV[2]
-    if File.directory? newdir and !rundirs.include? newdir
-      rundirs << newdir
+    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
     else
       "Nothing to do!"
     end
   when "rm"
-    newdir=File.expand_path ARGV[2]
-    if File.directory? newdir and rundirs.include? newdir
-      rundirs -= [newdir]
+    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
     else

data/bin/dyntask-server

@@ -32,7 +32,8 @@ rundirs += File.read(etc_rundirs).strip.split(",").map{|d| d.strip} if File.exis
 files_to_watch=[]
 rundirs.each do |rundir|
   ##tasks_to_watch.each do |e|
-    files_to_watch << File.join(rundir,"*" +DynTask::TaskMngr::TASK_EXT+"*" ) ##+e) #if DynTask::TaskMngr::TASKS.include? file
+  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
 end
 

data/lib/dyntask/task_mngr.rb

@@ -110,7 +110,7 @@ module DynTask
     end
 
      def init_tasks
-      @tasks={}
+      @task_ids={}
     end
 
     ## Comment on writing task:
@@ -121,8 +121,8 @@ module DynTask
     ## possibly add condition to check before applying command+options
     def add_task(task,id=nil)
       task_cpt=id || DynTask.inc_task_cpt
-      @tasks[task_cpt] = [] unless @tasks[task_cpt]
-      @tasks[task_cpt] << task
+      @task_ids[task_cpt] = [] unless @task_ids[task_cpt]
+      @task_ids[task_cpt] << task
       task_cpt #id of the task
     end
 
@@ -131,8 +131,10 @@ module DynTask
       task_dirname=DynTask.cfg_dir[:run] unless task_dirname
       task_dirname=File.expand_path task_dirname
       FileUtils.mkdir_p task_dirname unless File.directory? task_dirname
-      if (tasks_to_save=@tasks[id])
+      if (tasks_to_save=@task_ids[id])
+        ## delegate id
         tasks_to_save[0][:id]=id
+        ## write next tasks to file
         task_filename=File.join(task_dirname,("%04d" % id)+"_"+task_basename+TASK_EXT+tasks_to_save[0][:cmd].to_s)
         File.open(task_filename,"w") do |f|
           f << tasks_to_save.inspect
@@ -148,6 +150,13 @@ module DynTask
       save_tasks(id,task_basename)
     end
 
+    ## workdir is now specified which is relative to some root directory
+    ## Two modes:
+    ## 1) centralized mode (defaul): ~/.dyntask/run folder watched with root specified in ~/.dyntask/etc/sys_root_path
+    ## Nice when used everywhere in your local computer
+    ## 2) decentralized mode: every watched directory is a working directory
+    ## Nice when certain tasks can be performed remotely.
+
     ## maybe to maintain only one task, remove current task when the new one is created
     def read_tasks(task_filename)
       @task_filename=task_filename
@@ -159,8 +168,14 @@ module DynTask
         if @task[:workdir]
           # if workdir is specified inside the first task (almost required now)
           @workdir = @task[:workdir]
-          # workdir is always relative from sys_root which could differ depending on the computer (or vm)
-          @workdir = DynTask.sys_root_path(@workdir)
+          dirname_next_task=nil #means default mode (from sys_root_path)
+          if @workdir == :current #mode current
+            @workdir=File.dirname(File.expand_path(@task_filename))
+            dirname_next_task=@workdir
+          else #mode
+            # workdir is always relative from sys_root which could differ depending on the computer (or vm)
+            @workdir = DynTask.sys_root_path(@workdir)
+          end
           if File.exist? @workdir
 
             make_task
@@ -168,7 +183,7 @@ module DynTask
               dirname=File.dirname(task_filename)
               basename=File.basename(task_filename,".*")
               task_basename=File.join(dirname,basename)
-              save_tasks(@task[:id],task_basename) # same id since it is a chaining (TO CHECK: when remote action maybe prefer uuid instead of counter to gnerate id)
+              save_tasks(@task[:id],task_basename,dirname_next_task) # same id since it is a chaining (TO CHECK: when remote action maybe prefer uuid instead of counter to gnerate id)
             end
             # remove since it is executed!
             FileUtils.rm(task_filename)

metadata

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